From 046766c11c6ee455c0695285a5352daf77e2c7fd Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 7 Jun 2024 05:44:54 -0230
Subject: [PATCH 001/236] v12.0.0

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8bc947c4c01..b3c3a60bf10d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.0.0]
+
 ## [11.16.7]
 ### Fixed
 - Fix bug that breaks dapps that expect users to switch chains manually([#25046]https://github.com/MetaMask/metamask-extension/pull/25046)
@@ -4785,7 +4787,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...HEAD
+[12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v12.0.0
 [11.16.7]: https://github.com/MetaMask/metamask-extension/compare/v11.16.6...v11.16.7
 [11.16.6]: https://github.com/MetaMask/metamask-extension/compare/v11.16.5...v11.16.6
 [11.16.5]: https://github.com/MetaMask/metamask-extension/compare/v11.16.4...v11.16.5
diff --git a/package.json b/package.json
index 731be3eb1e75..e5d4671a35af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.7",
+  "version": "12.0.0",
   "private": true,
   "repository": {
     "type": "git",

From 169292b507fcb617e1b1b111ae18f1533fa5d8fd Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 6 Jun 2024 20:44:12 -0230
Subject: [PATCH 002/236] Version bump

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8bc947c4c01..451760e45c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.8]
+
 ## [11.16.7]
 ### Fixed
 - Fix bug that breaks dapps that expect users to switch chains manually([#25046]https://github.com/MetaMask/metamask-extension/pull/25046)
@@ -4785,7 +4787,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.8...HEAD
+[11.16.8]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v11.16.8
 [11.16.7]: https://github.com/MetaMask/metamask-extension/compare/v11.16.6...v11.16.7
 [11.16.6]: https://github.com/MetaMask/metamask-extension/compare/v11.16.5...v11.16.6
 [11.16.5]: https://github.com/MetaMask/metamask-extension/compare/v11.16.4...v11.16.5
diff --git a/package.json b/package.json
index 42c2331a91f4..ee5930c1a41d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.7",
+  "version": "11.16.8",
   "private": true,
   "repository": {
     "type": "git",

From 907b36d40be03686a6e520d3abf342658c1b8905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Mon, 20 May 2024 10:53:48 +0100
Subject: [PATCH 003/236] chore: bumps MMI packages (#24581)
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.
-->

A few packages updates for MMI.

Fixes:

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

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

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

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

- [ ] 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.

- [ ] 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>
---
 .../controllers/mmi-controller.test.ts        |  12 +-
 lavamoat/browserify/mmi/policy.json           |  48 +-
 package.json                                  |  16 +-
 test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts |   2 +-
 yarn.lock                                     | 463 +++++++++++++++---
 5 files changed, 414 insertions(+), 127 deletions(-)

diff --git a/app/scripts/controllers/mmi-controller.test.ts b/app/scripts/controllers/mmi-controller.test.ts
index df8de77c2212..b926be047da5 100644
--- a/app/scripts/controllers/mmi-controller.test.ts
+++ b/app/scripts/controllers/mmi-controller.test.ts
@@ -201,10 +201,10 @@ describe('MMIController', function () {
       initState: {
         custodyAccountDetails: {
           [mockAccount.address]: {
-            custodyType: 'Custody - Jupiter',
+            custodyType: 'Custody - ECA3',
           },
           [mockAccount2.address]: {
-            custodyType: 'Custody - Jupiter',
+            custodyType: 'Custody - ECA3',
           },
         },
       },
@@ -438,11 +438,11 @@ describe('MMIController', function () {
           getCustodianAccounts: mockCustodialKeyring,
         });
 
-      await mmiController.getCustodianAccounts('token', 'mock url', 'JUPITER');
+      await mmiController.getCustodianAccounts('token', 'neptune-custody', 'ECA3');
 
       expect(selectedAccountSpy).toHaveBeenCalledTimes(0);
 
-      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - Jupiter');
+      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - ECA3');
       expect(mockCustodialKeyring).toHaveBeenCalled();
     });
 
@@ -454,14 +454,14 @@ describe('MMIController', function () {
           getCustodianAccounts: mockCustodialKeyring,
         });
 
-      await mmiController.getCustodianAccounts('token', 'mock url');
+      await mmiController.getCustodianAccounts('token', 'neptune-custody');
 
       expect(selectedAccountSpy).toHaveBeenCalledWith(
         'AccountsController:getSelectedAccount',
       );
       expect(selectedAccountSpy).toHaveReturnedWith(mockAccount);
 
-      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - Jupiter');
+      expect(keyringControllerSpy).toHaveBeenCalledWith('Custody - ECA3');
       expect(mockCustodialKeyring).toHaveBeenCalled();
     });
   });
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index f18cd7e33cbe..87087d18fde1 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -765,57 +765,17 @@
       "globals": {
         "URLSearchParams": true,
         "console.debug": true,
+        "console.error": true,
         "console.log": true,
         "console.warn": true,
         "fetch": true
       },
       "packages": {
         "@metamask-institutional/sdk>@metamask-institutional/simplecache": true,
-        "@metamask-institutional/sdk>jsonwebtoken": true,
         "browserify>crypto-browserify": true,
         "webpack>events": true
       }
     },
-    "@metamask-institutional/sdk>jsonwebtoken": {
-      "packages": {
-        "@metamask-institutional/sdk>jsonwebtoken>jws": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "browserify>process": true,
-        "lodash": true,
-        "mocha>ms": true,
-        "semver": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws": {
-      "packages": {
-        "@metamask-institutional/sdk>jsonwebtoken>jws>jwa": true,
-        "browserify>buffer": true,
-        "browserify>process": true,
-        "browserify>util": true,
-        "koa>content-disposition>safe-buffer": true,
-        "stream-browserify": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws>jwa": {
-      "packages": {
-        "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>buffer-equal-constant-time": true,
-        "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>ecdsa-sig-formatter": true,
-        "browserify>crypto-browserify": true,
-        "browserify>util": true,
-        "koa>content-disposition>safe-buffer": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>buffer-equal-constant-time": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask-institutional/sdk>jsonwebtoken>jws>jwa>ecdsa-sig-formatter": {
-      "packages": {
-        "koa>content-disposition>safe-buffer": true
-      }
-    },
     "@metamask-institutional/transaction-update": {
       "globals": {
         "clearInterval": true,
@@ -824,10 +784,10 @@
         "setInterval": true
       },
       "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask-institutional/sdk": true,
         "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": true,
-        "@metamask/obs-store": true,
-        "ethereumjs-util": true,
+        "@metamask-institutional/transaction-update>@metamask/obs-store": true,
         "webpack>events": true
       }
     },
@@ -5153,4 +5113,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index ee5930c1a41d..2b2c07066a25 100644
--- a/package.json
+++ b/package.json
@@ -270,14 +270,14 @@
     "@lavamoat/lavadome-react": "0.0.17",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@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.3",
-    "@metamask-institutional/sdk": "^0.1.25",
-    "@metamask-institutional/transaction-update": "^0.2.0",
+    "@metamask-institutional/custody-controller": "^0.2.27",
+    "@metamask-institutional/custody-keyring": "^2.0.0",
+    "@metamask-institutional/extension": "^0.3.24",
+    "@metamask-institutional/institutional-features": "^1.3.2",
+    "@metamask-institutional/portfolio-dashboard": "^1.4.1",
+    "@metamask-institutional/rpc-allowlist": "^1.0.3",
+    "@metamask-institutional/sdk": "^0.1.26",
+    "@metamask-institutional/transaction-update": "^0.2.2",
     "@metamask/abi-utils": "^2.0.2",
     "@metamask/accounts-controller": "^11.0.0",
     "@metamask/address-book-controller": "^3.1.7",
diff --git a/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts b/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts
index 363f86bd1d08..99b2d2329ffb 100644
--- a/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts
+++ b/test/e2e/mmi/pageObjects/mmi-dummyApp-page.ts
@@ -59,7 +59,7 @@ export class DummyAppPage {
     await popup.waitForLoadState();
 
     if (isSign) {
-      await popup.click('button:has-text("Sign")');
+      await popup.click('button:has-text("Confirm")');
     } else {
       // Confirm
       await popup.getByTestId('page-container-footer-next').click();
diff --git a/yarn.lock b/yarn.lock
index a7716262981d..8a4650110bd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -337,7 +337,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.6, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.22.5
+  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
+  checksum: ab220db218089a2aadd0582f5833fd17fa300245999f5f8784b10f5a75267c4e808592284a29438a0da365e702f05acb369f99e1c915c02f9f9210ec60eab8ea
+  languageName: node
+  linkType: hard
+
+"@babel/helper-plugin-utils@npm:^7.24.6":
   version: 7.24.6
   resolution: "@babel/helper-plugin-utils@npm:7.24.6"
   checksum: 0ac0a7a19959fb2f880ea87650475a4960232e98825d9a50f4aa56e5750a70fc799b48cf570af63a06b810d0128e758e801865762b51a8348067e37751a38478
@@ -451,7 +458,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.22.13, @babel/highlight@npm:^7.24.6":
+"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.24.6":
   version: 7.24.6
   resolution: "@babel/highlight@npm:7.24.6"
   dependencies:
@@ -463,6 +470,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.22.13":
+  version: 7.23.4
+  resolution: "@babel/highlight@npm:7.23.4"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    chalk: "npm:^2.4.2"
+    js-tokens: "npm:^4.0.0"
+  checksum: 62fef9b5bcea7131df4626d009029b1ae85332042f4648a4ce6e740c3fd23112603c740c45575caec62f260c96b11054d3be5987f4981a5479793579c3aac71f
+  languageName: node
+  linkType: hard
+
 "@babel/parser@npm:7.16.4":
   version: 7.16.4
   resolution: "@babel/parser@npm:7.16.4"
@@ -490,6 +508,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.22.15":
+  version: 7.24.4
+  resolution: "@babel/parser@npm:7.24.4"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 3742cc5068036287e6395269dce5a2735e6349cdc8d4b53297c75f98c580d7e1c8cb43235623999d151f2ef975d677dbc2c2357573a1855caa71c271bf3046c9
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
@@ -681,7 +708,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.24.6, @babel/plugin-syntax-jsx@npm:^7.7.2":
+"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-jsx@npm:^7.24.6":
   version: 7.24.6
   resolution: "@babel/plugin-syntax-jsx@npm:7.24.6"
   dependencies:
@@ -1664,7 +1702,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.24.6, @babel/template@npm:^7.3.3":
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
+  version: 7.22.15
+  resolution: "@babel/template@npm:7.22.15"
+  dependencies:
+    "@babel/code-frame": "npm:^7.22.13"
+    "@babel/parser": "npm:^7.22.15"
+    "@babel/types": "npm:^7.22.15"
+  checksum: 21e768e4eed4d1da2ce5d30aa51db0f4d6d8700bc1821fec6292587df7bba2fe1a96451230de8c64b989740731888ebf1141138bfffb14cacccf4d05c66ad93f
+  languageName: node
+  linkType: hard
+
+"@babel/template@npm:^7.24.6":
   version: 7.24.6
   resolution: "@babel/template@npm:7.24.6"
   dependencies:
@@ -3097,6 +3146,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@gar/promisify@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@gar/promisify@npm:1.1.3"
+  checksum: 052dd232140fa60e81588000cbe729a40146579b361f1070bce63e2a761388a22a16d00beeffc504bd3601cb8e055c57b21a185448b3ed550cf50716f4fd442e
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/merge@npm:8.3.1":
   version: 8.3.1
   resolution: "@graphql-tools/merge@npm:8.3.1"
@@ -3942,80 +3998,80 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-controller@npm:^0.2.24, @metamask-institutional/custody-controller@npm:^0.2.25":
-  version: 0.2.25
-  resolution: "@metamask-institutional/custody-controller@npm:0.2.25"
+"@metamask-institutional/custody-controller@npm:^0.2.27":
+  version: 0.2.27
+  resolution: "@metamask-institutional/custody-controller@npm:0.2.27"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-keyring": "npm:^1.1.0"
-    "@metamask-institutional/sdk": "npm:^0.1.26"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
     "@metamask-institutional/types": "npm:^1.1.0"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: 38ad630637730180bed372f058d8fd0c7a11002b8664ce01c725d8ef8559a593761463adf09245ecda11e14d52e305b9fdba8438dae87622f833317265cd6253
+  checksum: b834477c4551fdbd56143742038f1b101cb72b1655380a63d6d84416af949b259109a22967d3233009d737400f656c91ba100dcb61522eb14e6715564f07e404
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-keyring@npm:^1.0.12, @metamask-institutional/custody-keyring@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@metamask-institutional/custody-keyring@npm:1.1.0"
+"@metamask-institutional/custody-keyring@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask-institutional/custody-keyring@npm:2.0.0"
   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.26"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
     "@metamask-institutional/types": "npm:^1.1.0"
     "@metamask/obs-store": "npm:^8.0.0"
     crypto: "npm:^1.0.1"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 26d43168f8d398c6e391b6200ad36fa7b57ad2bb735812c4a9bc2b8a8cbf19fd8f3c547f4b3c6a82e199687e787549b8c95271ea049795e82974f4df4ba0d3c7
+  checksum: 14563443d157d97554ab4456c69ecba52aacde9659bcdc5b20724a3cf7c626c3ef624446823ceafbf3aa25307e89f0dc09636e8db49f49f48d5d7c6b37f52bf9
   languageName: node
   linkType: hard
 
-"@metamask-institutional/extension@npm:^0.3.20":
-  version: 0.3.21
-  resolution: "@metamask-institutional/extension@npm:0.3.21"
+"@metamask-institutional/extension@npm:^0.3.24":
+  version: 0.3.24
+  resolution: "@metamask-institutional/extension@npm:0.3.24"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-controller": "npm:^0.2.25"
-    "@metamask-institutional/custody-keyring": "npm:^1.1.0"
-    "@metamask-institutional/portfolio-dashboard": "npm:^1.4.0"
-    "@metamask-institutional/sdk": "npm:^0.1.26"
-    "@metamask-institutional/transaction-update": "npm:^0.2.0"
+    "@metamask-institutional/custody-controller": "npm:^0.2.27"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/transaction-update": "npm:^0.2.2"
     "@metamask-institutional/types": "npm:^1.1.0"
     jest-create-mock-instance: "npm:^2.0.0"
     jest-fetch-mock: "npm:3.0.3"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 47c2ac21e47d90f6a3166fe5616c45adb785561ff0daab7f333f5b7672d13c9d0c9a7b2b1cb0fc2be656ef902d5c170fb2518cb6d662f0ba9a3f54499b780de7
+  checksum: 7ec773d3f98b61d4d6b877e39eec239aca3cb5accaa2211728ddbad32fb6dba5f1c2e7ac7e90e1606bf94995f78dd323cb64a06fa587fd435b7e1592515f73ab
   languageName: node
   linkType: hard
 
-"@metamask-institutional/institutional-features@npm:^1.2.15":
-  version: 1.3.0
-  resolution: "@metamask-institutional/institutional-features@npm:1.3.0"
+"@metamask-institutional/institutional-features@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "@metamask-institutional/institutional-features@npm:1.3.2"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.1.0"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
     "@metamask/obs-store": "npm:^8.0.0"
-  checksum: 7b5bb9d7999443a8ec304891c0fde51c17111337f7aa092c08caf8f5195d56d73318f2b3e85b7cef55cd8c5c230271eb9927e73d12245cd86e696c25d2e539c5
+  checksum: be5e8722c1180cf7127ee4c7cab0b26a60cb56e7bf0147836b496496bc6ada4de3e0265b97118ba4229ae6a847188097ed7175d51d689c5898e381fe54707aa9
   languageName: node
   linkType: hard
 
-"@metamask-institutional/portfolio-dashboard@npm:^1.4.0":
+"@metamask-institutional/portfolio-dashboard@npm:^1.4.1":
   version: 1.4.1
   resolution: "@metamask-institutional/portfolio-dashboard@npm:1.4.1"
   checksum: 75573d236d2dd709bcf8d0c92f69eb71f07de4ed02ef3f5122f2acf5cf29e41c9e17b14c67cea4f200e64ce2e9a6c60bc5e85508f77aa904f9bbbcf65e5efb10
   languageName: node
   linkType: hard
 
-"@metamask-institutional/rpc-allowlist@npm:1.0.3":
+"@metamask-institutional/rpc-allowlist@npm:^1.0.3":
   version: 1.0.3
   resolution: "@metamask-institutional/rpc-allowlist@npm:1.0.3"
   checksum: caed69a7855328d3261f7499bc024c772fc61f050c574c9e76a0dc565779e9d842a89ed01af33eaf268ac6b3b3624be7b7a8183329f734d08751ee98d5c18472
   languageName: node
   linkType: hard
 
-"@metamask-institutional/sdk@npm:^0.1.25, @metamask-institutional/sdk@npm:^0.1.26":
-  version: 0.1.26
-  resolution: "@metamask-institutional/sdk@npm:0.1.26"
+"@metamask-institutional/sdk@npm:^0.1.26, @metamask-institutional/sdk@npm:^0.1.27":
+  version: 0.1.27
+  resolution: "@metamask-institutional/sdk@npm:0.1.27"
   dependencies:
     "@metamask-institutional/simplecache": "npm:^1.1.0"
     "@metamask-institutional/types": "npm:^1.1.0"
@@ -4023,7 +4079,7 @@ __metadata:
     "@types/node": "npm:^20.11.17"
     bignumber.js: "npm:^9.1.1"
     jsonwebtoken: "npm:^9.0.0"
-  checksum: 3fda158c16ed832a30cf5157d6d33896780323f1e50755bc6d1f1a070188334dd38a276673f44b46cb824bf653fa4a1123c3d878276bd55e93491aecacb9df72
+  checksum: 9de0d737cab194c8f16a63f92bade1265667f2042c4449bdde60240afb09cdfb71c2b583fbd629a9c72c43530b8d6816def91601aa517c8b47b0b2d473095397
   languageName: node
   linkType: hard
 
@@ -4034,17 +4090,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/transaction-update@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "@metamask-institutional/transaction-update@npm:0.2.0"
+"@metamask-institutional/transaction-update@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "@metamask-institutional/transaction-update@npm:0.2.2"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.1.0"
-    "@metamask-institutional/sdk": "npm:^0.1.26"
+    "@ethereumjs/util": "npm:^8.0.5"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
     "@metamask-institutional/types": "npm:^1.1.0"
-    "@metamask-institutional/websocket-client": "npm:^0.2.0"
+    "@metamask-institutional/websocket-client": "npm:^0.2.2"
     "@metamask/obs-store": "npm:^8.0.0"
-    ethereumjs-util: "npm:^7.1.5"
-  checksum: 9f8cd7a6a79e7806c74bfe1b3e9135cfa2b0fff6d8bdcf3699a5fa6b7b23110e4402345ec297168b8210a02ba1af955c4119c1a7baadd74ddcfc0590551b509b
+  checksum: 31c62a2d207e8e3c2469b870eecb18ff2db450eda8b28c2d428a69cc9eee8a477142f74abebad50c62a6e0f1132dafa8db6b8bf95f43677a401a54b4d3cd5fd0
   languageName: node
   linkType: hard
 
@@ -4055,15 +4111,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/websocket-client@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "@metamask-institutional/websocket-client@npm:0.2.0"
+"@metamask-institutional/websocket-client@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "@metamask-institutional/websocket-client@npm:0.2.2"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^1.1.0"
-    "@metamask-institutional/sdk": "npm:^0.1.26"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/sdk": "npm:^0.1.27"
     "@metamask-institutional/types": "npm:^1.1.0"
     mock-socket: "npm:^9.2.1"
-  checksum: 181ddcdedc5f8e1a68ce3e325add482a3fde5506c35b5ebcb775f3338cf54640dc88c7622d890a7ad05fb694d56e25e707e56ac796c283c381cec2d79b45892b
+  checksum: 652ffded926f5064e543e15e01992ec37a588783bc711a6f74404c1984ac5406fa83ab19187f00ae9b81a182cb46be08b0be388f583d68d6b45500969b5b2f46
   languageName: node
   linkType: hard
 
@@ -6351,6 +6407,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@npmcli/fs@npm:^2.1.0":
+  version: 2.1.2
+  resolution: "@npmcli/fs@npm:2.1.2"
+  dependencies:
+    "@gar/promisify": "npm:^1.1.3"
+    semver: "npm:^7.3.5"
+  checksum: c5d4dfee80de2236e1e4ed595d17e217aada72ebd8215183fc46096fa010f583dd2aaaa486758de7cc0b89440dbc31cfe8b276269d75d47af35c716e896f78ec
+  languageName: node
+  linkType: hard
+
 "@npmcli/fs@npm:^3.1.0":
   version: 3.1.0
   resolution: "@npmcli/fs@npm:3.1.0"
@@ -6376,6 +6442,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@npmcli/move-file@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@npmcli/move-file@npm:2.0.1"
+  dependencies:
+    mkdirp: "npm:^1.0.4"
+    rimraf: "npm:^3.0.2"
+  checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380
+  languageName: node
+  linkType: hard
+
 "@npmcli/node-gyp@npm:^3.0.0":
   version: 3.0.0
   resolution: "@npmcli/node-gyp@npm:3.0.0"
@@ -11372,6 +11448,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"abbrev@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "abbrev@npm:1.1.1"
+  checksum: 2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243
+  languageName: node
+  linkType: hard
+
 "abbrev@npm:^2.0.0":
   version: 2.0.0
   resolution: "abbrev@npm:2.0.0"
@@ -11675,7 +11758,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agentkeepalive@npm:^4.5.0":
+"agentkeepalive@npm:^4.2.1, agentkeepalive@npm:^4.5.0":
   version: 4.5.0
   resolution: "agentkeepalive@npm:4.5.0"
   dependencies:
@@ -11971,6 +12054,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aproba@npm:^1.0.3 || ^2.0.0":
+  version: 2.0.0
+  resolution: "aproba@npm:2.0.0"
+  checksum: c2b9a631298e8d6f3797547e866db642f68493808f5b37cd61da778d5f6ada890d16f668285f7d60bd4fc3b03889bd590ffe62cf81b700e9bb353431238a0a7b
+  languageName: node
+  linkType: hard
+
 "archy@npm:^1.0.0":
   version: 1.0.0
   resolution: "archy@npm:1.0.0"
@@ -11985,6 +12075,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"are-we-there-yet@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "are-we-there-yet@npm:3.0.1"
+  dependencies:
+    delegates: "npm:^1.0.0"
+    readable-stream: "npm:^3.6.0"
+  checksum: 390731720e1bf9ed5d0efc635ea7df8cbc4c90308b0645a932f06e8495a0bf1ecc7987d3b97e805f62a17d6c4b634074b25200aa4d149be2a7b17250b9744bc4
+  languageName: node
+  linkType: hard
+
 "arg@npm:^4.1.0":
   version: 4.1.3
   resolution: "arg@npm:4.1.3"
@@ -12881,13 +12981,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"big-integer@npm:1.6.x, big-integer@npm:^1.6.44, big-integer@npm:^1.6.48":
+"big-integer@npm:1.6.x":
   version: 1.6.52
   resolution: "big-integer@npm:1.6.52"
   checksum: 4bc6ae152a96edc9f95020f5fc66b13d26a9ad9a021225a9f0213f7e3dc44269f423aa8c42e19d6ac4a63bb2b22140b95d10be8f9ca7a6d9aa1b22b330d1f514
   languageName: node
   linkType: hard
 
+"big-integer@npm:^1.6.44, big-integer@npm:^1.6.48":
+  version: 1.6.51
+  resolution: "big-integer@npm:1.6.51"
+  checksum: c7a12640901906d6f6b6bdb42a4eaba9578397b6d9a0dd090cf001ec813ff2bfcd441e364068ea0416db6175d2615f8ed19cff7d1a795115bf7c92d44993f991
+  languageName: node
+  linkType: hard
+
 "big.js@npm:^5.2.2":
   version: 5.2.2
   resolution: "big.js@npm:5.2.2"
@@ -13704,6 +13811,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cacache@npm:^16.1.0":
+  version: 16.1.3
+  resolution: "cacache@npm:16.1.3"
+  dependencies:
+    "@npmcli/fs": "npm:^2.1.0"
+    "@npmcli/move-file": "npm:^2.0.0"
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.1.0"
+    glob: "npm:^8.0.1"
+    infer-owner: "npm:^1.0.4"
+    lru-cache: "npm:^7.7.1"
+    minipass: "npm:^3.1.6"
+    minipass-collect: "npm:^1.0.2"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    mkdirp: "npm:^1.0.4"
+    p-map: "npm:^4.0.0"
+    promise-inflight: "npm:^1.0.1"
+    rimraf: "npm:^3.0.2"
+    ssri: "npm:^9.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^2.0.0"
+  checksum: a14524d90e377ee691d63a81173b33c473f8bc66eb299c64290b58e1d41b28842397f8d6c15a01b4c57ca340afcec019ae112a45c2f67a79f76130d326472e92
+  languageName: node
+  linkType: hard
+
 "cacache@npm:^18.0.0":
   version: 18.0.3
   resolution: "cacache@npm:18.0.3"
@@ -14828,6 +14961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"console-control-strings@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "console-control-strings@npm:1.1.0"
+  checksum: 27b5fa302bc8e9ae9e98c03c66d76ca289ad0c61ce2fe20ab288d288bee875d217512d2edb2363fc83165e88f1c405180cf3f5413a46e51b4fe1a004840c6cdb
+  languageName: node
+  linkType: hard
+
 "consolidate@npm:^0.16.0":
   version: 0.16.0
   resolution: "consolidate@npm:0.16.0"
@@ -19214,7 +19354,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^2.0.0":
+"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
@@ -19415,6 +19555,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gauge@npm:^4.0.3":
+  version: 4.0.4
+  resolution: "gauge@npm:4.0.4"
+  dependencies:
+    aproba: "npm:^1.0.3 || ^2.0.0"
+    color-support: "npm:^1.1.3"
+    console-control-strings: "npm:^1.1.0"
+    has-unicode: "npm:^2.0.1"
+    signal-exit: "npm:^3.0.7"
+    string-width: "npm:^4.2.3"
+    strip-ansi: "npm:^6.0.1"
+    wide-align: "npm:^1.1.5"
+  checksum: 09535dd53b5ced6a34482b1fa9f3929efdeac02f9858569cde73cef3ed95050e0f3d095706c1689614059898924b7a74aa14042f51381a1ccc4ee5c29d2389c4
+  languageName: node
+  linkType: hard
+
 "generic-names@npm:^2.0.1":
   version: 2.0.1
   resolution: "generic-names@npm:2.0.1"
@@ -19784,6 +19940,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^8.0.1":
+  version: 8.1.0
+  resolution: "glob@npm:8.1.0"
+  dependencies:
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^5.0.1"
+    once: "npm:^1.3.0"
+  checksum: 9aab1c75eb087c35dbc41d1f742e51d0507aa2b14c910d96fb8287107a10a22f4bbdce26fc0a3da4c69a20f7b26d62f1640b346a4f6e6becfff47f335bb1dc5e
+  languageName: node
+  linkType: hard
+
 "global-agent@npm:^3.0.0":
   version: 3.0.0
   resolution: "global-agent@npm:3.0.0"
@@ -20444,6 +20613,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-unicode@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "has-unicode@npm:2.0.1"
+  checksum: 041b4293ad6bf391e21c5d85ed03f412506d6623786b801c4ab39e4e6ca54993f13201bceb544d92963f9e0024e6e7fbf0cb1d84c9d6b31cb9c79c8c990d13d8
+  languageName: node
+  linkType: hard
+
 "has-value@npm:^0.3.1":
   version: 0.3.1
   resolution: "has-value@npm:0.3.1"
@@ -20781,7 +20957,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1":
+"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
   checksum: 362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f
@@ -20924,7 +21100,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
+"https-proxy-agent@npm:^7.0.1":
   version: 7.0.4
   resolution: "https-proxy-agent@npm:7.0.4"
   dependencies:
@@ -20934,6 +21110,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"https-proxy-agent@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "https-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: "npm:^7.0.2"
+    debug: "npm:4"
+  checksum: 9ec844f78fd643608239c9c3f6819918631df5cd3e17d104cc507226a39b5d4adda9d790fc9fd63ac0d2bb8a761b2f9f60faa80584a9bf9d7f2e8c5ed0acd330
+  languageName: node
+  linkType: hard
+
 "human-signals@npm:^1.1.1":
   version: 1.1.1
   resolution: "human-signals@npm:1.1.1"
@@ -21119,6 +21305,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"infer-owner@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "infer-owner@npm:1.0.4"
+  checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
+  languageName: node
+  linkType: hard
+
 "inflight@npm:^1.0.4":
   version: 1.0.6
   resolution: "inflight@npm:1.0.6"
@@ -24436,7 +24629,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.14.0":
+"lru-cache@npm:^7.14.0, lru-cache@npm:^7.7.1":
   version: 7.18.3
   resolution: "lru-cache@npm:7.18.3"
   checksum: 6029ca5aba3aacb554e919d7ef804fffd4adfc4c83db00fac8248c7c78811fb6d4b6f70f7fd9d55032b3823446546a007edaa66ad1f2377ae833bd983fac5d98
@@ -24510,6 +24703,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"make-fetch-happen@npm:^10.0.3":
+  version: 10.2.1
+  resolution: "make-fetch-happen@npm:10.2.1"
+  dependencies:
+    agentkeepalive: "npm:^4.2.1"
+    cacache: "npm:^16.1.0"
+    http-cache-semantics: "npm:^4.1.0"
+    http-proxy-agent: "npm:^5.0.0"
+    https-proxy-agent: "npm:^5.0.0"
+    is-lambda: "npm:^1.0.1"
+    lru-cache: "npm:^7.7.1"
+    minipass: "npm:^3.1.6"
+    minipass-collect: "npm:^1.0.2"
+    minipass-fetch: "npm:^2.0.3"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.3"
+    promise-retry: "npm:^2.0.1"
+    socks-proxy-agent: "npm:^7.0.0"
+    ssri: "npm:^9.0.0"
+  checksum: fef5acb865a46f25ad0b5ad7d979799125db5dbb24ea811ffa850fbb804bc8e495df2237a8ec3a4fc6250e73c2f95549cca6d6d36a73b1faa61224504eb1188f
+  languageName: node
+  linkType: hard
+
 "make-fetch-happen@npm:^13.0.0":
   version: 13.0.1
   resolution: "make-fetch-happen@npm:13.0.1"
@@ -25072,14 +25289,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.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.3"
-    "@metamask-institutional/sdk": "npm:^0.1.25"
-    "@metamask-institutional/transaction-update": "npm:^0.2.0"
+    "@metamask-institutional/custody-controller": "npm:^0.2.27"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/extension": "npm:^0.3.24"
+    "@metamask-institutional/institutional-features": "npm:^1.3.2"
+    "@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
+    "@metamask-institutional/rpc-allowlist": "npm:^1.0.3"
+    "@metamask-institutional/sdk": "npm:^0.1.26"
+    "@metamask-institutional/transaction-update": "npm:^0.2.2"
     "@metamask/abi-utils": "npm:^2.0.2"
     "@metamask/accounts-controller": "npm:^11.0.0"
     "@metamask/address-book-controller": "npm:^3.1.7"
@@ -25956,7 +26173,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:5.0.1":
+"minimatch@npm:5.0.1, minimatch@npm:^5.0.1":
   version: 5.0.1
   resolution: "minimatch@npm:5.0.1"
   dependencies:
@@ -25992,6 +26209,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass-collect@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "minipass-collect@npm:1.0.2"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10
+  languageName: node
+  linkType: hard
+
 "minipass-collect@npm:^2.0.1":
   version: 2.0.1
   resolution: "minipass-collect@npm:2.0.1"
@@ -26001,6 +26227,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass-fetch@npm:^2.0.3":
+  version: 2.1.2
+  resolution: "minipass-fetch@npm:2.1.2"
+  dependencies:
+    encoding: "npm:^0.1.13"
+    minipass: "npm:^3.1.6"
+    minipass-sized: "npm:^1.0.3"
+    minizlib: "npm:^2.1.2"
+  dependenciesMeta:
+    encoding:
+      optional: true
+  checksum: 8cfc589563ae2a11eebbf79121ef9a526fd078fca949ed3f1e4a51472ca4a4aad89fcea1738982ce9d7d833116ecc9c6ae9ebbd844832a94e3f4a3d4d1b9d3b9
+  languageName: node
+  linkType: hard
+
 "minipass-fetch@npm:^3.0.0":
   version: 3.0.3
   resolution: "minipass-fetch@npm:3.0.3"
@@ -26043,7 +26284,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^3.0.0":
+"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
   version: 3.3.5
   resolution: "minipass@npm:3.3.5"
   dependencies:
@@ -26679,7 +26920,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@npm:^10.0.0, node-gyp@npm:latest":
+"node-gyp@npm:^10.0.0":
   version: 10.1.0
   resolution: "node-gyp@npm:10.1.0"
   dependencies:
@@ -26699,6 +26940,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-gyp@npm:latest":
+  version: 9.3.0
+  resolution: "node-gyp@npm:9.3.0"
+  dependencies:
+    env-paths: "npm:^2.2.0"
+    glob: "npm:^7.1.4"
+    graceful-fs: "npm:^4.2.6"
+    make-fetch-happen: "npm:^10.0.3"
+    nopt: "npm:^6.0.0"
+    npmlog: "npm:^6.0.0"
+    rimraf: "npm:^3.0.2"
+    semver: "npm:^7.3.5"
+    tar: "npm:^6.1.2"
+    which: "npm:^2.0.2"
+  bin:
+    node-gyp: bin/node-gyp.js
+  checksum: b64c70a3984f9f23b9ae4606940e16c99edb93e7c455965afb0342ac961680efc4e553fed9f2654b9816072298da59fadfb832aeac6c625517cc228edb54c2c3
+  languageName: node
+  linkType: hard
+
 "node-int64@npm:^0.4.0":
   version: 0.4.0
   resolution: "node-int64@npm:0.4.0"
@@ -26751,6 +27012,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nopt@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "nopt@npm:6.0.0"
+  dependencies:
+    abbrev: "npm:^1.0.0"
+  bin:
+    nopt: bin/nopt.js
+  checksum: 3c1128e07cd0241ae66d6e6a472170baa9f3e84dd4203950ba8df5bafac4efa2166ce917a57ef02b01ba7c40d18b2cc64b29b225fd3640791fe07b24f0b33a32
+  languageName: node
+  linkType: hard
+
 "nopt@npm:^7.0.0":
   version: 7.2.1
   resolution: "nopt@npm:7.2.1"
@@ -26897,6 +27169,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"npmlog@npm:^6.0.0":
+  version: 6.0.2
+  resolution: "npmlog@npm:6.0.2"
+  dependencies:
+    are-we-there-yet: "npm:^3.0.0"
+    console-control-strings: "npm:^1.1.0"
+    gauge: "npm:^4.0.3"
+    set-blocking: "npm:^2.0.0"
+  checksum: 82b123677e62deb9e7472e27b92386c09e6e254ee6c8bcd720b3011013e4168bc7088e984f4fbd53cb6e12f8b4690e23e4fa6132689313e0d0dc4feea45489bb
+  languageName: node
+  linkType: hard
+
 "nth-check@npm:^2.0.1":
   version: 2.0.1
   resolution: "nth-check@npm:2.0.1"
@@ -28066,13 +28350,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pirates@npm:^4.0.1, pirates@npm:^4.0.4, pirates@npm:^4.0.5":
+"pirates@npm:^4.0.1":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
   checksum: d02dda76f4fec1cbdf395c36c11cf26f76a644f9f9a1bfa84d3167d0d3154d5289aacc72677aa20d599bb4a6937a471de1b65c995e2aea2d8687cbcd7e43ea5f
   languageName: node
   linkType: hard
 
+"pirates@npm:^4.0.4, pirates@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "pirates@npm:4.0.5"
+  checksum: 3728bae0cf6c18c3d25f5449ee8c5bc1a6a83bca688abe0e1654ce8c069bfd408170397cef133ed9ec8b0faeb4093c5c728d0e72ab7b3385256cd87008c40364
+  languageName: node
+  linkType: hard
+
 "pkg-dir@npm:^3.0.0":
   version: 3.0.0
   resolution: "pkg-dir@npm:3.0.0"
@@ -32276,6 +32567,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ssri@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "ssri@npm:9.0.1"
+  dependencies:
+    minipass: "npm:^3.1.1"
+  checksum: 7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718
+  languageName: node
+  linkType: hard
+
 "stack-trace@npm:0.0.10":
   version: 0.0.10
   resolution: "stack-trace@npm:0.0.10"
@@ -32507,7 +32807,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
@@ -34325,6 +34625,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unique-filename@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "unique-filename@npm:2.0.1"
+  dependencies:
+    unique-slug: "npm:^3.0.0"
+  checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f
+  languageName: node
+  linkType: hard
+
 "unique-filename@npm:^3.0.0":
   version: 3.0.0
   resolution: "unique-filename@npm:3.0.0"
@@ -34334,6 +34643,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unique-slug@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-slug@npm:3.0.0"
+  dependencies:
+    imurmurhash: "npm:^0.1.4"
+  checksum: 26fc5bc209a875956dd5e84ca39b89bc3be777b112504667c35c861f9547df95afc80439358d836b878b6d91f6ee21fe5ba1a966e9ec2e9f071ddf3fd67d45ee
+  languageName: node
+  linkType: hard
+
 "unique-slug@npm:^4.0.0":
   version: 4.0.0
   resolution: "unique-slug@npm:4.0.0"
@@ -35656,6 +35974,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wide-align@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "wide-align@npm:1.1.5"
+  dependencies:
+    string-width: "npm:^1.0.2 || 2 || 3 || 4"
+  checksum: d5f8027b9a8255a493a94e4ec1b74a27bff6679d5ffe29316a3215e4712945c84ef73ca4045c7e20ae7d0c72f5f57f296e04a4928e773d4276a2f1222e4c2e99
+  languageName: node
+  linkType: hard
+
 "widest-line@npm:^2.0.0":
   version: 2.0.1
   resolution: "widest-line@npm:2.0.1"

From bdea2e5f4a1c312dd34fc2ba713f71ae0c02fb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Mon, 3 Jun 2024 15:45:42 +0100
Subject: [PATCH 004/236] chore: adds to allowlist
 AccountsController:getSelectedAccount and other (#24992)
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 to the MMI actions allow list:

```
AccountsController:getSelectedAccount
AccountsController:setSelectedAccount
```

## **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/scripts/metamask-controller.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b421cb6a4844..d25c0e15e589 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1774,6 +1774,8 @@ export default class MetamaskController extends EventEmitter {
         'AccountsController:getAccountByAddress',
         'AccountsController:setAccountName',
         'AccountsController:listAccounts',
+        'AccountsController:getSelectedAccount',
+        'AccountsController:setSelectedAccount',
       ],
     });
 

From 08d8395595772bbd1c669ec3730dad07c6b151c8 Mon Sep 17 00:00:00 2001
From: Antonio Regadas <antonio.regadas@consensys.net>
Date: Fri, 7 Jun 2024 14:10:24 +0100
Subject: [PATCH 005/236] chore: applies patch for tx-controller

---
 ...ion-controller-npm-29.1.0-22871eb356.patch | Bin 0 -> 8118 bytes
 package.json                                  |   2 +-
 yarn.lock                                     | 130 +++++++-----------
 3 files changed, 47 insertions(+), 85 deletions(-)
 create mode 100644 .yarn/patches/@metamask-transaction-controller-npm-29.1.0-22871eb356.patch

diff --git a/.yarn/patches/@metamask-transaction-controller-npm-29.1.0-22871eb356.patch b/.yarn/patches/@metamask-transaction-controller-npm-29.1.0-22871eb356.patch
new file mode 100644
index 0000000000000000000000000000000000000000..43d0e53aa9db46ac90119d0283c5916b0faf0550
GIT binary patch
literal 8118
zcmeHM>ucji5V!8q*6~ruhZgSRH21~9wyd`$j)LpDFKF(LI=OQ64tKQ=TZy7IlAHug
z{<P9RssBQE_3$e;1X}1L8jxpqXLfexw;F4uApv91=}dwYP*)v}#-o(S6#P}Y5z!l9
zK}g|>6AHSfIhNH3B0_ILdmyQ*LoDnX#K+hqriDG1QOkE3Aq?9tW-hg{!yFSgI-L%5
z3BB${^Du0*TCELV`hDnVZ4FvF^!trgtyWV8bE4O3N1|C5m*k3U>>xS3Q}m=zmRylG
z{F`LvhujzaKYstMkpA15^!}hmYC$cjrJE7>voJ_fO%uT=Po5rp^zkS4di`1b!)VHH
zMkz|?$pFQ_$le*}p<lL<|2CjE<D<{M=241*h{oB3fKZ|G{%3Iy@S6djM<mJSj&ec$
z@bGYa^n9@}EZc2^Zr`<G;Tc*REXTULJFI{HqWkiv@nv`w@g=&7z&)c+3tqBZV;R@=
zD2_rNO@z3dQEFDaLZCvRLZCw6@gh(>6Y9?%F9cQO6#^9kdk~QS4<Ihd`vuQWm|{c@
z${%@<mi$0+Nun*^D<p@4_X}PeU==A7q~wzY&nGLz3x|>$5aUqj^$T8}fXf50lC3T*
z6|0voGfL)x7>8_PP3h;n`mGSC5ZFZEY2H1Or+{xn%ItjU-<(qQDg-J7{$~g%2gA{D
zAcD#t&iA8}&sq@Iui}y<^~wiw*4sD=h>rXxc`h|232i8Nzu?tzKmt)wg}^_IK;u2U
z;vh;Fq4;bKC<Pi3;4CX-G{}0<gNQHVT|Avfmz}}u)6*Y@!#C<hBB~C%1x4k<N1DSd
zm-RfRJBFocmSuRvVm;(~#MEt#y3|EFR#lr4OUItsBZk&v%w#Uch}n*YnCtm2vM6&k
zLiDn-A`2jB-{N^aWRGXEIAZ9A)Apd1aa|Kt61YY&oW&?g5KaRg$#3~F4?`Nmmw-c*
zBtUOd0Z#&BA0-qo<?29m*VGpc$Z4FxHFDm5_xjEGyNg7f#r%Te^hZ9K&{)MN44c<H
zARxZ^ACE4B*(``AkOY&65=gRo1E2&VUXG<J_l{3qmdnI6oyQU6mWt84Mo0P(Flc^}
zPJ={6EEQ!5VY<0y<dmkUT^K*RJvo6zqa~+_*pd{s6u*u6)%ToV3OL3gCn%Y!Sd<v(
zkkZ*^EL#(Wr<v6UI8&~%<&^YEP!`C1Mo>!6R!B7SP&0+qXck(&?heUvof1QU<2943
z&3qwuV@(1bIL{n_4A2a_<I>1#Oa6|Xmp7Tn#R#SXbh+L8((&CZ+j71do~u{e`M54A
z6VgFFOnld~Y~&csvQ5{vb=`Lf!M^8t4)UpP`M#=pgqqkgOziY*<~feYR0rG0#3B`4
yog!xT5Y~)ksq<b!ZmfPUBR8afIVJa{;6}zZ|5Hh}Os?&WeT4b+ux-4TF@FN%e8UR>

literal 0
HcmV?d00001

diff --git a/package.json b/package.json
index 2b2c07066a25..6000435c1804 100644
--- a/package.json
+++ b/package.json
@@ -335,7 +335,7 @@
     "@metamask/snaps-rpc-methods": "8.0.0",
     "@metamask/snaps-sdk": "4.0.1",
     "@metamask/snaps-utils": "7.2.0",
-    "@metamask/transaction-controller": "^29.0.2",
+    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A29.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-29.1.0-22871eb356.patch",
     "@metamask/user-operation-controller": "^6.0.0",
     "@metamask/utils": "^8.2.1",
     "@ngraveio/bc-ur": "^1.1.12",
diff --git a/yarn.lock b/yarn.lock
index 8a4650110bd2..d14acd9e5bdb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -337,14 +337,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.22.5
-  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
-  checksum: ab220db218089a2aadd0582f5833fd17fa300245999f5f8784b10f5a75267c4e808592284a29438a0da365e702f05acb369f99e1c915c02f9f9210ec60eab8ea
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.24.6":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.6, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.24.6
   resolution: "@babel/helper-plugin-utils@npm:7.24.6"
   checksum: 0ac0a7a19959fb2f880ea87650475a4960232e98825d9a50f4aa56e5750a70fc799b48cf570af63a06b810d0128e758e801865762b51a8348067e37751a38478
@@ -458,7 +451,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.24.6":
+"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.22.13, @babel/highlight@npm:^7.24.6":
   version: 7.24.6
   resolution: "@babel/highlight@npm:7.24.6"
   dependencies:
@@ -470,17 +463,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.22.13":
-  version: 7.23.4
-  resolution: "@babel/highlight@npm:7.23.4"
-  dependencies:
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
-    chalk: "npm:^2.4.2"
-    js-tokens: "npm:^4.0.0"
-  checksum: 62fef9b5bcea7131df4626d009029b1ae85332042f4648a4ce6e740c3fd23112603c740c45575caec62f260c96b11054d3be5987f4981a5479793579c3aac71f
-  languageName: node
-  linkType: hard
-
 "@babel/parser@npm:7.16.4":
   version: 7.16.4
   resolution: "@babel/parser@npm:7.16.4"
@@ -508,15 +490,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.22.15":
-  version: 7.24.4
-  resolution: "@babel/parser@npm:7.24.4"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: 3742cc5068036287e6395269dce5a2735e6349cdc8d4b53297c75f98c580d7e1c8cb43235623999d151f2ef975d677dbc2c2357573a1855caa71c271bf3046c9
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
   version: 7.22.15
   resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
@@ -708,18 +681,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-jsx@npm:^7.24.6":
+"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.24.6, @babel/plugin-syntax-jsx@npm:^7.7.2":
   version: 7.24.6
   resolution: "@babel/plugin-syntax-jsx@npm:7.24.6"
   dependencies:
@@ -1702,18 +1664,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3":
-  version: 7.22.15
-  resolution: "@babel/template@npm:7.22.15"
-  dependencies:
-    "@babel/code-frame": "npm:^7.22.13"
-    "@babel/parser": "npm:^7.22.15"
-    "@babel/types": "npm:^7.22.15"
-  checksum: 21e768e4eed4d1da2ce5d30aa51db0f4d6d8700bc1821fec6292587df7bba2fe1a96451230de8c64b989740731888ebf1141138bfffb14cacccf4d05c66ad93f
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.24.6":
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.24.6, @babel/template@npm:^7.3.3":
   version: 7.24.6
   resolution: "@babel/template@npm:7.24.6"
   dependencies:
@@ -6067,6 +6018,41 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/transaction-controller@npm:29.1.0":
+  version: 29.1.0
+  resolution: "@metamask/transaction-controller@npm:29.1.0"
+  dependencies:
+    "@ethereumjs/common": "npm:^3.2.0"
+    "@ethereumjs/tx": "npm:^4.2.0"
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@ethersproject/abi": "npm:^5.7.0"
+    "@ethersproject/contracts": "npm:^5.7.0"
+    "@ethersproject/providers": "npm:^5.7.0"
+    "@metamask/approval-controller": "npm:^6.0.2"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/gas-fee-controller": "npm:^15.1.2"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/network-controller": "npm:^18.1.1"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/utils": "npm:^8.3.0"
+    async-mutex: "npm:^0.2.6"
+    bn.js: "npm:^5.2.1"
+    eth-method-registry: "npm:^4.0.0"
+    fast-json-patch: "npm:^3.1.1"
+    lodash: "npm:^4.17.21"
+    nonce-tracker: "npm:^3.0.0"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@babel/runtime": ^7.23.9
+    "@metamask/approval-controller": ^6.0.0
+    "@metamask/gas-fee-controller": ^15.0.0
+    "@metamask/network-controller": ^18.0.0
+  checksum: 4b96d17d0bcc0f13ac72a94a3b4f3c3dd0f31a13aa6ae74b343ebe2d77e9aeb636b28c14ab23f08c6d8c6b66158c93f34243cf551f4c12d06b4ea8e87ae4ae64
+  languageName: node
+  linkType: hard
+
 "@metamask/transaction-controller@npm:^25.1.0":
   version: 25.3.0
   resolution: "@metamask/transaction-controller@npm:25.3.0"
@@ -6135,9 +6121,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^29.0.2":
+"@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A29.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-29.1.0-22871eb356.patch":
   version: 29.1.0
-  resolution: "@metamask/transaction-controller@npm:29.1.0"
+  resolution: "@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A29.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-29.1.0-22871eb356.patch::version=29.1.0&hash=9ceba2"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -6166,7 +6152,7 @@ __metadata:
     "@metamask/approval-controller": ^6.0.0
     "@metamask/gas-fee-controller": ^15.0.0
     "@metamask/network-controller": ^18.0.0
-  checksum: 4b96d17d0bcc0f13ac72a94a3b4f3c3dd0f31a13aa6ae74b343ebe2d77e9aeb636b28c14ab23f08c6d8c6b66158c93f34243cf551f4c12d06b4ea8e87ae4ae64
+  checksum: 1ca1e2bc5e03e85cc992be4d6a43ebee281c277d635d53c918603da474d8f650698bb2a4508c411d79168144613d0e98a8f578d1692157de8fe86db874c59021
   languageName: node
   linkType: hard
 
@@ -12981,20 +12967,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"big-integer@npm:1.6.x":
+"big-integer@npm:1.6.x, big-integer@npm:^1.6.44, big-integer@npm:^1.6.48":
   version: 1.6.52
   resolution: "big-integer@npm:1.6.52"
   checksum: 4bc6ae152a96edc9f95020f5fc66b13d26a9ad9a021225a9f0213f7e3dc44269f423aa8c42e19d6ac4a63bb2b22140b95d10be8f9ca7a6d9aa1b22b330d1f514
   languageName: node
   linkType: hard
 
-"big-integer@npm:^1.6.44, big-integer@npm:^1.6.48":
-  version: 1.6.51
-  resolution: "big-integer@npm:1.6.51"
-  checksum: c7a12640901906d6f6b6bdb42a4eaba9578397b6d9a0dd090cf001ec813ff2bfcd441e364068ea0416db6175d2615f8ed19cff7d1a795115bf7c92d44993f991
-  languageName: node
-  linkType: hard
-
 "big.js@npm:^5.2.2":
   version: 5.2.2
   resolution: "big.js@npm:5.2.2"
@@ -21100,7 +21079,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1":
+"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
   version: 7.0.4
   resolution: "https-proxy-agent@npm:7.0.4"
   dependencies:
@@ -21110,16 +21089,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "https-proxy-agent@npm:7.0.2"
-  dependencies:
-    agent-base: "npm:^7.0.2"
-    debug: "npm:4"
-  checksum: 9ec844f78fd643608239c9c3f6819918631df5cd3e17d104cc507226a39b5d4adda9d790fc9fd63ac0d2bb8a761b2f9f60faa80584a9bf9d7f2e8c5ed0acd330
-  languageName: node
-  linkType: hard
-
 "human-signals@npm:^1.1.1":
   version: 1.1.1
   resolution: "human-signals@npm:1.1.1"
@@ -25365,7 +25334,7 @@ __metadata:
     "@metamask/snaps-utils": "npm:7.2.0"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
-    "@metamask/transaction-controller": "npm:^29.0.2"
+    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A29.1.0#~/.yarn/patches/@metamask-transaction-controller-npm-29.1.0-22871eb356.patch"
     "@metamask/user-operation-controller": "npm:^6.0.0"
     "@metamask/utils": "npm:^8.2.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"
@@ -28350,20 +28319,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pirates@npm:^4.0.1":
+"pirates@npm:^4.0.1, pirates@npm:^4.0.4, pirates@npm:^4.0.5":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
   checksum: d02dda76f4fec1cbdf395c36c11cf26f76a644f9f9a1bfa84d3167d0d3154d5289aacc72677aa20d599bb4a6937a471de1b65c995e2aea2d8687cbcd7e43ea5f
   languageName: node
   linkType: hard
 
-"pirates@npm:^4.0.4, pirates@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "pirates@npm:4.0.5"
-  checksum: 3728bae0cf6c18c3d25f5449ee8c5bc1a6a83bca688abe0e1654ce8c069bfd408170397cef133ed9ec8b0faeb4093c5c728d0e72ab7b3385256cd87008c40364
-  languageName: node
-  linkType: hard
-
 "pkg-dir@npm:^3.0.0":
   version: 3.0.0
   resolution: "pkg-dir@npm:3.0.0"

From 47fdf265cd73ba9ca234d6cfc9aec6eaf9fb0723 Mon Sep 17 00:00:00 2001
From: Antonio Regadas <antonio.regadas@consensys.net>
Date: Thu, 6 Jun 2024 10:12:06 +0100
Subject: [PATCH 006/236] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 451760e45c8c..fee34a73cc69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [11.16.8]
+### Changed
+- [MMI] Updates MMI packages to latest versions ([#24581](https://github.com/MetaMask/metamask-extension/pull/24581))
+
+### Fixed
+- [MMI] Fixed an issue that prevented MMI transactions from being sent correctly ([#24947](https://github.com/MetaMask/metamask-extension/pull/24947))
+- [MMI] Better support for MMI Portfolio Dashboard with an update to the allow list  ([#24992](https://github.com/MetaMask/metamask-extension/pull/24992))
 
 ## [11.16.7]
 ### Fixed

From 240d7d7db5284169ed907206cc26144f232b22e8 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 6 Jun 2024 17:26:40 -0230
Subject: [PATCH 007/236] fix: Add resolution for rpc-websockets to handle deps
 audit failure (#25112)

---
 package.json | 3 ++-
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6000435c1804..4ca77c9fb4f8 100644
--- a/package.json
+++ b/package.json
@@ -251,7 +251,8 @@
     "ts-mixer@npm:^6.0.3": "patch:ts-mixer@npm%3A6.0.4#~/.yarn/patches/ts-mixer-npm-6.0.4-5d9747bdf5.patch",
     "sucrase@npm:3.34.0": "^3.35.0",
     "@expo/config/glob": "^10.3.10",
-    "@expo/config-plugins/glob": "^10.3.10"
+    "@expo/config-plugins/glob": "^10.3.10",
+    "@solana/web3.js/rpc-websockets": "^8.0.1"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
diff --git a/yarn.lock b/yarn.lock
index d14acd9e5bdb..d5381f33e22b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31194,9 +31194,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rpc-websockets@npm:^7.11.0":
-  version: 7.11.1
-  resolution: "rpc-websockets@npm:7.11.1"
+"rpc-websockets@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "rpc-websockets@npm:8.0.1"
   dependencies:
     bufferutil: "npm:^4.0.1"
     eventemitter3: "npm:^4.0.7"
@@ -31208,7 +31208,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 6b23cc7a54eb2158f4098545c0adbf118e9240d6006e262048b3dd5125e352892f989df7337b4ca70a1505699a480c92d6f3c58ebb8f4d3a483dda9606890a28
+  checksum: ec50bebb6d85f977d3ab16c31d107ff7f546ea472be8f827d6236d2bbbb6d807481a7028a16f3fa7a9163b2338d9957a97e78f03761a9adc0e04b68586973c1c
   languageName: node
   linkType: hard
 

From 6b9a6e27ebf98a78360940607542245c9985da20 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 6 Jun 2024 21:00:00 -0230
Subject: [PATCH 008/236] fix: Include missing files in Sentry release artifact
 upload (#25113)
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 Sentry release artifact upload step was assuming that all JavaScript
files were at the root of the build directory. This is not the case; in
#23672 some of them were moved to a `scripts/` subdirectory. These files
have been missing from release artifacts for some time now.

The script has been updated to include all JavaScript files included in
the build. It references the entire build directory now rather than
specifically targetting JavaScript files at the top-level. No additional
filter is needed to exclude non-JavaScript files because this command
defaults to only including JavaScript and sourcemap files (and some
React native files that don't exist in our build).

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

## **Related issues**

Fixes #25110

## **Manual testing steps**

1. Create a personal Sentry account (if you don't have one already)
2. Create a project in Sentry called `metamask` (if you don't have one
already)
2. Run this script:
```
SENTRY_ORG=[your account name/organization] SENTRY_PROJECT=metamask yarn exec ./development/sentry-upload-artifacts.sh --release v11.16.7
```
3. Verify that all JavaScript files and source maps are shown on the CLI
as being uploaded, and visible in the artifact bundle on the Sentry
dashboard
* The artifact bundle should be listed here: `https://[your
username/organization].sentry.io/settings/projects/metamask/source-maps/artifact-bundles/`

## **Screenshots/Recordings**

N/A

## **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.
---
 development/sentry-upload-artifacts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/development/sentry-upload-artifacts.sh b/development/sentry-upload-artifacts.sh
index e70989123e03..7b712f12de31 100755
--- a/development/sentry-upload-artifacts.sh
+++ b/development/sentry-upload-artifacts.sh
@@ -31,7 +31,7 @@ function upload_sourcemaps {
   local release="${1}"; shift
   local dist_directory="${1}"; shift
 
-  sentry-cli releases files "${release}" upload-sourcemaps "${dist_directory}"/chrome/*.js "${dist_directory}"/sourcemaps/ --rewrite --url-prefix '/metamask'
+  sentry-cli releases files "${release}" upload-sourcemaps "${dist_directory}"/chrome/ "${dist_directory}"/sourcemaps/ --rewrite --url-prefix '/metamask'
 }
 
 function main {

From f19bcdfe37695c1ff22359854665af748352cfb4 Mon Sep 17 00:00:00 2001
From: jiexi <jiexiluan@gmail.com>
Date: Fri, 7 Jun 2024 06:31:29 -0700
Subject: [PATCH 009/236] Version v11.16.8 alternative - patch selected network
 controller (#25127)

Core PR: https://github.com/MetaMask/core/pull/4388
Patch Branch:
[jl/patch-selected-network-controller-12.0.1-setNetworkClientId-guard](https://github.com/MetaMask/core/tree/jl/patch-selected-network-controller-12.0.1-setNetworkClientId-guard)
---
 ...ork-controller-npm-12.0.1-34b2edf62d.patch | Bin 261008 -> 205259 bytes
 yarn.lock                                     |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch b/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch
index 4fc71d3c88eb7ff1568d8d01cfb3477789bc836b..768b8f9e906e443d9832c2cba1ec36647f6cceb0 100644
GIT binary patch
delta 4881
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
jOm?mI)5pU;He24{d&4#%0AX1=0IVEjhu0I8y*c<7bfC@Z

delta 10624
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

diff --git a/yarn.lock b/yarn.lock
index d5381f33e22b..7020ba1ebaa1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5616,7 +5616,7 @@ __metadata:
 
 "@metamask/selected-network-controller@patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch":
   version: 12.0.1
-  resolution: "@metamask/selected-network-controller@patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch::version=12.0.1&hash=808666"
+  resolution: "@metamask/selected-network-controller@patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch::version=12.0.1&hash=6bb7a8"
   dependencies:
     "@metamask/base-controller": "npm:^5.0.1"
     "@metamask/json-rpc-engine": "npm:^8.0.1"
@@ -5627,7 +5627,7 @@ __metadata:
   peerDependencies:
     "@metamask/network-controller": ^18.0.0
     "@metamask/permission-controller": ^9.0.0
-  checksum: 04471191561f4305b651bbefc5c6885eb26878fb24ee9ecf77f9a0f24367a33132453e6c1e8f315b8374fecbc0336eeb83a3043dfbbc3af1b2c13965a87383a0
+  checksum: a0dbb9ccbee2e1c0e6f360b3fb979141ec5a4ad3d83e41dbd494de8af03ca7a3a6c92b9c252911bee287322e6aafb6f1da5deee20d1c8d2e036150731aa19226
   languageName: node
   linkType: hard
 

From ef12a9d793c38e5fb52d481208a4e76ebc0b5fd3 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 7 Jun 2024 12:13:57 -0230
Subject: [PATCH 010/236] Update lockfile

---
 yarn.lock | 270 ++----------------------------------------------------
 1 file changed, 8 insertions(+), 262 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7020ba1ebaa1..bfc99b8f8948 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3097,13 +3097,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gar/promisify@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 052dd232140fa60e81588000cbe729a40146579b361f1070bce63e2a761388a22a16d00beeffc504bd3601cb8e055c57b21a185448b3ed550cf50716f4fd442e
-  languageName: node
-  linkType: hard
-
 "@graphql-tools/merge@npm:8.3.1":
   version: 8.3.1
   resolution: "@graphql-tools/merge@npm:8.3.1"
@@ -6393,16 +6386,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@npmcli/fs@npm:2.1.2"
-  dependencies:
-    "@gar/promisify": "npm:^1.1.3"
-    semver: "npm:^7.3.5"
-  checksum: c5d4dfee80de2236e1e4ed595d17e217aada72ebd8215183fc46096fa010f583dd2aaaa486758de7cc0b89440dbc31cfe8b276269d75d47af35c716e896f78ec
-  languageName: node
-  linkType: hard
-
 "@npmcli/fs@npm:^3.1.0":
   version: 3.1.0
   resolution: "@npmcli/fs@npm:3.1.0"
@@ -6428,16 +6411,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/move-file@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "@npmcli/move-file@npm:2.0.1"
-  dependencies:
-    mkdirp: "npm:^1.0.4"
-    rimraf: "npm:^3.0.2"
-  checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380
-  languageName: node
-  linkType: hard
-
 "@npmcli/node-gyp@npm:^3.0.0":
   version: 3.0.0
   resolution: "@npmcli/node-gyp@npm:3.0.0"
@@ -11434,13 +11407,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abbrev@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "abbrev@npm:1.1.1"
-  checksum: 2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243
-  languageName: node
-  linkType: hard
-
 "abbrev@npm:^2.0.0":
   version: 2.0.0
   resolution: "abbrev@npm:2.0.0"
@@ -11744,7 +11710,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agentkeepalive@npm:^4.2.1, agentkeepalive@npm:^4.5.0":
+"agentkeepalive@npm:^4.5.0":
   version: 4.5.0
   resolution: "agentkeepalive@npm:4.5.0"
   dependencies:
@@ -12040,13 +12006,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3 || ^2.0.0":
-  version: 2.0.0
-  resolution: "aproba@npm:2.0.0"
-  checksum: c2b9a631298e8d6f3797547e866db642f68493808f5b37cd61da778d5f6ada890d16f668285f7d60bd4fc3b03889bd590ffe62cf81b700e9bb353431238a0a7b
-  languageName: node
-  linkType: hard
-
 "archy@npm:^1.0.0":
   version: 1.0.0
   resolution: "archy@npm:1.0.0"
@@ -12061,16 +12020,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"are-we-there-yet@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "are-we-there-yet@npm:3.0.1"
-  dependencies:
-    delegates: "npm:^1.0.0"
-    readable-stream: "npm:^3.6.0"
-  checksum: 390731720e1bf9ed5d0efc635ea7df8cbc4c90308b0645a932f06e8495a0bf1ecc7987d3b97e805f62a17d6c4b634074b25200aa4d149be2a7b17250b9744bc4
-  languageName: node
-  linkType: hard
-
 "arg@npm:^4.1.0":
   version: 4.1.3
   resolution: "arg@npm:4.1.3"
@@ -13790,32 +13739,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^16.1.0":
-  version: 16.1.3
-  resolution: "cacache@npm:16.1.3"
-  dependencies:
-    "@npmcli/fs": "npm:^2.1.0"
-    "@npmcli/move-file": "npm:^2.0.0"
-    chownr: "npm:^2.0.0"
-    fs-minipass: "npm:^2.1.0"
-    glob: "npm:^8.0.1"
-    infer-owner: "npm:^1.0.4"
-    lru-cache: "npm:^7.7.1"
-    minipass: "npm:^3.1.6"
-    minipass-collect: "npm:^1.0.2"
-    minipass-flush: "npm:^1.0.5"
-    minipass-pipeline: "npm:^1.2.4"
-    mkdirp: "npm:^1.0.4"
-    p-map: "npm:^4.0.0"
-    promise-inflight: "npm:^1.0.1"
-    rimraf: "npm:^3.0.2"
-    ssri: "npm:^9.0.0"
-    tar: "npm:^6.1.11"
-    unique-filename: "npm:^2.0.0"
-  checksum: a14524d90e377ee691d63a81173b33c473f8bc66eb299c64290b58e1d41b28842397f8d6c15a01b4c57ca340afcec019ae112a45c2f67a79f76130d326472e92
-  languageName: node
-  linkType: hard
-
 "cacache@npm:^18.0.0":
   version: 18.0.3
   resolution: "cacache@npm:18.0.3"
@@ -14940,13 +14863,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console-control-strings@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "console-control-strings@npm:1.1.0"
-  checksum: 27b5fa302bc8e9ae9e98c03c66d76ca289ad0c61ce2fe20ab288d288bee875d217512d2edb2363fc83165e88f1c405180cf3f5413a46e51b4fe1a004840c6cdb
-  languageName: node
-  linkType: hard
-
 "consolidate@npm:^0.16.0":
   version: 0.16.0
   resolution: "consolidate@npm:0.16.0"
@@ -19333,7 +19249,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
+"fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
@@ -19534,22 +19450,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gauge@npm:^4.0.3":
-  version: 4.0.4
-  resolution: "gauge@npm:4.0.4"
-  dependencies:
-    aproba: "npm:^1.0.3 || ^2.0.0"
-    color-support: "npm:^1.1.3"
-    console-control-strings: "npm:^1.1.0"
-    has-unicode: "npm:^2.0.1"
-    signal-exit: "npm:^3.0.7"
-    string-width: "npm:^4.2.3"
-    strip-ansi: "npm:^6.0.1"
-    wide-align: "npm:^1.1.5"
-  checksum: 09535dd53b5ced6a34482b1fa9f3929efdeac02f9858569cde73cef3ed95050e0f3d095706c1689614059898924b7a74aa14042f51381a1ccc4ee5c29d2389c4
-  languageName: node
-  linkType: hard
-
 "generic-names@npm:^2.0.1":
   version: 2.0.1
   resolution: "generic-names@npm:2.0.1"
@@ -19919,19 +19819,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.1":
-  version: 8.1.0
-  resolution: "glob@npm:8.1.0"
-  dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^5.0.1"
-    once: "npm:^1.3.0"
-  checksum: 9aab1c75eb087c35dbc41d1f742e51d0507aa2b14c910d96fb8287107a10a22f4bbdce26fc0a3da4c69a20f7b26d62f1640b346a4f6e6becfff47f335bb1dc5e
-  languageName: node
-  linkType: hard
-
 "global-agent@npm:^3.0.0":
   version: 3.0.0
   resolution: "global-agent@npm:3.0.0"
@@ -20592,13 +20479,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "has-unicode@npm:2.0.1"
-  checksum: 041b4293ad6bf391e21c5d85ed03f412506d6623786b801c4ab39e4e6ca54993f13201bceb544d92963f9e0024e6e7fbf0cb1d84c9d6b31cb9c79c8c990d13d8
-  languageName: node
-  linkType: hard
-
 "has-value@npm:^0.3.1":
   version: 0.3.1
   resolution: "has-value@npm:0.3.1"
@@ -20936,7 +20816,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1":
+"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
   checksum: 362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f
@@ -21274,13 +21154,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
-  languageName: node
-  linkType: hard
-
 "inflight@npm:^1.0.4":
   version: 1.0.6
   resolution: "inflight@npm:1.0.6"
@@ -24598,7 +24471,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.14.0, lru-cache@npm:^7.7.1":
+"lru-cache@npm:^7.14.0":
   version: 7.18.3
   resolution: "lru-cache@npm:7.18.3"
   checksum: 6029ca5aba3aacb554e919d7ef804fffd4adfc4c83db00fac8248c7c78811fb6d4b6f70f7fd9d55032b3823446546a007edaa66ad1f2377ae833bd983fac5d98
@@ -24672,30 +24545,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^10.0.3":
-  version: 10.2.1
-  resolution: "make-fetch-happen@npm:10.2.1"
-  dependencies:
-    agentkeepalive: "npm:^4.2.1"
-    cacache: "npm:^16.1.0"
-    http-cache-semantics: "npm:^4.1.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.0"
-    is-lambda: "npm:^1.0.1"
-    lru-cache: "npm:^7.7.1"
-    minipass: "npm:^3.1.6"
-    minipass-collect: "npm:^1.0.2"
-    minipass-fetch: "npm:^2.0.3"
-    minipass-flush: "npm:^1.0.5"
-    minipass-pipeline: "npm:^1.2.4"
-    negotiator: "npm:^0.6.3"
-    promise-retry: "npm:^2.0.1"
-    socks-proxy-agent: "npm:^7.0.0"
-    ssri: "npm:^9.0.0"
-  checksum: fef5acb865a46f25ad0b5ad7d979799125db5dbb24ea811ffa850fbb804bc8e495df2237a8ec3a4fc6250e73c2f95549cca6d6d36a73b1faa61224504eb1188f
-  languageName: node
-  linkType: hard
-
 "make-fetch-happen@npm:^13.0.0":
   version: 13.0.1
   resolution: "make-fetch-happen@npm:13.0.1"
@@ -26142,7 +25991,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:5.0.1, minimatch@npm:^5.0.1":
+"minimatch@npm:5.0.1":
   version: 5.0.1
   resolution: "minimatch@npm:5.0.1"
   dependencies:
@@ -26178,15 +26027,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-collect@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "minipass-collect@npm:1.0.2"
-  dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10
-  languageName: node
-  linkType: hard
-
 "minipass-collect@npm:^2.0.1":
   version: 2.0.1
   resolution: "minipass-collect@npm:2.0.1"
@@ -26196,21 +26036,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^2.0.3":
-  version: 2.1.2
-  resolution: "minipass-fetch@npm:2.1.2"
-  dependencies:
-    encoding: "npm:^0.1.13"
-    minipass: "npm:^3.1.6"
-    minipass-sized: "npm:^1.0.3"
-    minizlib: "npm:^2.1.2"
-  dependenciesMeta:
-    encoding:
-      optional: true
-  checksum: 8cfc589563ae2a11eebbf79121ef9a526fd078fca949ed3f1e4a51472ca4a4aad89fcea1738982ce9d7d833116ecc9c6ae9ebbd844832a94e3f4a3d4d1b9d3b9
-  languageName: node
-  linkType: hard
-
 "minipass-fetch@npm:^3.0.0":
   version: 3.0.3
   resolution: "minipass-fetch@npm:3.0.3"
@@ -26253,7 +26078,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
+"minipass@npm:^3.0.0":
   version: 3.3.5
   resolution: "minipass@npm:3.3.5"
   dependencies:
@@ -26889,7 +26714,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@npm:^10.0.0":
+"node-gyp@npm:^10.0.0, node-gyp@npm:latest":
   version: 10.1.0
   resolution: "node-gyp@npm:10.1.0"
   dependencies:
@@ -26909,26 +26734,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@npm:latest":
-  version: 9.3.0
-  resolution: "node-gyp@npm:9.3.0"
-  dependencies:
-    env-paths: "npm:^2.2.0"
-    glob: "npm:^7.1.4"
-    graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^10.0.3"
-    nopt: "npm:^6.0.0"
-    npmlog: "npm:^6.0.0"
-    rimraf: "npm:^3.0.2"
-    semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
-    which: "npm:^2.0.2"
-  bin:
-    node-gyp: bin/node-gyp.js
-  checksum: b64c70a3984f9f23b9ae4606940e16c99edb93e7c455965afb0342ac961680efc4e553fed9f2654b9816072298da59fadfb832aeac6c625517cc228edb54c2c3
-  languageName: node
-  linkType: hard
-
 "node-int64@npm:^0.4.0":
   version: 0.4.0
   resolution: "node-int64@npm:0.4.0"
@@ -26981,17 +26786,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nopt@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "nopt@npm:6.0.0"
-  dependencies:
-    abbrev: "npm:^1.0.0"
-  bin:
-    nopt: bin/nopt.js
-  checksum: 3c1128e07cd0241ae66d6e6a472170baa9f3e84dd4203950ba8df5bafac4efa2166ce917a57ef02b01ba7c40d18b2cc64b29b225fd3640791fe07b24f0b33a32
-  languageName: node
-  linkType: hard
-
 "nopt@npm:^7.0.0":
   version: 7.2.1
   resolution: "nopt@npm:7.2.1"
@@ -27138,18 +26932,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npmlog@npm:^6.0.0":
-  version: 6.0.2
-  resolution: "npmlog@npm:6.0.2"
-  dependencies:
-    are-we-there-yet: "npm:^3.0.0"
-    console-control-strings: "npm:^1.1.0"
-    gauge: "npm:^4.0.3"
-    set-blocking: "npm:^2.0.0"
-  checksum: 82b123677e62deb9e7472e27b92386c09e6e254ee6c8bcd720b3011013e4168bc7088e984f4fbd53cb6e12f8b4690e23e4fa6132689313e0d0dc4feea45489bb
-  languageName: node
-  linkType: hard
-
 "nth-check@npm:^2.0.1":
   version: 2.0.1
   resolution: "nth-check@npm:2.0.1"
@@ -32529,15 +32311,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssri@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "ssri@npm:9.0.1"
-  dependencies:
-    minipass: "npm:^3.1.1"
-  checksum: 7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718
-  languageName: node
-  linkType: hard
-
 "stack-trace@npm:0.0.10":
   version: 0.0.10
   resolution: "stack-trace@npm:0.0.10"
@@ -32769,7 +32542,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
@@ -34587,15 +34360,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-filename@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "unique-filename@npm:2.0.1"
-  dependencies:
-    unique-slug: "npm:^3.0.0"
-  checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f
-  languageName: node
-  linkType: hard
-
 "unique-filename@npm:^3.0.0":
   version: 3.0.0
   resolution: "unique-filename@npm:3.0.0"
@@ -34605,15 +34369,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-slug@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unique-slug@npm:3.0.0"
-  dependencies:
-    imurmurhash: "npm:^0.1.4"
-  checksum: 26fc5bc209a875956dd5e84ca39b89bc3be777b112504667c35c861f9547df95afc80439358d836b878b6d91f6ee21fe5ba1a966e9ec2e9f071ddf3fd67d45ee
-  languageName: node
-  linkType: hard
-
 "unique-slug@npm:^4.0.0":
   version: 4.0.0
   resolution: "unique-slug@npm:4.0.0"
@@ -35936,15 +35691,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "wide-align@npm:1.1.5"
-  dependencies:
-    string-width: "npm:^1.0.2 || 2 || 3 || 4"
-  checksum: d5f8027b9a8255a493a94e4ec1b74a27bff6679d5ffe29316a3215e4712945c84ef73ca4045c7e20ae7d0c72f5f57f296e04a4928e773d4276a2f1222e4c2e99
-  languageName: node
-  linkType: hard
-
 "widest-line@npm:^2.0.0":
   version: 2.0.1
   resolution: "widest-line@npm:2.0.1"

From b2930c2cc4a153ff9b15f157134b7ba04d95aebe Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Fri, 7 Jun 2024 14:53:56 +0000
Subject: [PATCH 011/236] Update LavaMoat policies

---
 lavamoat/browserify/mmi/policy.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 87087d18fde1..dc6edd72b20e 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -787,7 +787,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask-institutional/sdk": true,
         "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": true,
-        "@metamask-institutional/transaction-update>@metamask/obs-store": true,
+        "@metamask/obs-store": true,
         "webpack>events": true
       }
     },
@@ -5113,4 +5113,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

From 9a0fa837126865c109b3e10a1df0d89b0fc4cec2 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 7 Jun 2024 12:41:25 -0230
Subject: [PATCH 012/236] fix: Update minimum browser warning version, and
 gracefully fail if chrome.offscreen does not exist (#25142)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the update to manifest v3, users on versions older than chrome 109
would have errors thrown from app-init about chrome.offscreen being
undefined. Snaps and hardware wallets would be broken for these users.

We need to update our minimum supported browser version to 109, but
before we do that we need to warn users that there current browser
version is out of date.

This PR:
1. Handles the of chrome.offscreen being undefined in app-init.js, by
simple not attempting to create the offscreen document of
chrome.offscreen is undefined
2. Updates the `OUTDATED_BROWSER_VERSIONS` const so that users on
chromium versions older than 109 will see a warning about their browser
version
3. Adds an additional note to the outdated browser warning to tell users
that snaps and hardware wallets won't work on the current version (but
only for users on a MV3 version, where there is no offscreen document
api)

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

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

1. Install a chromium version earlier than 109
(https://www.chromium.org/getting-involved/download-chromium/#downloading-old-builds-of-chrome-chromium)
2. Build, install and onboard on this branch
3. You should see a warning about the browser being out of date, and
that snaps and most hardware wallets won't work with this version

![Screenshot from 2024-06-07
10-26-34](https://github.com/MetaMask/metamask-extension/assets/7499938/fa1ab356-47eb-4720-916c-72e334d9d0e5)
![Screenshot from 2024-06-07
10-25-59](https://github.com/MetaMask/metamask-extension/assets/7499938/36f78219-3266-4e76-9600-1b5f983ae98a)

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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 +++
 app/scripts/app-init.js         |  2 +-
 shared/modules/mv3.utils.js     | 20 ++++++++++++++++++++
 ui/helpers/constants/common.ts  | 13 ++++++++-----
 ui/helpers/utils/util.test.js   |  6 +++---
 ui/pages/home/home.component.js | 16 +++++++++++++++-
 6 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 350195769da2..4e932f8a21e4 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2975,6 +2975,9 @@
   "noDomainResolution": {
     "message": "No resolution for domain provided."
   },
+  "noHardwareWalletOrSnapsSupport": {
+    "message": "Snaps, and most hardware wallets, will not work with your current browser version."
+  },
   "noNFTs": {
     "message": "No NFTs yet"
   },
diff --git a/app/scripts/app-init.js b/app/scripts/app-init.js
index 754346ecf2a0..c2295eeafc0b 100644
--- a/app/scripts/app-init.js
+++ b/app/scripts/app-init.js
@@ -186,7 +186,7 @@ registerInPageContentScript();
  * folder for more details.
  */
 async function createOffscreen() {
-  if (await chrome.offscreen.hasDocument()) {
+  if (!chrome.offscreen || (await chrome.offscreen.hasDocument())) {
     return;
   }
 
diff --git a/shared/modules/mv3.utils.js b/shared/modules/mv3.utils.js
index 3f9388b07a6b..4307ebbd8920 100644
--- a/shared/modules/mv3.utils.js
+++ b/shared/modules/mv3.utils.js
@@ -1,4 +1,24 @@
 import browser from 'webextension-polyfill';
 
+/**
+ * A boolean indicating whether the manifest of the current extension
+ * is set to manifest version 3.
+ */
 export const isManifestV3 =
   browser.runtime.getManifest().manifest_version === 3;
+
+/**
+ * A boolean indicating whether the browser supports the offscreen document api.
+ * This is only available in when the manifest is version 3, and only in chromium
+ * versions 109 and higher. As of June 7, 2024, it is not available in firefox.
+ */
+export const isOffscreenAvailable = Boolean(browser.offscreen);
+
+/**
+ * A boolean indicating whether the current extension's manifest is version 3
+ * while the current browser does not support the offscreen document. This can
+ * happen to users on MetaMask versions 11.16.7 and higher, who are using a
+ * chromium browser with a version below 109.
+ */
+export const isMv3ButOffscreenDocIsMissing =
+  isManifestV3 && !isOffscreenAvailable;
diff --git a/ui/helpers/constants/common.ts b/ui/helpers/constants/common.ts
index 9df9eb95368f..0fcadbff3d6b 100644
--- a/ui/helpers/constants/common.ts
+++ b/ui/helpers/constants/common.ts
@@ -14,12 +14,15 @@ export const SUPPORT_REQUEST_LINK = process.env.SUPPORT_REQUEST_LINK;
 export const CONTRACT_ADDRESS_LINK = _contractAddressLink;
 export const PASSWORD_MIN_LENGTH = 8;
 export const OUTDATED_BROWSER_VERSIONS = {
-  // Chrome and Edge should match the latest Chrome version released ~2 years ago
-  chrome: '<90',
-  edge: '<90',
+  // Chrome and Edge should match the latest Chrome version released ~2 years ago,
+  // or the earliest version that supports our MV3 functionality, whichever is higher
+  chrome: '<109',
+  edge: '<109',
   // Firefox should match the most recent end-of-life extended support release
   firefox: '<91',
-  // Opera should be set to the equivalent of the Chrome version set
+  // Opera versions correspond to differently numbered Chromium versions.
+  // Opera should be set to the equivalent of the Chromium version set
+  // Opera 95 is based on Chromium 109
   // See https://en.wikipedia.org/wiki/History_of_the_Opera_web_browser
-  opera: '<76',
+  opera: '<95',
 };
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index f51824b3d8e4..bd9cbee4ebdf 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -204,7 +204,7 @@ describe('util', () => {
     });
     it('should return false when given a modern chrome browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.2623.112 Safari/537.36',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.2623.112 Safari/537.36',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(false);
@@ -232,7 +232,7 @@ describe('util', () => {
     });
     it('should return false when given a modern opera browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.3578.98 Safari/537.36 OPR/76.0.3135.47',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.3578.98 Safari/537.36 OPR/95.0.3135.47',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(false);
@@ -246,7 +246,7 @@ describe('util', () => {
     });
     it('should return false when given a modern edge browser', () => {
       const browser = Bowser.getParser(
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.3578.98 Safari/537.36 Edg/90.0.416.68',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.3578.98 Safari/537.36 Edg/109.0.416.68',
       );
       const result = util.getIsBrowserDeprecated(browser);
       expect(result).toStrictEqual(false);
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 6bd78ec0efc9..62c584e46e4b 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -26,6 +26,7 @@ import ConnectedSites from '../connected-sites';
 import ConnectedAccounts from '../connected-accounts';
 import { Tabs, Tab } from '../../components/ui/tabs';
 import { EthOverview } from '../../components/app/wallet-overview';
+import { isMv3ButOffscreenDocIsMissing } from '../../../shared/modules/mv3.utils';
 
 import ActionableMessage from '../../components/ui/actionable-message/actionable-message';
 import {
@@ -483,6 +484,19 @@ export default class Home extends PureComponent {
 
     const autoHideDelay = 5 * SECOND;
 
+    const outdatedBrowserNotificationDescriptionText =
+      isMv3ButOffscreenDocIsMissing ? (
+        <div>
+          <Text>{t('outdatedBrowserNotification')}</Text>
+          <br />
+          <Text fontWeight={FontWeight.Bold} color={TextColor.warningDefault}>
+            {t('noHardwareWalletOrSnapsSupport')}
+          </Text>
+        </div>
+      ) : (
+        t('outdatedBrowserNotification')
+      );
+
     return (
       <MultipleNotifications>
         {newNftAddedMessage === 'success' ? (
@@ -700,7 +714,7 @@ export default class Home extends PureComponent {
         ) : null}
         {showOutdatedBrowserWarning ? (
           <HomeNotification
-            descriptionText={t('outdatedBrowserNotification')}
+            descriptionText={outdatedBrowserNotificationDescriptionText}
             acceptText={t('gotIt')}
             onAccept={this.onOutdatedBrowserWarningClose}
             key="home-outdatedBrowserNotification"

From 4095493dc030d49af8268b58a173af9a3ded5e76 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 6 Jun 2024 15:08:49 -0230
Subject: [PATCH 013/236] fix: Fix types associated with auto lock timer call
 (#25109)

---
 app/scripts/controllers/app-state.js           | 15 ++++++++++++---
 .../advanced-tab/advanced-tab.component.js     |  2 +-
 .../advanced-tab.component.test.js             | 18 ++++++++++++++++--
 ui/store/actions.ts                            |  2 +-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index c871fd739ed2..731a9d0d25e4 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -288,10 +288,19 @@ export default class AppStateController extends EventEmitter {
       return;
     }
 
+    // This is a temporary fix until we add a state migration.
+    // Due to a bug in ui/pages/settings/advanced-tab/advanced-tab.component.js,
+    // it was possible for timeoutMinutes to be saved as a string, as explained
+    // in PR 25109. `alarms.create` will fail in that case. We are
+    // converting this to a number here to prevent that failure. Once
+    // we add a migration to update the malformed state to the right type,
+    // we will remove this conversion.
+    const timeoutToSet = Number(timeoutMinutes);
+
     if (isManifestV3) {
       this.extension.alarms.create(AUTO_LOCK_TIMEOUT_ALARM, {
-        delayInMinutes: timeoutMinutes,
-        periodInMinutes: timeoutMinutes,
+        delayInMinutes: timeoutToSet,
+        periodInMinutes: timeoutToSet,
       });
       this.extension.alarms.onAlarm.addListener((alarmInfo) => {
         if (alarmInfo.name === AUTO_LOCK_TIMEOUT_ALARM) {
@@ -302,7 +311,7 @@ export default class AppStateController extends EventEmitter {
     } else {
       this.timer = setTimeout(
         () => this.onInactiveTimeout(),
-        timeoutMinutes * MINUTE,
+        timeoutToSet * MINUTE,
       );
     }
   }
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 33e0443d4570..2a2a759d5a96 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -613,7 +613,7 @@ export default class AdvancedTab extends PureComponent {
     if (autoLockTimeLimitBeforeNormalization === '') {
       this.setState({
         autoLockTimeLimitBeforeNormalization,
-        autoLockTimeLimit: DEFAULT_AUTO_LOCK_TIME_LIMIT.toString(),
+        autoLockTimeLimit: DEFAULT_AUTO_LOCK_TIME_LIMIT,
         lockTimeError: '',
       });
       return;
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 c50a32a7bd26..3982485b5178 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -6,13 +6,13 @@ import mockState from '../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import AdvancedTab from '.';
 
-const mockSetAutoLockTimeLimit = jest.fn();
+const mockSetAutoLockTimeLimit = jest.fn().mockReturnValue({ type: 'TYPE' });
 const mockSetShowTestNetworks = jest.fn();
 const mockSetStxOptIn = jest.fn();
 
 jest.mock('../../../store/actions.ts', () => {
   return {
-    setAutoLockTimeLimit: () => mockSetAutoLockTimeLimit,
+    setAutoLockTimeLimit: (...args) => mockSetAutoLockTimeLimit(...args),
     setShowTestNetworks: () => mockSetShowTestNetworks,
     setSmartTransactionsOptInStatus: () => mockSetStxOptIn,
   };
@@ -60,6 +60,20 @@ describe('AdvancedTab Component', () => {
     expect(mockSetAutoLockTimeLimit).toHaveBeenCalled();
   });
 
+  it('should update the auto-lockout time to 0 if the input field is set to empty', () => {
+    const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
+    const autoLockoutTime = queryByTestId('auto-lockout-time');
+    const autoLockoutButton = queryByTestId('auto-lockout-button');
+
+    fireEvent.change(autoLockoutTime, { target: { value: '' } });
+
+    expect(autoLockoutTime).toHaveValue('');
+
+    fireEvent.click(autoLockoutButton);
+
+    expect(mockSetAutoLockTimeLimit).toHaveBeenCalledWith(0);
+  });
+
   it('should toggle show test networks', () => {
     const { queryAllByRole } = renderWithProvider(<AdvancedTab />, mockStore);
 
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 6c7331433365..90ad6bcddce6 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -3102,7 +3102,7 @@ export function setSmartTransactionsOptInStatus(
   };
 }
 
-export function setAutoLockTimeLimit(value: boolean) {
+export function setAutoLockTimeLimit(value: number | null) {
   return setPreference('autoLockTimeLimit', value);
 }
 

From 2d74793b141a7a9aa534a1bad3087272dc80f88d Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 7 Jun 2024 13:28:49 -0230
Subject: [PATCH 014/236] Update changelog for v11.16.8

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fee34a73cc69..f7c2b5641570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [11.16.8]
 ### Changed
+- Prepare for increasing the minimum Chromium version supported by MetaMask ([#25142](https://github.com/MetaMask/metamask-extension/pull/25142))
+	- Users on Chromium versions lower than 109 will now see a warning that they need to update their browser.
+	Assuming their Chromium browser does not support the Offscreen Document api, the warning will include a note
+	that Snaps and Hardware wallets do not work on their current browser version.
 - [MMI] Updates MMI packages to latest versions ([#24581](https://github.com/MetaMask/metamask-extension/pull/24581))
 
 ### Fixed
+- Fix bug that could cause users to be locked out of MetaMask if they previously emptied the "Auto-lock timer" advanced setting
+input field and save it in that empty state. ([#25109](https://github.com/MetaMask/metamask-extension/pull/25109))
+- Fix bug that can prevent updates to network data in connected dapps after manually switching the network in the wallet ui ([#25127](https://github.com/MetaMask/metamask-extension/pull/25127))
 - [MMI] Fixed an issue that prevented MMI transactions from being sent correctly ([#24947](https://github.com/MetaMask/metamask-extension/pull/24947))
 - [MMI] Better support for MMI Portfolio Dashboard with an update to the allow list  ([#24992](https://github.com/MetaMask/metamask-extension/pull/24992))
 

From fab8cb54baf30299f4925d41a8b589804f28f168 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Fri, 7 Jun 2024 17:23:56 -0700
Subject: [PATCH 015/236] v12.0.0 swap send updates (#25152)
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**
Follow-up PR for
[Swap+Send](https://github.com/MetaMask/metamask-extension/pull/23703)

Cherry pick of
* chore: update swaps blockedList api url
#[24837](https://github.com/MetaMask/metamask-extension/pull/24837)
* fix: re-enable swap-send-eth e2e test
#[24882](https://github.com/MetaMask/metamask-extension/pull/24882)
* chore: add swap+send analytics
#[25078](https://github.com/MetaMask/metamask-extension/pull/25078)
* fix: resolve all known swap+send bugs
#[25100](https://github.com/MetaMask/metamask-extension/pull/25100)

<!--
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/25152?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Bilal <44588480+BZahory@users.noreply.github.com>
---
 app/_locales/de/messages.json                 |   3 -
 app/_locales/el/messages.json                 |   3 -
 app/_locales/en/messages.json                 |   4 +-
 app/_locales/es/messages.json                 |   3 -
 app/_locales/fr/messages.json                 |   3 -
 app/_locales/hi/messages.json                 |   3 -
 app/_locales/id/messages.json                 |   3 -
 app/_locales/ja/messages.json                 |   3 -
 app/_locales/ko/messages.json                 |   3 -
 app/_locales/pt/messages.json                 |   3 -
 app/_locales/ru/messages.json                 |   3 -
 app/_locales/tl/messages.json                 |   3 -
 app/_locales/tr/messages.json                 |   3 -
 app/_locales/vi/messages.json                 |   3 -
 app/_locales/zh_CN/messages.json              |   3 -
 privacy-snapshot.json                         |   1 +
 shared/constants/metametrics.ts               |   8 +
 shared/constants/swaps.ts                     |   1 +
 shared/lib/swaps-utils.js                     |   8 +-
 test/data/mock-send-state.json                |   1 +
 .../e2e/tests/swap-send/swap-send-eth.spec.ts |  38 ++-
 .../tests/swap-send/swap-send-test-utils.ts   |  24 +-
 test/jest/mocks.js                            |   1 +
 ui/components/app/nfts-items/nfts-items.js    |  26 +-
 .../text-field-search/text-field-search.tsx   |   1 +
 .../asset-picker-modal/AssetList.test.tsx     |  14 +-
 .../asset-picker-modal/AssetList.tsx          |  12 +-
 .../asset-picker-modal.test.tsx               |   8 +-
 .../asset-picker-modal/asset-picker-modal.tsx | 146 +++++++++---
 .../asset-picker/asset-picker.tsx             |  24 +-
 .../asset-picker-amount/max-clear-button.tsx  |   3 +
 .../send/__snapshots__/send.test.js.snap      |   2 +-
 .../pages/send/components/address-book.tsx    |  14 ++
 .../send/components/quote-card/index.tsx      |  15 +-
 .../send/components/recipient-content.tsx     |   2 -
 .../pages/send/components/recipient-input.tsx |  13 +-
 .../pages/send/components/recipient.tsx       |  20 ++
 .../pages/send/components/your-accounts.tsx   |  16 +-
 ui/components/multichain/pages/send/send.js   |  45 +++-
 ui/ducks/send/helpers.js                      |   7 +-
 ui/ducks/send/send.js                         | 223 ++++++++++++++----
 ui/ducks/send/send.test.js                    |   4 +
 ui/hooks/useUpdateSwapsState.test.ts          |   5 +
 ui/hooks/useUpdateSwapsState.ts               |  13 +-
 44 files changed, 560 insertions(+), 181 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 4093f1a7e8ab..a6d9509f2eaa 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -4385,9 +4385,6 @@
   "searchAccounts": {
     "message": "Konten durchsuchen"
   },
-  "searchTokenOrNFT": {
-    "message": "Token oder NFT suchen"
-  },
   "searchTokens": {
     "message": "Tokens suchen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 6ce8f31594d8..07444377c33e 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -4385,9 +4385,6 @@
   "searchAccounts": {
     "message": "Αναζήτηση λογαριασμών"
   },
-  "searchTokenOrNFT": {
-    "message": "Αναζήτηση tokens ή NFC"
-  },
   "searchTokens": {
     "message": "Αναζήτηση tokens"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 8dfe76bd4d6a..95e0cee18115 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -4422,8 +4422,8 @@
   "searchAccounts": {
     "message": "Search accounts"
   },
-  "searchTokenOrNFT": {
-    "message": "Search token or NFT"
+  "searchNfts": {
+    "message": "Search NFTs"
   },
   "searchTokens": {
     "message": "Search tokens"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 1e49892ddc52..9a433fa6cec5 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -4382,9 +4382,6 @@
   "searchAccounts": {
     "message": "Buscar cuentas"
   },
-  "searchTokenOrNFT": {
-    "message": "Buscar token o NFT"
-  },
   "searchTokens": {
     "message": "Buscar tokens"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 914d6751aa66..bfc83939ea44 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -4385,9 +4385,6 @@
   "searchAccounts": {
     "message": "Rechercher des comptes"
   },
-  "searchTokenOrNFT": {
-    "message": "Rechercher un jeton ou un NFT"
-  },
   "searchTokens": {
     "message": "Rechercher des jetons"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index a991c2f69fab..7862528c3aa7 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -4382,9 +4382,6 @@
   "searchAccounts": {
     "message": "अकाउंट्स खोजें"
   },
-  "searchTokenOrNFT": {
-    "message": "टोकन या NFT को ढूंढें"
-  },
   "searchTokens": {
     "message": "टोकनों को ढूंढें"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 646475dd70d6..c78f823a3482 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -4385,9 +4385,6 @@
   "searchAccounts": {
     "message": "Cari akun"
   },
-  "searchTokenOrNFT": {
-    "message": "Cari token atau NFT"
-  },
   "searchTokens": {
     "message": "Cari token"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 6fe9c6e9e022..c4bd9a76e9d3 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -4382,9 +4382,6 @@
   "searchAccounts": {
     "message": "アカウントを検索"
   },
-  "searchTokenOrNFT": {
-    "message": "トークンまたはNFTを検索"
-  },
   "searchTokens": {
     "message": "トークンを検索"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 541eddf65c3b..9a6f5e4f1e57 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -4382,9 +4382,6 @@
   "searchAccounts": {
     "message": "계정 검색"
   },
-  "searchTokenOrNFT": {
-    "message": "토큰 또는 NFT 검색"
-  },
   "searchTokens": {
     "message": "토큰 검색"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 0d2e49a4a352..7c2cb8d46847 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -4385,9 +4385,6 @@
   "searchAccounts": {
     "message": "Pesquisar contas"
   },
-  "searchTokenOrNFT": {
-    "message": "Pesquisar token ou NFT"
-  },
   "searchTokens": {
     "message": "Pesquisar tokens"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 8766b3bf8c5e..fe34b9fb4074 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -4385,9 +4385,6 @@
   "searchAccounts": {
     "message": "Поиск счетов"
   },
-  "searchTokenOrNFT": {
-    "message": "Поиск токена или NFT"
-  },
   "searchTokens": {
     "message": "Поиск токенов"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index bc3ca3ac0d84..3cf94a3b2736 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -4382,9 +4382,6 @@
   "searchAccounts": {
     "message": "Maghanap ng mga account"
   },
-  "searchTokenOrNFT": {
-    "message": "Maghanap ng token o NFT"
-  },
   "searchTokens": {
     "message": "Maghanap ng mga token"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index c2c3e5807dc6..d42faeb0fcf6 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -4385,9 +4385,6 @@
   "searchAccounts": {
     "message": "Hesapları ara"
   },
-  "searchTokenOrNFT": {
-    "message": "Token veya NFT ara"
-  },
   "searchTokens": {
     "message": "Token ara"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 6c4e04884f59..4d433ab1c7b8 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -4382,9 +4382,6 @@
   "searchAccounts": {
     "message": "Tìm kiếm tài khoản"
   },
-  "searchTokenOrNFT": {
-    "message": "Tìm kiếm token hoặc NFT"
-  },
   "searchTokens": {
     "message": "Tìm kiếm token"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index d4031bc5f668..87a5e2cdc6fd 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -4382,9 +4382,6 @@
   "searchAccounts": {
     "message": "搜索账户"
   },
-  "searchTokenOrNFT": {
-    "message": "搜索代币或 NFT"
-  },
   "searchTokens": {
     "message": "搜索代币"
   },
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index b0a1525cf961..499582424bd4 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -41,6 +41,7 @@
   "swap.api.cx.metamask.io",
   "test.metamask-phishing.io",
   "token.api.cx.metamask.io",
+  "tokens.api.cx.metamask.io",
   "tx-sentinel-ethereum-mainnet.api.cx.metamask.io",
   "unresponsive-rpc.url",
   "www.4byte.directory",
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index f3f6f8a08396..0cec97a26f31 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -720,6 +720,13 @@ export enum MetaMetricsEventName {
   // Notifications
   PushNotificationReceived = 'Push Notification Received',
   PushNotificationClicked = 'Push Notification Clicked',
+  // Send
+  sendAssetSelected = 'Send Asset Selected',
+  sendFlowExited = 'Send Flow Exited',
+  sendRecipientSelected = 'Send Recipient Selected',
+  sendSwapQuoteError = 'Send Swap Quote Error',
+  sendSwapQuoteFetched = 'Send Swap Quote Fetched',
+  sendTokenModalOpened = 'Send Token Modal Opened',
 }
 
 export enum MetaMetricsEventAccountType {
@@ -761,6 +768,7 @@ export enum MetaMetricsEventCategory {
   Phishing = 'Phishing',
   PushNotifications = 'Notifications',
   Retention = 'Retention',
+  Send = 'Send',
   Settings = 'Settings',
   Snaps = 'Snaps',
   Swaps = 'Swaps',
diff --git a/shared/constants/swaps.ts b/shared/constants/swaps.ts
index 301e7f7ade0c..61f9b58b3ed5 100644
--- a/shared/constants/swaps.ts
+++ b/shared/constants/swaps.ts
@@ -170,6 +170,7 @@ const SWAPS_TESTNET_CHAIN_ID = '0x539';
 
 export const SWAPS_API_V2_BASE_URL = 'https://swap.api.cx.metamask.io';
 export const SWAPS_DEV_API_V2_BASE_URL = 'https://swap.dev-api.cx.metamask.io';
+export const TOKEN_API_BASE_URL = 'https://tokens.api.cx.metamask.io';
 export const GAS_API_BASE_URL = 'https://gas.api.infura.io';
 export const GAS_DEV_API_BASE_URL = 'https://gas.uat-api.cx.metamask.io';
 
diff --git a/shared/lib/swaps-utils.js b/shared/lib/swaps-utils.js
index 1cc69a7285fb..303e0f12f0e1 100644
--- a/shared/lib/swaps-utils.js
+++ b/shared/lib/swaps-utils.js
@@ -8,6 +8,7 @@ import {
   SWAPS_CLIENT_ID,
   SWAPS_DEV_API_V2_BASE_URL,
   SWAPS_WRAPPED_TOKENS_ADDRESSES,
+  TOKEN_API_BASE_URL,
 } from '../constants/swaps';
 import { SECOND } from '../constants/time';
 import { isValidHexAddress } from '../modules/hexstring-utils';
@@ -130,6 +131,7 @@ const getBaseUrlForNewSwapsApi = (type, chainId) => {
     ? SWAPS_DEV_API_V2_BASE_URL
     : SWAPS_API_V2_BASE_URL;
   const gasApiBaseUrl = GAS_API_BASE_URL;
+  const tokenApiBaseUrl = TOKEN_API_BASE_URL;
   const noNetworkSpecificTypes = ['refreshTime']; // These types don't need network info in the URL.
   if (noNetworkSpecificTypes.includes(type)) {
     return v2ApiBaseUrl;
@@ -139,6 +141,10 @@ const getBaseUrlForNewSwapsApi = (type, chainId) => {
   if (gasApiTypes.includes(type)) {
     return `${gasApiBaseUrl}/networks/${chainIdDecimal}`; // Gas calculations are in its own repo.
   }
+  const tokenApiTypes = ['blockedTokens'];
+  if (tokenApiTypes.includes(type)) {
+    return `${tokenApiBaseUrl}/blocklist?chainId=${chainIdDecimal}`; // Token blocklist is in its own api
+  }
   return `${v2ApiBaseUrl}/networks/${chainIdDecimal}`;
 };
 
@@ -164,7 +170,7 @@ export const getBaseApi = function (type, chainId) {
     case 'gasPrices':
       return `${baseUrl}/gasPrices`;
     case 'blockedTokens':
-      return `${baseUrl}/blockedTokens`;
+      return `${baseUrl}&region=global`;
     case 'network':
       return baseUrl;
     default:
diff --git a/test/data/mock-send-state.json b/test/data/mock-send-state.json
index af9a25d14136..f1caf9b7eeee 100644
--- a/test/data/mock-send-state.json
+++ b/test/data/mock-send-state.json
@@ -1288,6 +1288,7 @@
         "status": "VALID",
         "swapQuotesError": null,
         "swapQuotesLatestRequestTimestamp": null,
+        "timeToFetchQuotes": null,
         "transactionType": "0x2",
         "userInputHexData": null
       }
diff --git a/test/e2e/tests/swap-send/swap-send-eth.spec.ts b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
index b1e40543150f..f7835af0c332 100644
--- a/test/e2e/tests/swap-send/swap-send-eth.spec.ts
+++ b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
@@ -15,9 +15,7 @@ const RECIPIENT_ADDRESS = '0xc427D562164062a23a5cFf596A4a3208e72Acd28';
 
 describe('Swap-Send ETH', function () {
   describe('to non-contract address with data that matches swap data signature', function (this: Suite) {
-    // TODO: reenable this in follow-up
-    // eslint-disable-next-line mocha/no-skipped-tests
-    it.skip('submits a transaction successfully', async function () {
+    it('submits a transaction successfully', async function () {
       await withFixtures(
         getSwapSendFixtures(this.test?.fullTitle()),
         async ({
@@ -38,11 +36,6 @@ describe('Swap-Send ETH', function () {
           await swapSendPage.fillRecipientAddressInput(RECIPIENT_ADDRESS);
           await swapSendPage.fillAmountInput('1');
 
-          await swapSendPage.verifyMaxButtonClick(
-            ['ETH', 'ETH'],
-            ['24.995559472', '24.995559472'],
-          );
-
           await swapSendPage.searchAndSelectToken('TST', 'src');
           await swapSendPage.verifyAssetSymbolsAndAmounts(
             ['TST', 'TST'],
@@ -97,4 +90,33 @@ describe('Swap-Send ETH', function () {
       );
     });
   });
+
+  it('sets max amount', async function () {
+    await withFixtures(
+      getSwapSendFixtures(this.test?.fullTitle()),
+      async ({
+        driver,
+        ganacheServer,
+      }: {
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        driver: any;
+        ganacheServer: Ganache;
+      }) => {
+        const swapSendPage = new SwapSendPage(driver);
+        await logInWithBalanceValidation(driver, ganacheServer);
+
+        // START SWAP AND SEND FLOW
+        await openActionMenuAndStartSendFlow(driver);
+
+        await swapSendPage.fillRecipientAddressInput(RECIPIENT_ADDRESS);
+        await swapSendPage.fillAmountInput('1');
+
+        await swapSendPage.verifyMaxButtonClick(
+          ['ETH', 'ETH'],
+          ['24.995559472', '24.995559472'],
+        );
+      },
+    );
+  });
 });
diff --git a/test/e2e/tests/swap-send/swap-send-test-utils.ts b/test/e2e/tests/swap-send/swap-send-test-utils.ts
index 533e0da97bda..0cfff6449b7f 100644
--- a/test/e2e/tests/swap-send/swap-send-test-utils.ts
+++ b/test/e2e/tests/swap-send/swap-send-test-utils.ts
@@ -36,13 +36,27 @@ export class SwapSendPage {
     );
     const indexOfButtonToClick = isDest ? 1 : 0;
     await buttons[indexOfButtonToClick].click();
-    await this.driver.waitForSelector(
-      '[data-testid="asset-picker-modal-search-input"]',
-    );
-    await this.driver.fill(
+
+    // Clear search input
+    const searchInputField = await this.driver.waitForSelector(
       '[data-testid="asset-picker-modal-search-input"]',
-      symbol,
     );
+    const searchValue = await searchInputField.getProperty('value');
+    if (searchValue) {
+      const clearButton = await this.driver.findElement(
+        '[data-testid="text-field-search-clear-button"]',
+      );
+      if (clearButton) {
+        await clearButton.click();
+      }
+    }
+
+    for (const i of symbol) {
+      const f = await this.driver.waitForSelector(
+        '[data-testid="asset-picker-modal-search-input"]',
+      );
+      await f.press(i);
+    }
     // Verify that only matching tokens are listed
     assert.equal(
       (
diff --git a/test/jest/mocks.js b/test/jest/mocks.js
index 7289f687bcd3..3170a8dbb8f9 100644
--- a/test/jest/mocks.js
+++ b/test/jest/mocks.js
@@ -152,6 +152,7 @@ export const getInitialSendStateWithExistingTxState = (draftTxState) => ({
       },
       swapQuotesError: null,
       swapQuotesLatestRequestTimestamp: null,
+      timeToFetchQuotes: null,
       recipient: {
         ...draftTransactionInitialState.recipient,
         ...draftTxState.recipient,
diff --git a/ui/components/app/nfts-items/nfts-items.js b/ui/components/app/nfts-items/nfts-items.js
index 6615ab928279..7f2cfce7c7cb 100644
--- a/ui/components/app/nfts-items/nfts-items.js
+++ b/ui/components/app/nfts-items/nfts-items.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
@@ -33,8 +33,16 @@ import { getNftsDropdownState } from '../../../ducks/metamask/metamask';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { Icon, IconName, Text } from '../../component-library';
 import { NftItem } from '../../multichain/nft-item';
-import { updateSendAsset } from '../../../ducks/send';
+import {
+  getSendAnalyticProperties,
+  updateSendAsset,
+} from '../../../ducks/send';
 import { AssetType } from '../../../../shared/constants/transaction';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../shared/constants/metametrics';
 
 const width = (isModal) => {
   const env = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
@@ -69,6 +77,9 @@ export default function NftsItems({
   const ipfsGateway = useSelector(getIpfsGateway);
   const openSeaEnabled = useSelector(getOpenSeaEnabled);
 
+  const trackEvent = useContext(MetaMetricsContext);
+  const sendAnalytics = useSelector(getSendAnalyticProperties);
+
   useEffect(() => {
     if (
       chainId !== undefined &&
@@ -153,6 +164,17 @@ export default function NftsItems({
   };
 
   const onSendNft = async (nft) => {
+    trackEvent({
+      event: MetaMetricsEventName.sendAssetSelected,
+      category: MetaMetricsEventCategory.Send,
+      properties: {
+        ...sendAnalytics,
+        is_destination_asset_picker_modal: false,
+        new_asset_symbol: nft.name,
+        new_asset_address: nft.address,
+        is_nft: true,
+      },
+    });
     await dispatch(
       updateSendAsset({
         type: AssetType.NFT,
diff --git a/ui/components/component-library/text-field-search/text-field-search.tsx b/ui/components/component-library/text-field-search/text-field-search.tsx
index 822bed278b98..736f30a55859 100644
--- a/ui/components/component-library/text-field-search/text-field-search.tsx
+++ b/ui/components/component-library/text-field-search/text-field-search.tsx
@@ -46,6 +46,7 @@ export const TextFieldSearch: TextFieldSearchComponent = React.forwardRef(
             <>
               <ButtonIcon
                 className="mm-text-field__button-clear"
+                data-testid="text-field-search-clear-button"
                 ariaLabel={t('clear')}
                 iconName={IconName.Close}
                 size={ButtonIconSize.Sm}
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
index 4a917bdb0f11..4a1d1de9a46c 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
@@ -6,7 +6,6 @@ import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
 import { useUserPreferencedCurrency } from '../../../../hooks/useUserPreferencedCurrency';
 import { useCurrencyDisplay } from '../../../../hooks/useCurrencyDisplay';
 import { AssetType } from '../../../../../shared/constants/transaction';
-import { getSwapsBlockedTokens } from '../../../../ducks/send';
 import AssetList from './AssetList';
 
 jest.mock('react-redux', () => ({
@@ -21,10 +20,6 @@ jest.mock('../../../../ducks/metamask/metamask', () => ({
   getNativeCurrency: jest.fn(),
 }));
 
-jest.mock('../../../../ducks/send', () => ({
-  getSwapsBlockedTokens: jest.fn(),
-}));
-
 jest.mock('../../../../hooks/useUserPreferencedCurrency', () => ({
   useUserPreferencedCurrency: jest.fn(),
 }));
@@ -83,9 +78,6 @@ describe('AssetList', () => {
       if (selector === getSelectedAccountCachedBalance) {
         return balanceValue;
       }
-      if (selector === getSwapsBlockedTokens) {
-        return [];
-      }
       return undefined;
     });
 
@@ -112,6 +104,7 @@ describe('AssetList', () => {
         handleAssetChange={handleAssetChangeMock}
         asset={{ balance: '1', type: AssetType.native }}
         tokenList={tokenList}
+        memoizedSwapsBlockedTokens={new Set([])}
       />,
     );
 
@@ -125,6 +118,7 @@ describe('AssetList', () => {
         handleAssetChange={handleAssetChangeMock}
         asset={{ balance: '1', type: AssetType.native }}
         tokenList={tokenList}
+        memoizedSwapsBlockedTokens={new Set([])}
       />,
     );
 
@@ -142,9 +136,6 @@ describe('AssetList', () => {
         if (selector === getSelectedAccountCachedBalance) {
           return balanceValue;
         }
-        if (selector === getSwapsBlockedTokens) {
-          return ['0xtoken1'];
-        }
         return undefined;
       });
 
@@ -154,6 +145,7 @@ describe('AssetList', () => {
         asset={{ balance: '1', type: AssetType.native }}
         tokenList={tokenList}
         sendingAssetSymbol="IRRELEVANT"
+        memoizedSwapsBlockedTokens={new Set(['0xtoken1'])}
       />,
     );
 
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
index 7e4068f63d69..fc117998ea3c 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
 import classnames from 'classnames';
 import { getSelectedAccountCachedBalance } from '../../../../selectors';
@@ -16,7 +16,6 @@ import {
   FlexWrap,
 } from '../../../../helpers/constants/design-system';
 import { TokenListItem } from '../..';
-import { getSwapsBlockedTokens } from '../../../../ducks/send';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
 import { Asset, Token } from './types';
 import AssetComponent from './Asset';
@@ -26,6 +25,7 @@ type AssetListProps = {
   asset: Asset;
   tokenList: Token[];
   sendingAssetSymbol?: string;
+  memoizedSwapsBlockedTokens: Set<string>;
 };
 
 export default function AssetList({
@@ -33,6 +33,7 @@ export default function AssetList({
   asset,
   tokenList,
   sendingAssetSymbol,
+  memoizedSwapsBlockedTokens,
 }: AssetListProps) {
   const selectedToken = asset.details?.address;
 
@@ -61,11 +62,6 @@ export default function AssetList({
       hideLabel: true,
     });
 
-  const swapsBlockedTokens = useSelector(getSwapsBlockedTokens);
-  const memoizedSwapsBlockedTokens = useMemo(() => {
-    return new Set(swapsBlockedTokens);
-  }, [swapsBlockedTokens]);
-
   return (
     <Box className="tokens-main-view-modal">
       {tokenList.map((token) => {
@@ -73,7 +69,7 @@ export default function AssetList({
         const isSelected = tokenAddress === selectedToken?.toLowerCase();
         const isDisabled = sendingAssetSymbol
           ? !isEqualCaseInsensitive(sendingAssetSymbol, token.symbol) &&
-            memoizedSwapsBlockedTokens.has(tokenAddress)
+            memoizedSwapsBlockedTokens.has(tokenAddress as string)
           : false;
         return (
           <Box
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
index 57936172a067..36eb5c772aaa 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.test.tsx
@@ -142,7 +142,7 @@ describe('AssetPickerModal', () => {
     renderWithProvider(<AssetPickerModal {...defaultProps} />, store);
 
     expect(screen.getByTestId('asset-picker-modal')).toBeInTheDocument();
-    expect(screen.getByPlaceholderText('searchTokenOrNFT')).toBeInTheDocument();
+    expect(screen.getByPlaceholderText('searchTokens')).toBeInTheDocument();
   });
 
   it('calls onClose when modal is closed', () => {
@@ -174,7 +174,7 @@ describe('AssetPickerModal', () => {
   it('filters tokens based on search query', () => {
     renderWithProvider(<AssetPickerModal {...defaultProps} />, store);
 
-    fireEvent.change(screen.getByPlaceholderText('searchTokenOrNFT'), {
+    fireEvent.change(screen.getByPlaceholderText('searchTokens'), {
       target: { value: 'TO' },
     });
 
@@ -182,7 +182,7 @@ describe('AssetPickerModal', () => {
       (AssetList as jest.Mock).mock.calls.slice(-1)[0][0].tokenList.length,
     ).toBe(1);
 
-    fireEvent.change(screen.getByPlaceholderText('searchTokenOrNFT'), {
+    fireEvent.change(screen.getByPlaceholderText('searchTokens'), {
       target: { value: 'UNAVAILABLE TOKEN' },
     });
 
@@ -224,7 +224,7 @@ describe('AssetPickerModal', () => {
       store,
     );
     const modalTitle = getByText('sendSelectReceiveAsset');
-    const searchPlaceholder = getByPlaceholderText('searchTokenOrNFT');
+    const searchPlaceholder = getByPlaceholderText('searchTokens');
 
     expect(modalTitle).toBeInTheDocument();
     expect(searchPlaceholder).toBeInTheDocument();
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
index 042041f6adca..8a4d5789dacf 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useMemo } from 'react';
+import React, { useState, useCallback, useMemo, useContext } from 'react';
 
 import { useSelector } from 'react-redux';
 import { isEqual, uniqBy } from 'lodash';
@@ -37,26 +37,39 @@ import { AssetType } from '../../../../../shared/constants/transaction';
 import { useNftsCollections } from '../../../../hooks/useNftsCollections';
 import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
 import {
+  getAllTokens,
   getCurrentChainId,
   getCurrentCurrency,
+  getIsMainnet,
   getNativeCurrencyImage,
   getSelectedAccountCachedBalance,
   getSelectedInternalAccount,
   getShouldHideZeroBalanceTokens,
   getTokenExchangeRates,
   getTokenList,
+  getUseNftDetection,
 } from '../../../../selectors';
 import {
   getConversionRate,
   getNativeCurrency,
-  getTokens,
 } from '../../../../ducks/metamask/metamask';
 import { useTokenTracker } from '../../../../hooks/useTokenTracker';
 import { getTopAssets } from '../../../../ducks/swaps/swaps';
 import { getRenderableTokenData } from '../../../../hooks/useTokensToSearch';
 import { useEqualityCheck } from '../../../../hooks/useEqualityCheck';
-import AssetList from './AssetList';
+import {
+  MetaMetricsEventName,
+  MetaMetricsEventCategory,
+} from '../../../../../shared/constants/metametrics';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import {
+  getSendAnalyticProperties,
+  getSwapsBlockedTokens,
+} from '../../../../ducks/send';
+import NFTsDetectionNoticeNFTsTab from '../../../app/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab';
+import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
 import { Asset, Collection, Token } from './types';
+import AssetList from './AssetList';
 
 type AssetPickerModalProps = {
   isOpen: boolean;
@@ -78,6 +91,8 @@ export function AssetPickerModal({
   sendingAssetSymbol,
 }: AssetPickerModalProps) {
   const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
+  const sendAnalytics = useSelector(getSendAnalyticProperties);
 
   const [searchQuery, setSearchQuery] = useState('');
 
@@ -108,9 +123,27 @@ export function AssetPickerModal({
     (collection) => collection.nfts.length > 0,
   );
 
+  const swapsBlockedTokens = useSelector(getSwapsBlockedTokens);
+  const memoizedSwapsBlockedTokens = useMemo(() => {
+    return new Set<string>(swapsBlockedTokens);
+  }, [swapsBlockedTokens]);
+
+  const isDest = sendingAssetImage && sendingAssetSymbol;
+
   const handleAssetChange = useCallback(
     (token: Token) => {
       onAssetChange(token);
+      trackEvent({
+        event: MetaMetricsEventName.sendAssetSelected,
+        category: MetaMetricsEventCategory.Send,
+        properties: {
+          ...sendAnalytics,
+          is_destination_asset_picker_modal: Boolean(isDest),
+          new_asset_symbol: token.symbol,
+          new_asset_address: token.address,
+          is_nft: false,
+        },
+      });
       onClose();
     },
     [onAssetChange],
@@ -118,7 +151,6 @@ export function AssetPickerModal({
 
   const defaultActiveTabKey = asset?.type === AssetType.NFT ? 'nfts' : 'tokens';
 
-  const isDest = sendingAssetImage && sendingAssetSymbol;
   const chainId = useSelector(getCurrentChainId);
 
   const nativeCurrencyImage = useSelector(getNativeCurrencyImage);
@@ -133,7 +165,13 @@ export function AssetPickerModal({
   const shouldHideZeroBalanceTokens = useSelector(
     getShouldHideZeroBalanceTokens,
   );
-  const tokens = useSelector(getTokens, isEqual);
+
+  const useNftDetection = useSelector(getUseNftDetection);
+  const isMainnet = useSelector(getIsMainnet);
+
+  const detectedTokens = useSelector(getAllTokens);
+  const tokens = detectedTokens?.[chainId]?.[selectedAddress] ?? [];
+
   const { tokensWithBalances } = useTokenTracker({
     tokens,
     address: selectedAddress,
@@ -162,9 +200,20 @@ export function AssetPickerModal({
     // undefined would be the native token address
     const filteredTokensAddresses = new Set<string | undefined>();
 
+    const getIsDisabled = ({ address, symbol }: Token) => {
+      const isDisabled = sendingAssetSymbol
+        ? !isEqualCaseInsensitive(sendingAssetSymbol, symbol) &&
+          memoizedSwapsBlockedTokens.has(address || '')
+        : false;
+
+      return isDisabled;
+    };
+
     function* tokenGenerator() {
       yield nativeToken;
 
+      const blockedTokens = [];
+
       for (const token of memoizedUsersTokens) {
         yield token;
       }
@@ -173,13 +222,22 @@ export function AssetPickerModal({
       for (const address of Object.keys(topTokens)) {
         const token = tokenList?.[address];
         if (token) {
-          yield token;
+          if (isDest && getIsDisabled(token)) {
+            blockedTokens.push(token);
+            continue;
+          } else {
+            yield token;
+          }
         }
       }
 
       for (const token of Object.values(tokenList)) {
         yield token;
       }
+
+      for (const token of blockedTokens) {
+        yield token;
+      }
     }
 
     let token: Token;
@@ -225,14 +283,15 @@ export function AssetPickerModal({
     currentCurrency,
     chainId,
     tokenList,
+    sendingAssetSymbol,
   ]);
 
   const Search = useCallback(
-    () => (
+    ({ isNFTSearch = false }: { isNFTSearch?: boolean }) => (
       <Box padding={1} paddingLeft={4} paddingRight={4}>
         <TextFieldSearch
           borderRadius={BorderRadius.LG}
-          placeholder={t('searchTokenOrNFT')}
+          placeholder={t(isNFTSearch ? 'searchNfts' : 'searchTokens')}
           value={searchQuery}
           onChange={(e) => setSearchQuery(e.target.value)}
           error={false}
@@ -298,6 +357,7 @@ export function AssetPickerModal({
                 asset={asset}
                 tokenList={filteredTokenList}
                 sendingAssetSymbol={sendingAssetSymbol}
+                memoizedSwapsBlockedTokens={memoizedSwapsBlockedTokens}
               />
             </>
           ) : (
@@ -319,6 +379,7 @@ export function AssetPickerModal({
                     handleAssetChange={handleAssetChange}
                     asset={asset}
                     tokenList={filteredTokenList}
+                    memoizedSwapsBlockedTokens={memoizedSwapsBlockedTokens}
                   />
                 </Tab>
               }
@@ -334,7 +395,7 @@ export function AssetPickerModal({
                 >
                   {hasAnyNfts ? (
                     <Box className="modal-tab__main-view">
-                      <Search />
+                      <Search isNFTSearch />
                       <NftsItems
                         collections={collectionDataFiltered}
                         previouslyOwnedCollection={previouslyOwnedCollection}
@@ -345,40 +406,51 @@ export function AssetPickerModal({
                       />
                     </Box>
                   ) : (
-                    <Box
-                      padding={12}
-                      display={Display.Flex}
-                      flexDirection={FlexDirection.Column}
-                      alignItems={AlignItems.center}
-                      justifyContent={JustifyContent.center}
-                    >
-                      <Box justifyContent={JustifyContent.center}>
-                        <img src="./images/no-nfts.svg" />
-                      </Box>
+                    <>
+                      {isMainnet && !useNftDetection && (
+                        <Box
+                          paddingTop={4}
+                          paddingInlineStart={4}
+                          paddingInlineEnd={4}
+                        >
+                          <NFTsDetectionNoticeNFTsTab />
+                        </Box>
+                      )}
                       <Box
+                        padding={12}
                         display={Display.Flex}
-                        justifyContent={JustifyContent.center}
-                        alignItems={AlignItems.center}
                         flexDirection={FlexDirection.Column}
-                        className="nfts-tab__link"
+                        alignItems={AlignItems.center}
+                        justifyContent={JustifyContent.center}
                       >
-                        <Text
-                          color={TextColor.textMuted}
-                          variant={TextVariant.headingSm}
-                          textAlign={TextAlign.Center}
-                          as="h4"
-                        >
-                          {t('noNFTs')}
-                        </Text>
-                        <ButtonLink
-                          size={ButtonLinkSize.Sm}
-                          href={ZENDESK_URLS.NFT_TOKENS}
-                          externalLink
+                        <Box justifyContent={JustifyContent.center}>
+                          <img src="./images/no-nfts.svg" />
+                        </Box>
+                        <Box
+                          display={Display.Flex}
+                          justifyContent={JustifyContent.center}
+                          alignItems={AlignItems.center}
+                          flexDirection={FlexDirection.Column}
+                          className="nfts-tab__link"
                         >
-                          {t('learnMoreUpperCase')}
-                        </ButtonLink>
+                          <Text
+                            color={TextColor.textMuted}
+                            variant={TextVariant.headingSm}
+                            textAlign={TextAlign.Center}
+                            as="h4"
+                          >
+                            {t('noNFTs')}
+                          </Text>
+                          <ButtonLink
+                            size={ButtonLinkSize.Sm}
+                            href={ZENDESK_URLS.NFT_TOKENS}
+                            externalLink
+                          >
+                            {t('learnMoreUpperCase')}
+                          </ButtonLink>
+                        </Box>
                       </Box>
-                    </Box>
+                    </>
                   )}
                 </Tab>
               }
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 4c7be3c9db44..5867fc86b870 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { useSelector } from 'react-redux';
 import {
   AvatarTokenSize,
@@ -8,7 +8,7 @@ import {
   Box,
   Button,
 } from '../../../component-library';
-import { Asset } from '../../../../ducks/send';
+import { Asset, getSendAnalyticProperties } from '../../../../ducks/send';
 import {
   AlignItems,
   BackgroundColor,
@@ -31,6 +31,11 @@ import Tooltip from '../../../ui/tooltip';
 import { LARGE_SYMBOL_LENGTH } from '../constants';
 import { getAssetImageURL } from '../../../../helpers/utils/util';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
 
 export type AssetPickerProps = {
   asset: Asset;
@@ -53,6 +58,9 @@ export function AssetPicker({
   isDisabled = false,
 }: AssetPickerProps) {
   const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
+  const sendAnalytics = useSelector(getSendAnalyticProperties);
+
   const nativeCurrencySymbol = useSelector(getNativeCurrency);
   const nativeCurrencyImageUrl = useSelector(getNativeCurrencyImage);
   // TODO: Replace `any` with type
@@ -124,7 +132,17 @@ export function AssetPicker({
         paddingRight={2}
         justifyContent={isNFT ? JustifyContent.spaceBetween : undefined}
         backgroundColor={BackgroundColor.transparent}
-        onClick={() => setShowAssetPickerModal(true)}
+        onClick={() => {
+          setShowAssetPickerModal(true);
+          trackEvent({
+            event: MetaMetricsEventName.sendTokenModalOpened,
+            category: MetaMetricsEventCategory.Send,
+            properties: {
+              ...sendAnalytics,
+              is_destination_asset_picker_modal: Boolean(sendingAsset),
+            },
+          });
+        }}
         endIconName={IconName.ArrowDown}
         endIconProps={{
           color: IconColor.iconDefault,
diff --git a/ui/components/multichain/asset-picker-amount/max-clear-button.tsx b/ui/components/multichain/asset-picker-amount/max-clear-button.tsx
index 5abefcf4c857..fc1034fbb827 100644
--- a/ui/components/multichain/asset-picker-amount/max-clear-button.tsx
+++ b/ui/components/multichain/asset-picker-amount/max-clear-button.tsx
@@ -2,6 +2,7 @@ import React, { useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   Asset,
+  getSendAnalyticProperties,
   getSendMaxModeState,
   toggleSendMaxMode,
 } from '../../../ducks/send';
@@ -19,12 +20,14 @@ export default function MaxClearButton({ asset }: { asset: Asset }) {
   const maxModeOn = useSelector(getSendMaxModeState);
   const dispatch = useDispatch();
   const trackEvent = useContext(MetaMetricsContext);
+  const sendAnalytics = useSelector(getSendAnalyticProperties);
 
   const onClick = () => {
     trackEvent({
       event: 'Clicked "Amount Max"',
       category: MetaMetricsEventCategory.Transactions,
       properties: {
+        ...sendAnalytics,
         action: 'Edit Screen',
         legacy_event: true,
       },
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 d20b3201493b..05839490b466 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -540,7 +540,7 @@ exports[`SendPage render and initialization should render correctly even when a
         <div
           class="multichain-send-page__nav-button"
           style="display: inline-flex;"
-          title="Clicking this button will immediately initiate your swap transaction. Please review your transaction details before proceeding."
+          title=""
         >
           <button
             class="mm-box mm-text mm-button-base mm-button-base--size-lg mm-button-base--block mm-button-primary mm-text--body-md-medium 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--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
diff --git a/ui/components/multichain/pages/send/components/address-book.tsx b/ui/components/multichain/pages/send/components/address-book.tsx
index 48614fe64129..84e29e0a1ed5 100644
--- a/ui/components/multichain/pages/send/components/address-book.tsx
+++ b/ui/components/multichain/pages/send/components/address-book.tsx
@@ -20,11 +20,17 @@ import {
   TextColor,
 } from '../../../../../helpers/constants/design-system';
 import { CONTACT_LIST_ROUTE } from '../../../../../helpers/constants/routes';
+import { MetaMetricsContext } from '../../../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../../shared/constants/metametrics';
 import { SendPageRow } from '.';
 
 export const SendPageAddressBook = () => {
   const t = useContext(I18nContext);
   const dispatch = useDispatch();
+  const trackEvent = useContext(MetaMetricsContext);
 
   const addressBook = useSelector(getAddressBook);
   const contacts = addressBook.filter(({ name }) => Boolean(name));
@@ -93,6 +99,14 @@ export const SendPageAddressBook = () => {
         `sendFlow - User clicked recipient from ${type}. address: ${address}, nickname ${nickname}`,
       ),
     );
+    trackEvent({
+      event: MetaMetricsEventName.sendRecipientSelected,
+      category: MetaMetricsEventCategory.Send,
+      properties: {
+        location: 'address book',
+        inputType: type,
+      },
+    });
     dispatch(updateRecipient({ address, nickname }));
     dispatch(updateRecipientUserInput(address));
   };
diff --git a/ui/components/multichain/pages/send/components/quote-card/index.tsx b/ui/components/multichain/pages/send/components/quote-card/index.tsx
index 3ffc1e7fb2ae..d3815fd3d64c 100644
--- a/ui/components/multichain/pages/send/components/quote-card/index.tsx
+++ b/ui/components/multichain/pages/send/components/quote-card/index.tsx
@@ -15,13 +15,17 @@ import {
   getCurrentDraftTransaction,
   getBestQuote,
   updateSendQuote,
+  getSendAnalyticProperties,
 } from '../../../../../../ducks/send';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { SECOND } from '../../../../../../../shared/constants/time';
 import { Quote } from '../../../../../../ducks/send/swap-and-send-utils';
 import Tooltip from '../../../../../ui/tooltip';
 import InfoTooltipIcon from '../../../../../ui/info-tooltip/info-tooltip-icon';
-import { MetaMetricsEventCategory } from '../../../../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../../../shared/constants/metametrics';
 import {
   CONSENSYS_TERMS_OF_USE,
   GAS_FEES_LEARN_MORE_URL,
@@ -48,6 +52,7 @@ const REFRESH_INTERVAL = 30;
 export function QuoteCard({ scrollRef }: QuoteCardProps) {
   const t = useI18nContext();
   const dispatch = useDispatch();
+  const sendAnalytics = useSelector(getSendAnalyticProperties);
 
   const translatedNetworkName = useTranslatedNetworkName();
   const trackEvent = useContext(MetaMetricsContext);
@@ -80,6 +85,14 @@ export function QuoteCard({ scrollRef }: QuoteCardProps) {
     }
 
     if (bestQuote) {
+      trackEvent({
+        event: MetaMetricsEventName.sendSwapQuoteFetched,
+        category: MetaMetricsEventCategory.Send,
+        properties: {
+          ...sendAnalytics,
+          is_first_fetch: isQuoteJustLoaded,
+        },
+      });
       setTimeLeft(REFRESH_INTERVAL);
     } else {
       setTimeLeft(undefined);
diff --git a/ui/components/multichain/pages/send/components/recipient-content.tsx b/ui/components/multichain/pages/send/components/recipient-content.tsx
index a83352bdfd13..6ca53ae62575 100644
--- a/ui/components/multichain/pages/send/components/recipient-content.tsx
+++ b/ui/components/multichain/pages/send/components/recipient-content.tsx
@@ -81,8 +81,6 @@ export const SendPageRecipientContent = ({
   // Gas data
   const dispatch = useDispatch();
 
-  // FIXME: add analytics + e2e tests + unit tests (check comments)
-  //       - use transaction lifecycle events once
   return (
     <Box>
       {requireContractAddressAcknowledgement ? (
diff --git a/ui/components/multichain/pages/send/components/recipient-input.tsx b/ui/components/multichain/pages/send/components/recipient-input.tsx
index b6ebc8046463..debcdbbdca36 100644
--- a/ui/components/multichain/pages/send/components/recipient-input.tsx
+++ b/ui/components/multichain/pages/send/components/recipient-input.tsx
@@ -14,7 +14,10 @@ import {
 } from '../../../../../ducks/send';
 import { showQrScanner } from '../../../../../store/actions';
 import { MetaMetricsContext } from '../../../../../contexts/metametrics';
-import { MetaMetricsEventCategory } from '../../../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../../shared/constants/metametrics';
 import { shortenAddress } from '../../../../../helpers/utils/util';
 import { toChecksumHexAddress } from '../../../../../../shared/modules/hexstring-utils';
 import { SendPageRow } from '.';
@@ -43,6 +46,14 @@ export const SendPageRecipientInput = () => {
             addHistoryEntry(`sendFlow - Valid address typed ${address}`),
           );
           await dispatch(updateRecipientUserInput(address));
+          trackEvent({
+            event: MetaMetricsEventName.sendRecipientSelected,
+            category: MetaMetricsEventCategory.Send,
+            properties: {
+              location: 'send page recipient input',
+              inputType: 'user input',
+            },
+          });
           dispatch(updateRecipient({ address, nickname: '' }));
         }}
         internalSearch={isUsingMyAccountsForRecipientSearch}
diff --git a/ui/components/multichain/pages/send/components/recipient.tsx b/ui/components/multichain/pages/send/components/recipient.tsx
index 222187d6a786..3433d51c2bc9 100644
--- a/ui/components/multichain/pages/send/components/recipient.tsx
+++ b/ui/components/multichain/pages/send/components/recipient.tsx
@@ -21,6 +21,14 @@ import {
 import { getAddressBookEntry } from '../../../../../selectors';
 import { Tab, Tabs } from '../../../../ui/tabs';
 import { AddressListItem } from '../../../address-list-item';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../../shared/constants/metametrics';
+import {
+  MetaMetricsContext,
+  type UITrackEventMethod,
+} from '../../../../../contexts/metametrics';
 import { SendPageAddressBook, SendPageRow, SendPageYourAccounts } from '.';
 
 const CONTACTS_TAB_KEY = 'contacts';
@@ -35,6 +43,7 @@ const renderExplicitAddress = (
   // TODO: Replace `any` with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   dispatch: any,
+  trackEvent: UITrackEventMethod,
 ) => {
   return (
     <AddressListItem
@@ -47,6 +56,14 @@ const renderExplicitAddress = (
             `sendFlow - User clicked recipient from ${type}. address: ${address}, nickname ${nickname}`,
           ),
         );
+        trackEvent({
+          event: MetaMetricsEventName.sendRecipientSelected,
+          category: MetaMetricsEventCategory.Send,
+          properties: {
+            location: 'send page recipient screen',
+            inputType: type,
+          },
+        });
         dispatch(updateRecipient({ address, nickname }));
         dispatch(updateRecipientUserInput(address));
       }}
@@ -57,6 +74,7 @@ const renderExplicitAddress = (
 export const SendPageRecipient = () => {
   const t = useContext(I18nContext);
   const dispatch = useDispatch();
+  const trackEvent = useContext(MetaMetricsContext);
 
   const recipient = useSelector(getRecipient);
   const userInput = useSelector(getRecipientUserInput) || '';
@@ -85,6 +103,7 @@ export const SendPageRecipient = () => {
       recipient.nickname,
       'validated user input',
       dispatch,
+      trackEvent,
     );
   } else if (domainResolution && !recipient.error) {
     contents = renderExplicitAddress(
@@ -92,6 +111,7 @@ export const SendPageRecipient = () => {
       addressBookEntryName || userInput,
       ENS_RESOLUTION_TYPE,
       dispatch,
+      trackEvent,
     );
   } else {
     contents = (
diff --git a/ui/components/multichain/pages/send/components/your-accounts.tsx b/ui/components/multichain/pages/send/components/your-accounts.tsx
index 40a47c628aca..a881e8922634 100644
--- a/ui/components/multichain/pages/send/components/your-accounts.tsx
+++ b/ui/components/multichain/pages/send/components/your-accounts.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   getUpdatedAndSortedAccounts,
@@ -11,10 +11,16 @@ import {
   updateRecipientUserInput,
 } from '../../../../../ducks/send';
 import { mergeAccounts } from '../../../account-list-menu/account-list-menu';
+import { MetaMetricsContext } from '../../../../../contexts/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../../shared/constants/metametrics';
 import { SendPageRow } from '.';
 
 export const SendPageYourAccounts = () => {
   const dispatch = useDispatch();
+  const trackEvent = useContext(MetaMetricsContext);
 
   // Your Accounts
   const accounts = useSelector(getUpdatedAndSortedAccounts);
@@ -36,6 +42,14 @@ export const SendPageYourAccounts = () => {
                 `sendFlow - User clicked recipient from my accounts. address: ${account.address}, nickname ${account.name}`,
               ),
             );
+            trackEvent({
+              event: MetaMetricsEventName.sendRecipientSelected,
+              category: MetaMetricsEventCategory.Send,
+              properties: {
+                location: 'my accounts',
+                inputType: 'click',
+              },
+            });
             dispatch(
               updateRecipient({
                 address: account.address,
diff --git a/ui/components/multichain/pages/send/send.js b/ui/components/multichain/pages/send/send.js
index 6993d5896274..c47a22e6ef69 100644
--- a/ui/components/multichain/pages/send/send.js
+++ b/ui/components/multichain/pages/send/send.js
@@ -27,6 +27,7 @@ import {
   getDraftTransactionID,
   getRecipient,
   getRecipientWarningAcknowledgement,
+  getSendAnalyticProperties,
   getSendErrors,
   getSendStage,
   isSendFormInvalid,
@@ -47,7 +48,10 @@ import {
   DEFAULT_ROUTE,
   SEND_ROUTE,
 } from '../../../../helpers/constants/routes';
-import { MetaMetricsEventCategory } from '../../../../../shared/constants/metametrics';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
 import { getMostRecentOverviewPage } from '../../../../ducks/history/history';
 import { AssetPickerAmount } from '../..';
 import useUpdateSwapsState from '../../../../hooks/useUpdateSwapsState';
@@ -68,15 +72,21 @@ export const SendPage = () => {
 
   const draftTransaction = useSelector(getCurrentDraftTransaction);
 
-  const { sendAsset: transactionAsset, amount } = draftTransaction;
+  const {
+    sendAsset: transactionAsset,
+    amount,
+    swapQuotesError,
+  } = draftTransaction;
 
   const draftTransactionID = useSelector(getDraftTransactionID);
   const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
   const sendStage = useSelector(getSendStage);
+  const isSwapAndSend = getIsDraftSwapAndSend(draftTransaction);
 
   const history = useHistory();
   const location = useLocation();
   const trackEvent = useContext(MetaMetricsContext);
+  const sendAnalytics = useSelector(getSendAnalyticProperties);
 
   const [isSubmitting, setIsSubmitting] = useState(false);
 
@@ -186,11 +196,33 @@ export const SendPage = () => {
     }
     dispatch(resetSendState());
 
+    trackEvent({
+      event: MetaMetricsEventName.sendFlowExited,
+      category: MetaMetricsEventCategory.Send,
+      properties: {
+        ...sendAnalytics,
+      },
+    });
+
     const nextRoute =
       sendStage === SEND_STAGES.EDIT ? DEFAULT_ROUTE : mostRecentOverviewPage;
     history.push(nextRoute);
   };
 
+  useEffect(() => {
+    if (swapQuotesError) {
+      trackEvent({
+        event: MetaMetricsEventName.sendSwapQuoteError,
+        category: MetaMetricsEventCategory.Send,
+        properties: {
+          ...sendAnalytics,
+        },
+      });
+    }
+    // sendAnalytics should not result in the event refiring
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [trackEvent, swapQuotesError]);
+
   const onSubmit = async (event) => {
     event.preventDefault();
 
@@ -204,7 +236,8 @@ export const SendPage = () => {
       category: MetaMetricsEventCategory.Transactions,
       event: 'Complete',
       properties: {
-        action: 'Edit Screen',
+        ...sendAnalytics,
+        action: isSwapAndSend ? 'Submit Immediately' : 'Edit Screen',
         legacy_event: true,
       },
     });
@@ -248,7 +281,7 @@ export const SendPage = () => {
     [dispatch],
   );
 
-  const isSwapAndSend = getIsDraftSwapAndSend(draftTransaction);
+  const tooltipTitle = isSwapAndSend ? t('sendSwapSubmissionWarning') : '';
 
   return (
     <Page className="multichain-send-page">
@@ -298,8 +331,10 @@ export const SendPage = () => {
           {sendStage === SEND_STAGES.EDIT ? t('reject') : t('cancel')}
         </ButtonSecondary>
         <Tooltip
+          // changing key forces remount on title change
+          key={tooltipTitle}
           className="multichain-send-page__nav-button"
-          title={t('sendSwapSubmissionWarning')}
+          title={tooltipTitle}
           disabled={!isSwapAndSend}
           arrow
           hideOnClick={false}
diff --git a/ui/ducks/send/helpers.js b/ui/ducks/send/helpers.js
index a706512f5eb5..43582c6e3504 100644
--- a/ui/ducks/send/helpers.js
+++ b/ui/ducks/send/helpers.js
@@ -32,6 +32,7 @@ import { fetchTokenExchangeRates } from '../../helpers/utils/util';
 import { hexToDecimal } from '../../../shared/modules/conversion.utils';
 import { EtherDenomination } from '../../../shared/constants/common';
 import { SWAPS_CHAINID_DEFAULT_TOKEN_MAP } from '../../../shared/constants/swaps';
+import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 
 export async function estimateGasLimitForSend({
   selectedAddress,
@@ -422,8 +423,8 @@ export async function getERC20Balance(token, accountAddress) {
  * @returns {boolean} true if the draft transaction is a swap and send
  */
 export function getIsDraftSwapAndSend(draftTransaction) {
-  return (
-    draftTransaction?.sendAsset?.details?.address !==
-    draftTransaction?.receiveAsset?.details?.address
+  return !isEqualCaseInsensitive(
+    draftTransaction?.sendAsset?.details?.address || '',
+    draftTransaction?.receiveAsset?.details?.address || '',
   );
 }
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 85e24bcd917f..9c45334a9625 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -55,6 +55,7 @@ import {
   getUnapprovedTransactions,
   getSelectedNetworkClientId,
   getIsSwapsChain,
+  getUseExternalServices,
 } from '../../selectors';
 import {
   displayWarning,
@@ -387,7 +388,7 @@ export const RECIPIENT_SEARCH_MODES = {
  * @property {Recipient} recipient - An object that describes the intended
  *  recipient of the transaction.
  * @property {string} [swapQuotesError] - error message for swap quotes
- * @property {number} [swapQuotesLatestRequestTimestamp] - timestamp of most recent swap quotes request
+ * @property {number} [timeToFetchQuotes] time to fetch most recent swap+send quotes
  * @property {MapValuesToUnion<DraftTxStatus>} status - Describes the
  *  validity of the draft transaction, which will be either 'VALID' or
  *  'INVALID', depending on our ability to generate a valid txParams object for
@@ -445,6 +446,7 @@ export const draftTransactionInitialState = {
   isSwapQuoteLoading: false,
   swapQuotesError: null,
   swapQuotesLatestRequestTimestamp: null,
+  timeToFetchQuotes: null,
   quotes: null,
 };
 
@@ -756,9 +758,10 @@ export const initializeSendState = createAsyncThunk(
       );
     }
 
-    const swapsBlockedTokens = getIsSwapsChain(state)
-      ? (await fetchBlockedTokens(chainId)).map((t) => t.toLowerCase())
-      : [];
+    const swapsBlockedTokens =
+      getIsSwapsChain(state) && getUseExternalServices(state)
+        ? (await fetchBlockedTokens(chainId)).map((t) => t.toLowerCase())
+        : [];
 
     return {
       account,
@@ -1445,41 +1448,6 @@ const slice = createSlice({
       const amountValue = new Numeric(draftTransaction.amount.value, 16);
 
       switch (true) {
-        // set error to INSUFFICIENT_FUNDS_FOR_GAS_ERROR if the account balance is lower
-        // than the total price of the transaction inclusive of gas fees.
-        case draftTransaction.sendAsset.type === AssetType.native &&
-          !isBalanceSufficient({
-            amount: draftTransaction.amount.value,
-            balance: draftTransaction.sendAsset.balance,
-            gasTotal: draftTransaction.gas.gasTotal ?? '0x0',
-          }): {
-          const isInsufficientWithoutGas = !isBalanceSufficient({
-            amount: draftTransaction.amount.value,
-            balance: draftTransaction.sendAsset.balance,
-            gasTotal: '0x0', // assume gas is free
-          });
-
-          draftTransaction.amount.error = isInsufficientWithoutGas
-            ? INSUFFICIENT_FUNDS_ERROR
-            : INSUFFICIENT_FUNDS_FOR_GAS_ERROR;
-          if (draftTransaction.status !== SEND_STATUSES.INVALID) {
-            slice.caseReducers.validateSendState(state);
-          }
-          break;
-        }
-        // set error to INSUFFICIENT_TOKENS_ERROR if the token balance is lower
-        // than the amount of token the user is attempting to send.
-        case draftTransaction.sendAsset.type === AssetType.token &&
-          !isTokenBalanceSufficient({
-            tokenBalance: draftTransaction.sendAsset.balance ?? '0x0',
-            amount: draftTransaction.amount.value,
-            decimals: draftTransaction.sendAsset.details.decimals,
-          }):
-          draftTransaction.amount.error = INSUFFICIENT_TOKENS_ERROR;
-          if (draftTransaction.status !== SEND_STATUSES.INVALID) {
-            slice.caseReducers.validateSendState(state);
-          }
-          break;
         // INSUFFICIENT_TOKENS_ERROR if the user is attempting to transfer ERC1155 but has 0 amount selected
         // prevents the user from transferring 0 tokens
         case draftTransaction.sendAsset.type === AssetType.NFT &&
@@ -1515,6 +1483,48 @@ const slice = createSlice({
             slice.caseReducers.validateSendState(state);
           }
           break;
+        // set error to INSUFFICIENT_TOKENS_ERROR if the token balance is lower
+        // than the amount of token the user is attempting to send.
+        case draftTransaction.sendAsset.type === AssetType.token &&
+          !isTokenBalanceSufficient({
+            tokenBalance: draftTransaction.sendAsset.balance ?? '0x0',
+            amount: draftTransaction.amount.value,
+            decimals: draftTransaction.sendAsset.details.decimals,
+          }):
+          draftTransaction.amount.error = INSUFFICIENT_TOKENS_ERROR;
+          if (draftTransaction.status !== SEND_STATUSES.INVALID) {
+            slice.caseReducers.validateSendState(state);
+          }
+          break;
+        // set error to INSUFFICIENT_FUNDS_FOR_GAS_ERROR if the account balance is lower
+        // than the total price of the transaction inclusive of gas fees.
+        case !isBalanceSufficient({
+          amount:
+            draftTransaction.sendAsset.type === AssetType.native
+              ? draftTransaction.amount.value
+              : undefined,
+          balance:
+            draftTransaction.sendAsset.type === AssetType.native
+              ? draftTransaction.sendAsset.balance
+              : state.selectedAccount.balance,
+          gasTotal: draftTransaction.gas.gasTotal ?? '0x0',
+        }): {
+          const isInsufficientWithoutGas =
+            draftTransaction.sendAsset.type === AssetType.native &&
+            !isBalanceSufficient({
+              amount: draftTransaction.amount.value,
+              balance: draftTransaction.sendAsset.balance,
+              gasTotal: '0x0', // assume gas is free
+            });
+
+          draftTransaction.amount.error = isInsufficientWithoutGas
+            ? INSUFFICIENT_FUNDS_ERROR
+            : INSUFFICIENT_FUNDS_FOR_GAS_ERROR;
+          if (draftTransaction.status !== SEND_STATUSES.INVALID) {
+            slice.caseReducers.validateSendState(state);
+          }
+          break;
+        }
         // If none of the above are true, set error to null
         default:
           draftTransaction.amount.error = null;
@@ -1638,10 +1648,27 @@ const slice = createSlice({
       if (draftTransaction) {
         const isSwapAndSend = getIsDraftSwapAndSend(draftTransaction);
 
-        const { quotes } = draftTransaction;
+        const getIsIgnorableAmountError = () =>
+          [
+            INSUFFICIENT_TOKENS_ERROR,
+            INSUFFICIENT_FUNDS_ERROR,
+            INSUFFICIENT_FUNDS_FOR_GAS_ERROR,
+          ].includes(draftTransaction.amount.error) &&
+          !draftTransaction.sendAsset.balance;
+
+        const { quotes, gas } = draftTransaction;
         const bestQuote = quotes ? calculateBestQuote(quotes) : undefined;
+
+        const derivedGasPrice =
+          hexToDecimal(gas?.gasTotal || '0x0') > 0 &&
+          hexToDecimal(gas?.gasLimit || '0x0') > 0
+            ? new Numeric(gas.gasTotal, 16).divide(gas.gasLimit, 16).toString()
+            : undefined;
+
         switch (true) {
-          case Boolean(draftTransaction.amount.error):
+          case Boolean(
+            draftTransaction.amount.error && !getIsIgnorableAmountError(),
+          ):
             slice.caseReducers.addHistoryEntry(state, {
               payload: `Amount is in error ${draftTransaction.amount.error}`,
             });
@@ -1769,6 +1796,27 @@ const slice = createSlice({
             });
             draftTransaction.status = SEND_STATUSES.INVALID;
             break;
+          case bestQuote &&
+            !isBalanceSufficient({
+              amount:
+                draftTransaction.sendAsset.type === AssetType.native
+                  ? draftTransaction.amount.value
+                  : undefined,
+              balance: state.selectedAccount.balance,
+              gasTotal: calcGasTotal(
+                new Numeric(
+                  bestQuote?.gasParams?.maxGas || 0,
+                  10,
+                ).toPrefixedHexString(),
+                derivedGasPrice ?? '0x0',
+              ),
+            }): {
+            if (!draftTransaction.amount.error) {
+              draftTransaction.amount.error = INSUFFICIENT_FUNDS_FOR_GAS_ERROR;
+            }
+            draftTransaction.status = SEND_STATUSES.INVALID;
+            break;
+          }
           case isSwapAndSend && !bestQuote:
             slice.caseReducers.addHistoryEntry(state, {
               payload: `No swap and send quote available`,
@@ -1840,6 +1888,8 @@ const slice = createSlice({
           draftTransactionInitialState.isSwapQuoteLoading;
         draftTransaction.swapQuotesLatestRequestTimestamp =
           draftTransactionInitialState.swapQuotesLatestRequestTimestamp;
+        draftTransaction.timeToFetchQuotes =
+          draftTransactionInitialState.timeToFetchQuotes;
       })
       .addCase(computeEstimatedGasLimit.pending, (state) => {
         // When we begin to fetch gasLimit we should indicate we are loading
@@ -1966,6 +2016,8 @@ const slice = createSlice({
           action.payload.requestTimestamp ===
             draftTransaction.swapQuotesLatestRequestTimestamp
         ) {
+          draftTransaction.timeToFetchQuotes =
+            Date.now() - action.payload.requestTimestamp;
           draftTransaction.isSwapQuoteLoading = false;
           draftTransaction.swapQuotesError = null;
           if (action.payload) {
@@ -2922,7 +2974,7 @@ export function signTransaction(history) {
         const sourceTokenDecimals =
           draftTransaction.sendAsset.details?.decimals ||
           NATIVE_CURRENCY_DECIMALS;
-        const swapTokenValue = new Numeric(amount.value || '0x0', 16)
+        const swapTokenValue = new Numeric(amount?.value || '0x0', 16)
           .toBase(10)
           .shiftedBy(sourceTokenDecimals)
           .toString();
@@ -3467,3 +3519,90 @@ export function hasSendLayer1GasFee(state) {
 export function getSwapsBlockedTokens(state) {
   return state[name].swapsBlockedTokens;
 }
+
+export const getSendAnalyticProperties = createSelector(
+  (state) => state.metamask.providerConfig,
+  getCurrentDraftTransaction,
+  getBestQuote,
+  ({ chainId, ticker: nativeCurrencySymbol }, draftTransaction, bestQuote) => {
+    try {
+      const NATIVE_CURRENCY_DECIMALS =
+        SWAPS_CHAINID_DEFAULT_TOKEN_MAP[chainId].decimals;
+
+      const NATIVE_CURRENCY_ADDRESS =
+        SWAPS_CHAINID_DEFAULT_TOKEN_MAP[chainId].address;
+
+      const isSwapAndSend = getIsDraftSwapAndSend(draftTransaction);
+      const {
+        quotes,
+        amount,
+        sendAsset,
+        receiveAsset,
+        swapQuotesError,
+        timeToFetchQuotes,
+      } = draftTransaction;
+
+      const sourceTokenSymbol =
+        draftTransaction?.sendAsset?.details?.symbol || nativeCurrencySymbol;
+      const destinationTokenSymbol =
+        draftTransaction?.receiveAsset?.details?.symbol || nativeCurrencySymbol;
+      const destinationTokenDecimals =
+        draftTransaction?.receiveAsset?.details?.decimals ||
+        NATIVE_CURRENCY_DECIMALS;
+
+      const sourceTokenDecimals =
+        draftTransaction?.sendAsset?.details?.decimals ||
+        NATIVE_CURRENCY_DECIMALS;
+
+      const userInputTokenAmount = new Numeric(amount?.value || '0x0', 16)
+        .toBase(10)
+        .shiftedBy(sourceTokenDecimals)
+        .toString();
+
+      const sourceTokenAmount = bestQuote?.sourceAmount;
+      const destinationTokenAmount = bestQuote?.destinationAmount;
+
+      const destinationTokenAddress =
+        draftTransaction?.receiveAsset?.details?.address ||
+        NATIVE_CURRENCY_ADDRESS;
+      const sourceTokenAddress =
+        draftTransaction?.sendAsset?.details?.address ||
+        NATIVE_CURRENCY_ADDRESS;
+
+      return {
+        is_swap_and_send: isSwapAndSend,
+        chain_id: chainId,
+        token_amount_source:
+          sourceTokenAmount && sourceTokenDecimals
+            ? calcTokenAmount(sourceTokenAmount, sourceTokenDecimals).toString()
+            : userInputTokenAmount,
+        token_amount_dest_estimate:
+          destinationTokenAmount && destinationTokenDecimals
+            ? calcTokenAmount(
+                destinationTokenAmount,
+                destinationTokenDecimals,
+              ).toString()
+            : undefined,
+        token_symbol_source: sourceTokenSymbol,
+        token_symbol_destination: destinationTokenSymbol,
+        token_address_source: sourceTokenAddress,
+        token_address_destination: destinationTokenAddress,
+        results_count: quotes?.length,
+        quotes_load_time_ms: timeToFetchQuotes,
+        aggregator_list: quotes?.map(
+          ({ aggregator, error }) => `${aggregator} (${error || 'no error'})`,
+        ),
+        aggregator_recommended: bestQuote?.aggregator,
+        errors: [
+          amount?.error,
+          sendAsset?.error,
+          receiveAsset?.error,
+          swapQuotesError,
+        ].filter(Boolean),
+      };
+    } catch (error) {
+      // ensure analytics do not break the app
+      return { analyticsError: error };
+    }
+  },
+);
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index ff8e0eb24026..62d43eba56e6 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -3305,6 +3305,7 @@ describe('Send Slice', () => {
             status: SEND_STATUSES.VALID,
             swapQuotesError: null,
             swapQuotesLatestRequestTimestamp: null,
+            timeToFetchQuotes: null,
             transactionType: '0x0',
             userInputHexData: '',
           },
@@ -3486,6 +3487,7 @@ describe('Send Slice', () => {
             status: SEND_STATUSES.VALID,
             swapQuotesError: null,
             swapQuotesLatestRequestTimestamp: null,
+            timeToFetchQuotes: null,
             transactionType: '0x0',
             userInputHexData:
               editTransactionState.metamask.transactions[0].txParams.data,
@@ -3716,6 +3718,7 @@ describe('Send Slice', () => {
           status: SEND_STATUSES.VALID,
           swapQuotesError: null,
           swapQuotesLatestRequestTimestamp: null,
+          timeToFetchQuotes: null,
           transactionType: '0x0',
           userInputHexData:
             editTransactionState.metamask.transactions[0].txParams.data,
@@ -3977,6 +3980,7 @@ describe('Send Slice', () => {
               status: 'VALID',
               swapQuotesError: null,
               swapQuotesLatestRequestTimestamp: null,
+              timeToFetchQuotes: null,
               test: 'test',
               transactionType: '0x0',
               userInputHexData: null,
diff --git a/ui/hooks/useUpdateSwapsState.test.ts b/ui/hooks/useUpdateSwapsState.test.ts
index be9824ad882c..0d5008435e0b 100644
--- a/ui/hooks/useUpdateSwapsState.test.ts
+++ b/ui/hooks/useUpdateSwapsState.test.ts
@@ -17,6 +17,7 @@ import {
   checkNetworkAndAccountSupports1559,
   getCurrentChainId,
   getIsSwapsChain,
+  getUseExternalServices,
 } from '../selectors';
 import useUpdateSwapsState from './useUpdateSwapsState';
 
@@ -48,6 +49,7 @@ jest.mock('../selectors', () => ({
   checkNetworkAndAccountSupports1559: jest.fn(),
   getCurrentChainId: jest.fn(),
   getIsSwapsChain: jest.fn(),
+  getUseExternalServices: jest.fn(),
 }));
 
 describe('useUpdateSwapsState', () => {
@@ -56,6 +58,7 @@ describe('useUpdateSwapsState', () => {
     getCurrentChainId: '1',
     getIsSwapsChain: true,
     checkNetworkAndAccountSupports1559: true,
+    getUseExternalServices: true,
   };
 
   beforeEach(() => {
@@ -68,6 +71,8 @@ describe('useUpdateSwapsState', () => {
         return mockState.getIsSwapsChain;
       } else if (selector === checkNetworkAndAccountSupports1559) {
         return mockState.checkNetworkAndAccountSupports1559;
+      } else if (selector === getUseExternalServices) {
+        return mockState.getUseExternalServices;
       }
       return undefined;
     });
diff --git a/ui/hooks/useUpdateSwapsState.ts b/ui/hooks/useUpdateSwapsState.ts
index 713a2acb8b3a..ad238f3875d1 100644
--- a/ui/hooks/useUpdateSwapsState.ts
+++ b/ui/hooks/useUpdateSwapsState.ts
@@ -16,6 +16,7 @@ import {
   checkNetworkAndAccountSupports1559,
   getCurrentChainId,
   getIsSwapsChain,
+  getUseExternalServices,
 } from '../selectors';
 
 export default function useUpdateSwapsState() {
@@ -27,8 +28,10 @@ export default function useUpdateSwapsState() {
     checkNetworkAndAccountSupports1559,
   );
 
+  const isBasicFunctionality = useSelector(getUseExternalServices);
+
   useEffect(() => {
-    if (!isSwapsChain) {
+    if (!isSwapsChain || !isBasicFunctionality) {
       return undefined;
     }
 
@@ -53,5 +56,11 @@ export default function useUpdateSwapsState() {
     return () => {
       dispatch(prepareToLeaveSwaps());
     };
-  }, [dispatch, chainId, networkAndAccountSupports1559, isSwapsChain]);
+  }, [
+    dispatch,
+    chainId,
+    networkAndAccountSupports1559,
+    isSwapsChain,
+    isBasicFunctionality,
+  ]);
 }

From 74bd71b53aecdd5e328c895dbc01a94ca7e71799 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 10 Jun 2024 14:02:51 +0200
Subject: [PATCH 016/236] Version 11.16.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4ca77c9fb4f8..ef75964c9f20 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.8",
+  "version": "11.16.9",
   "private": true,
   "repository": {
     "type": "git",

From 5540d6e9488d250b4327886e6c9abbe146f8f578 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 10 Jun 2024 14:13:08 +0200
Subject: [PATCH 017/236] fix: patch in decryption hotfix

---
 ...k-snaps-controllers-patch-93f004a36a.patch | 26 ++++++++++++
 package.json                                  |  2 +-
 yarn.lock                                     | 41 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 .yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch

diff --git a/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch b/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch
new file mode 100644
index 000000000000..f4aaadad4d21
--- /dev/null
+++ b/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch
@@ -0,0 +1,26 @@
+diff --git a/dist/chunk-HBNET6MY.mjs b/dist/chunk-HBNET6MY.mjs
+index 5843d635c91e9125d130a6ef5688550e5d514eaa..6ef8d23c52c7ddb28a1912967e4b658fe6f8ef1c 100644
+--- a/dist/chunk-HBNET6MY.mjs
++++ b/dist/chunk-HBNET6MY.mjs
+@@ -1749,7 +1749,7 @@ decryptSnapState_fn = async function(snapId, state) {
+       snapId,
+       salt,
+       useCache,
+-      keyMetadata
++      keyMetadata: keyMetadata ?? { algorithm: 'PBKDF2', params: { iterations: 10_000 } }
+     });
+     const decryptedState = await __privateGet(this, _encryptor).decryptWithKey(key, parsed);
+     assert(isValidJson(decryptedState));
+diff --git a/dist/chunk-JMP6XYRL.js b/dist/chunk-JMP6XYRL.js
+index 20c3b12643e4f87d70aa0df96a36c4dda8b1ed47..c442feb729f41d9d73d1008a3215d73d7b288090 100644
+--- a/dist/chunk-JMP6XYRL.js
++++ b/dist/chunk-JMP6XYRL.js
+@@ -1749,7 +1749,7 @@ decryptSnapState_fn = async function(snapId, state) {
+       snapId,
+       salt,
+       useCache,
+-      keyMetadata
++      keyMetadata: keyMetadata ?? { algorithm: 'PBKDF2', params: { iterations: 10_000 } }
+     });
+     const decryptedState = await _chunkEXN2TFDJjs.__privateGet.call(void 0, this, _encryptor).decryptWithKey(key, parsed);
+     _utils.assert.call(void 0, _utils.isValidJson.call(void 0, decryptedState));
diff --git a/package.json b/package.json
index ef75964c9f20..66d512f898c1 100644
--- a/package.json
+++ b/package.json
@@ -331,7 +331,7 @@
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch",
     "@metamask/signature-controller": "^12.0.0",
     "@metamask/smart-transactions-controller": "^10.0.1",
-    "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch",
+    "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch",
     "@metamask/snaps-execution-environments": "6.0.2",
     "@metamask/snaps-rpc-methods": "8.0.0",
     "@metamask/snaps-sdk": "4.0.1",
diff --git a/yarn.lock b/yarn.lock
index bfc99b8f8948..8d31e99ab6b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5784,7 +5784,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch":
+"@metamask/snaps-controllers@patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch::version=8.0.0&hash=79a89d":
   version: 8.0.0
   resolution: "@metamask/snaps-controllers@patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch::version=8.0.0&hash=79a89d"
   dependencies:
@@ -5821,6 +5821,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/snaps-controllers@patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch":
+  version: 8.0.0
+  resolution: "@metamask/snaps-controllers@patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch::version=8.0.0&hash=e80d43"
+  dependencies:
+    "@metamask/approval-controller": "npm:^6.0.1"
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/json-rpc-middleware-stream": "npm:^7.0.1"
+    "@metamask/object-multiplex": "npm:^2.0.0"
+    "@metamask/permission-controller": "npm:^9.0.2"
+    "@metamask/phishing-controller": "npm:^9.0.1"
+    "@metamask/post-message-stream": "npm:^8.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-rpc-methods": "npm:^8.0.0"
+    "@metamask/snaps-sdk": "npm:^4.0.1"
+    "@metamask/snaps-utils": "npm:^7.2.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@xstate/fsm": "npm:^2.0.0"
+    browserify-zlib: "npm:^0.2.0"
+    concat-stream: "npm:^2.0.0"
+    fast-deep-equal: "npm:^3.1.3"
+    get-npm-tarball-url: "npm:^2.0.3"
+    immer: "npm:^9.0.6"
+    nanoid: "npm:^3.1.31"
+    readable-stream: "npm:^3.6.2"
+    readable-web-to-node-stream: "npm:^3.0.2"
+    tar-stream: "npm:^3.1.7"
+  peerDependencies:
+    "@metamask/snaps-execution-environments": ^6.0.2
+  peerDependenciesMeta:
+    "@metamask/snaps-execution-environments":
+      optional: true
+  checksum: 2f7d2a15c0758a0be1058af7f0eecec6ba3b65c87ed88498cc5e11f5fe9ab01de3cc1a11deb39c94ad0d35e6cdf889788a9dc8161b81f60b18857762e2d3be0a
+  languageName: node
+  linkType: hard
+
 "@metamask/snaps-execution-environments@npm:6.0.2":
   version: 6.0.2
   resolution: "@metamask/snaps-execution-environments@npm:6.0.2"
@@ -25176,7 +25213,7 @@ __metadata:
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch"
     "@metamask/signature-controller": "npm:^12.0.0"
     "@metamask/smart-transactions-controller": "npm:^10.0.1"
-    "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@npm%3A8.0.0#~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch"
+    "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch"
     "@metamask/snaps-execution-environments": "npm:6.0.2"
     "@metamask/snaps-rpc-methods": "npm:8.0.0"
     "@metamask/snaps-sdk": "npm:4.0.1"

From d72fe72727bfb25e54242d77ca87fc36fd3a6c96 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 10 Jun 2024 14:17:34 +0200
Subject: [PATCH 018/236] Update changelog

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7c2b5641570..9674ade44ef2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.9]
+### Fixed
+- Fix an issue where Snaps would be unable to decrypt older state ([#25172](https://github.com/MetaMask/metamask-extension/pull/25172))
+
 ## [11.16.8]
 ### Changed
 - Prepare for increasing the minimum Chromium version supported by MetaMask ([#25142](https://github.com/MetaMask/metamask-extension/pull/25142))
@@ -4800,7 +4804,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.8...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...HEAD
+[11.16.9]: https://github.com/MetaMask/metamask-extension/compare/v11.16.8...v11.16.9
 [11.16.8]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v11.16.8
 [11.16.7]: https://github.com/MetaMask/metamask-extension/compare/v11.16.6...v11.16.7
 [11.16.6]: https://github.com/MetaMask/metamask-extension/compare/v11.16.5...v11.16.6

From 1d8fa4e0211b5772a91160c68d8bc743c52e540c Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Tue, 11 Jun 2024 20:28:31 +0100
Subject: [PATCH 019/236] v12.0.0 Cherry-Pick Notifications Feature Disabled
 when Basic Functionality Off (#25184)
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**

Ensures that notifications are disabled and the menu is hidden when
basic functionality if off (prevents additional API calls and any weird
states a user could get into when basic functionality if off).

PR: https://github.com/MetaMask/metamask-extension/pull/25070
Commit Hash:
[556b43fb85605e33a01c3ed68da5b2092a85e8c9](https://github.com/MetaMask/metamask-extension/commit/556b43fb85605e33a01c3ed68da5b2092a85e8c9)

There were no merge conflicts when picking these commits.

<!--
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/25070?quickstart=1)

## **Related issues**

Fixes: The current Profile Syncing Feature doesn't fully respect Basic
Functionality when turned off. This ensures that the notifications
feature and profile syncing are actually turned off when Basic
Functionality if off.

## **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
- [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.


<!--
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/25184?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 test/e2e/helpers.js                           |  6 +-
 .../multichain/global-menu/global-menu.js     | 49 ++++++-------
 .../metamask-notifications.tsx                |  6 +-
 .../useProfileSyncing.ts                      | 34 +++++-----
 .../useSwitchNotifications.test.tsx           | 16 ++---
 .../privacy-settings/privacy-settings.js      | 67 +++++++++++++-----
 .../privacy-settings/setting.js               |  3 +
 .../__snapshots__/security-tab.test.js.snap   |  2 +-
 .../profile-sync-toggle.test.tsx              | 68 ++++++++++---------
 .../profile-sync-toggle.tsx                   | 23 ++++++-
 10 files changed, 168 insertions(+), 106 deletions(-)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index b604a83cdefc..f1769d77593a 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -520,15 +520,11 @@ const onboardingCompleteWalletCreationWithOptOut = async (driver) => {
   );
   await driver.clickElement('[id="basic-configuration-checkbox"]');
   await driver.clickElement({ text: 'Turn off', tag: 'button' });
-  await driver.clickElement(
-    '[data-testid="profile-sync-toggle"] .toggle-button',
-  );
-  await driver.clickElement('[data-testid="submit-button"]');
 
   await Promise.all(
     (
       await driver.findClickableElements(
-        '.toggle-button.toggle-button--on:not([data-testid="basic-functionality-toggle"] .toggle-button):not([data-testid="profile-sync-toggle"] .toggle-button)',
+        '.toggle-button.toggle-button--on:not([data-testid="basic-functionality-toggle"] .toggle-button)',
       )
     ).map((toggle) => toggle.click()),
   );
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index 7ba0de804919..3841151dd7aa 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -60,6 +60,7 @@ import {
   ///: BEGIN:ONLY_INCLUDE_IF(snaps)
   getAnySnapUpdateAvailable,
   getNotifySnaps,
+  getUseExternalServices,
   ///: END:ONLY_INCLUDE_IF
 } from '../../../selectors';
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
@@ -81,6 +82,7 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
   const t = useI18nContext();
   const dispatch = useDispatch();
   const trackEvent = useContext(MetaMetricsContext);
+  const basicFunctionality = useSelector(getUseExternalServices);
 
   const history = useHistory();
 
@@ -189,30 +191,31 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
       borderStyle={BorderStyle.none}
       position={PopoverPosition.BottomEnd}
     >
-      <>
-        <MenuItem
-          iconName={IconName.Notification}
-          onClick={() => handleNotificationsClick()}
-        >
-          <Box
-            display={Display.Flex}
-            flexDirection={FlexDirection.Row}
-            alignItems={AlignItems.center}
-            justifyContent={JustifyContent.spaceBetween}
+      {basicFunctionality && (
+        <>
+          <MenuItem
+            iconName={IconName.Notification}
+            onClick={() => handleNotificationsClick()}
           >
-            {t('notifications')}
-            {notificationsCount === 0 && !isMetamaskNotificationFeatureSeen && (
-              <NewFeatureTag />
-            )}
-            <NotificationsTagCounter />
-          </Box>
-        </MenuItem>
-        <Box
-          borderColor={BorderColor.borderMuted}
-          width={BlockSize.Full}
-          style={{ height: '1px', borderBottomWidth: 0 }}
-        ></Box>
-      </>
+            <Box
+              display={Display.Flex}
+              flexDirection={FlexDirection.Row}
+              alignItems={AlignItems.center}
+              justifyContent={JustifyContent.spaceBetween}
+            >
+              {t('notifications')}
+              {notificationsCount === 0 &&
+                !isMetamaskNotificationFeatureSeen && <NewFeatureTag />}
+              <NotificationsTagCounter />
+            </Box>
+          </MenuItem>
+          <Box
+            borderColor={BorderColor.borderMuted}
+            width={BlockSize.Full}
+            style={{ height: '1px', borderBottomWidth: 0 }}
+          ></Box>
+        </>
+      )}
       {account && (
         <>
           <AccountDetailsMenuItem
diff --git a/ui/contexts/metamask-notifications/metamask-notifications.tsx b/ui/contexts/metamask-notifications/metamask-notifications.tsx
index f09126316764..ed40b9d7c55a 100644
--- a/ui/contexts/metamask-notifications/metamask-notifications.tsx
+++ b/ui/contexts/metamask-notifications/metamask-notifications.tsx
@@ -4,6 +4,7 @@ import { useListNotifications } from '../../hooks/metamask-notifications/useNoti
 import { selectIsProfileSyncingEnabled } from '../../selectors/metamask-notifications/profile-syncing';
 import { selectIsMetamaskNotificationsEnabled } from '../../selectors/metamask-notifications/metamask-notifications';
 import type { Notification } from '../../../app/scripts/controllers/metamask-notifications/types/notification/notification';
+import { getUseExternalServices } from '../../selectors';
 
 type MetamaskNotificationsContextType = {
   listNotifications: () => void;
@@ -31,6 +32,7 @@ export const MetamaskNotificationsProvider: React.FC = ({ children }) => {
   const isNotificationsEnabled = useSelector(
     selectIsMetamaskNotificationsEnabled,
   );
+  const basicFunctionality = useSelector(getUseExternalServices);
 
   const { listNotifications, notificationsData, isLoading, error } =
     useListNotifications();
@@ -41,10 +43,10 @@ export const MetamaskNotificationsProvider: React.FC = ({ children }) => {
   );
 
   useEffect(() => {
-    if (shouldFetchNotifications) {
+    if (basicFunctionality && shouldFetchNotifications) {
       listNotifications();
     }
-  }, [shouldFetchNotifications, listNotifications]);
+  }, [shouldFetchNotifications, listNotifications, basicFunctionality]);
 
   return (
     <MetamaskNotificationsContext.Provider
diff --git a/ui/hooks/metamask-notifications/useProfileSyncing.ts b/ui/hooks/metamask-notifications/useProfileSyncing.ts
index 931dd21cabde..4a30bf7978fd 100644
--- a/ui/hooks/metamask-notifications/useProfileSyncing.ts
+++ b/ui/hooks/metamask-notifications/useProfileSyncing.ts
@@ -46,7 +46,6 @@ export function useEnableProfileSyncing(): {
         e instanceof Error ? e.message : JSON.stringify(e ?? '');
       log.error(errorMessage);
       setError(errorMessage);
-      throw e;
     }
   }, [dispatch]);
 
@@ -79,7 +78,6 @@ export function useDisableProfileSyncing(): {
         e instanceof Error ? e.message : JSON.stringify(e ?? '');
       setError(errorMessage);
       log.error(errorMessage);
-      throw e;
     } finally {
       dispatch(hideLoadingIndication());
     }
@@ -88,27 +86,29 @@ export function useDisableProfileSyncing(): {
   return { disableProfileSyncing, error };
 }
 
-export function useSetIsProfileSyncingEnabled(state: boolean): {
-  setIsProfileSyncingEnabled: () => Promise<void>;
+export function useSetIsProfileSyncingEnabled(): {
+  setIsProfileSyncingEnabled: (state: boolean) => Promise<void>;
   error: string | null;
 } {
   const dispatch = useDispatch();
 
   const [error, setError] = useState<string | null>(null);
 
-  const setIsProfileSyncingEnabled = useCallback(async () => {
-    setError(null);
-
-    try {
-      await dispatch(setIsProfileSyncingEnabledAction(state));
-    } catch (e) {
-      const errorMessage =
-        e instanceof Error ? e.message : JSON.stringify(e ?? '');
-      setError(errorMessage);
-      log.error(errorMessage);
-      throw e;
-    }
-  }, [dispatch]);
+  const setIsProfileSyncingEnabled = useCallback(
+    async (state: boolean) => {
+      setError(null);
+
+      try {
+        await dispatch(setIsProfileSyncingEnabledAction(state));
+      } catch (e) {
+        const errorMessage =
+          e instanceof Error ? e.message : JSON.stringify(e ?? '');
+        setError(errorMessage);
+        log.error(errorMessage);
+      }
+    },
+    [dispatch],
+  );
 
   return { setIsProfileSyncingEnabled, error };
 }
diff --git a/ui/hooks/metamask-notifications/useSwitchNotifications.test.tsx b/ui/hooks/metamask-notifications/useSwitchNotifications.test.tsx
index d0b78f43ced9..b67c2ea80cef 100644
--- a/ui/hooks/metamask-notifications/useSwitchNotifications.test.tsx
+++ b/ui/hooks/metamask-notifications/useSwitchNotifications.test.tsx
@@ -68,8 +68,8 @@ describe('useSwitchNotifications', () => {
       ),
     });
 
-    act(() => {
-      result.current.onChange(true);
+    await act(async () => {
+      await result.current.onChange(true);
     });
 
     expect(actions.setFeatureAnnouncementsEnabled).toHaveBeenCalledWith(true);
@@ -86,8 +86,8 @@ describe('useSwitchNotifications', () => {
       ),
     });
 
-    act(() => {
-      result.current.switchAccountNotifications(['0x123']);
+    await act(async () => {
+      await result.current.switchAccountNotifications(['0x123']);
     });
 
     expect(actions.checkAccountsPresence).toHaveBeenCalledWith(['0x123']);
@@ -105,8 +105,8 @@ describe('useSwitchNotifications', () => {
     });
 
     // Test enabling notifications
-    act(() => {
-      result.current.onChange(['0x123'], true);
+    await act(async () => {
+      await result.current.onChange(['0x123'], true);
     });
 
     expect(actions.updateOnChainTriggersByAccount).toHaveBeenCalledWith([
@@ -114,8 +114,8 @@ describe('useSwitchNotifications', () => {
     ]);
 
     // Test disabling notifications
-    act(() => {
-      result.current.onChange(['0x123'], false);
+    await act(async () => {
+      await result.current.onChange(['0x123'], false);
     });
 
     expect(actions.deleteOnChainTriggersByAccount).toHaveBeenCalledWith([
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 3f5e0d6dc5ba..30cc64553fcc 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react';
+import React, { useContext, useState, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { addUrlProtocolPrefix } from '../../../../app/scripts/lib/util';
@@ -65,18 +65,41 @@ import {
 import IncomingTransactionToggle from '../../../components/app/incoming-trasaction-toggle/incoming-transaction-toggle';
 import { Setting } from './setting';
 
-export default function PrivacySettings() {
-  const t = useI18nContext();
-  const dispatch = useDispatch();
-  const history = useHistory();
-
+/**
+ * Profile Syncing Setting props
+ *
+ * @param {boolean} basicFunctionalityOnboarding
+ * @returns props that are used for the profile syncing toggle.
+ */
+function useProfileSyncingProps(basicFunctionalityOnboarding) {
   const { setIsProfileSyncingEnabled, error: setIsProfileSyncingEnabledError } =
     useSetIsProfileSyncingEnabled();
-  const { enableProfileSyncing, error: disableProfileSyncingError } =
+  const { enableProfileSyncing, error: enableProfileSyncingError } =
     useEnableProfileSyncing();
 
   const profileSyncingError =
-    setIsProfileSyncingEnabledError || disableProfileSyncingError;
+    setIsProfileSyncingEnabledError || enableProfileSyncingError;
+
+  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
+
+  // Effect - toggle profile syncing on/off based on basic functionality toggle
+  useEffect(() => {
+    const changeProfileSync = basicFunctionalityOnboarding === true;
+    setIsProfileSyncingEnabled(changeProfileSync);
+  }, [basicFunctionalityOnboarding, setIsProfileSyncingEnabled]);
+
+  return {
+    setIsProfileSyncingEnabled,
+    enableProfileSyncing,
+    profileSyncingError,
+    isProfileSyncingEnabled,
+  };
+}
+
+export default function PrivacySettings() {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const history = useHistory();
 
   const defaultState = useSelector((state) => state.metamask);
   const {
@@ -91,7 +114,6 @@ export default function PrivacySettings() {
     useTransactionSimulations,
   } = defaultState;
   const petnamesEnabled = useSelector(getPetnamesEnabled);
-  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
   const participateInMetaMetrics = useSelector(selectParticipateInMetaMetrics);
 
   const [usePhishingDetection, setUsePhishingDetection] =
@@ -124,6 +146,10 @@ export default function PrivacySettings() {
     getExternalServicesOnboardingToggleState,
   );
 
+  const profileSyncingProps = useProfileSyncingProps(
+    externalServicesOnboardingToggleState,
+  );
+
   const handleSubmit = () => {
     dispatch(toggleExternalServices(externalServicesOnboardingToggleState));
     dispatch(setUsePhishDetect(usePhishingDetection));
@@ -138,10 +164,16 @@ export default function PrivacySettings() {
     setUseTransactionSimulations(isTransactionSimulationsEnabled);
     dispatch(setPetnamesEnabled(turnOnPetnames));
 
+    // Profile Syncing Setup
     if (externalServicesOnboardingToggleState) {
-      if (!isProfileSyncingEnabled && participateInMetaMetrics) {
+      if (
+        profileSyncingProps.isProfileSyncingEnabled ||
+        participateInMetaMetrics
+      ) {
         dispatch(performSignIn());
       }
+    } else {
+      profileSyncingProps.setIsProfileSyncingEnabled(false);
     }
 
     if (ipfsURL && !ipfsError) {
@@ -160,7 +192,7 @@ export default function PrivacySettings() {
     });
 
     const eventName =
-      isProfileSyncingEnabled || participateInMetaMetrics
+      profileSyncingProps.isProfileSyncingEnabled || participateInMetaMetrics
         ? MetaMetricsEventName.OnboardingWalletAdvancedSettingsWithAuthenticating
         : MetaMetricsEventName.OnboardingWalletAdvancedSettingsWithoutAuthenticating;
 
@@ -168,7 +200,7 @@ export default function PrivacySettings() {
       category: MetaMetricsEventCategory.Onboarding,
       event: eventName,
       properties: {
-        isProfileSyncingEnabled,
+        isProfileSyncingEnabled: profileSyncingProps.isProfileSyncingEnabled,
         participateInMetaMetrics,
       },
     });
@@ -177,12 +209,12 @@ export default function PrivacySettings() {
   };
 
   const handleUseProfileSync = async () => {
-    if (isProfileSyncingEnabled) {
+    if (profileSyncingProps.isProfileSyncingEnabled) {
       dispatch(
         showModal({
           name: 'CONFIRM_TURN_OFF_PROFILE_SYNCING',
           turnOffProfileSyncing: () => {
-            setIsProfileSyncingEnabled(false);
+            profileSyncingProps.setIsProfileSyncingEnabled(false);
             trackEvent({
               category: MetaMetricsEventCategory.Onboarding,
               event:
@@ -195,7 +227,7 @@ export default function PrivacySettings() {
         }),
       );
     } else {
-      await enableProfileSyncing();
+      profileSyncingProps.setIsProfileSyncingEnabled(true);
     }
   };
 
@@ -260,7 +292,8 @@ export default function PrivacySettings() {
 
           <Setting
             dataTestId="profile-sync-toggle"
-            value={isProfileSyncingEnabled}
+            disabled={!externalServicesOnboardingToggleState}
+            value={profileSyncingProps.isProfileSyncingEnabled}
             setValue={handleUseProfileSync}
             title={t('profileSync')}
             description={t('profileSyncDescription', [
@@ -274,7 +307,7 @@ export default function PrivacySettings() {
               </a>,
             ])}
           />
-          {profileSyncingError && (
+          {profileSyncingProps.profileSyncingError && (
             <Box paddingBottom={4}>
               <Text
                 as="p"
diff --git a/ui/pages/onboarding-flow/privacy-settings/setting.js b/ui/pages/onboarding-flow/privacy-settings/setting.js
index 804e16cad7b0..31ee059d1126 100644
--- a/ui/pages/onboarding-flow/privacy-settings/setting.js
+++ b/ui/pages/onboarding-flow/privacy-settings/setting.js
@@ -17,6 +17,7 @@ export const Setting = ({
   description,
   showToggle = true,
   dataTestId,
+  disabled = false,
 }) => {
   const t = useI18nContext();
 
@@ -43,6 +44,7 @@ export const Setting = ({
             onToggle={(val) => setValue(!val)}
             offLabel={t('off')}
             onLabel={t('on')}
+            disabled={disabled}
           />
         </div>
       ) : null}
@@ -57,4 +59,5 @@ Setting.propTypes = {
   description: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
   showToggle: PropTypes.bool,
   dataTestId: PropTypes.string,
+  disabled: PropTypes.bool,
 };
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 08552fa9d90c..5d0a1853360b 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
@@ -241,7 +241,7 @@ exports[`Security Tab should match snapshot 1`] = `
             class="settings-page__content-item-col"
           >
             <label
-              class="toggle-button toggle-button--off"
+              class="toggle-button toggle-button--off toggle-button--disabled"
               tabindex="0"
             >
               <div
diff --git a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx
index d2eae5a0e1cd..6bc9bed95cb1 100644
--- a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx
+++ b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.test.tsx
@@ -1,59 +1,63 @@
 import React from 'react';
-import { Provider } from 'react-redux';
+import * as Redux from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { render, fireEvent } from '@testing-library/react';
 import * as ProfileSyncingHook from '../../../../hooks/metamask-notifications/useProfileSyncing';
 import ProfileSyncToggle from './profile-sync-toggle';
 
-let mockUseSelectorReturnValue = false;
-
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useSelector: jest.fn(() => mockUseSelectorReturnValue),
-}));
-
 const mockStore = configureMockStore();
-const initialState = {
+const initialStore = () => ({
   metamask: {
     isSignedIn: false,
+    useExternalServices: true,
+    isProfileSyncingEnabled: true,
+    participateInMetaMetrics: false,
+    isProfileSyncingUpdateLoading: false,
   },
-};
-const store = mockStore(initialState);
+});
 
 describe('ProfileSyncToggle', () => {
-  const enableProfileSyncingMock = jest.fn(() => Promise.resolve());
-  const showModal = jest.fn();
-
-  beforeEach(() => {
-    jest.spyOn(ProfileSyncingHook, 'useEnableProfileSyncing').mockReturnValue({
-      enableProfileSyncing: enableProfileSyncingMock,
-      error: null,
-    });
-    jest.spyOn(store, 'dispatch').mockImplementation(showModal);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
   it('renders correctly', () => {
-    mockUseSelectorReturnValue = false;
     const { getByTestId } = render(
-      <Provider store={store}>
+      <Redux.Provider store={mockStore(initialStore())}>
         <ProfileSyncToggle />
-      </Provider>,
+      </Redux.Provider>,
     );
     expect(getByTestId('profileSyncToggle')).toBeInTheDocument();
   });
 
   it('calls enableProfileSyncing when toggle is turned on', () => {
-    mockUseSelectorReturnValue = false;
+    const store = initialStore();
+    store.metamask.isProfileSyncingEnabled = false; // We want to test enabling this toggle
+
+    const { enableProfileSyncingMock } = arrangeMocks();
+
     const { getByTestId } = render(
-      <Provider store={store}>
+      <Redux.Provider store={mockStore(store)}>
         <ProfileSyncToggle />
-      </Provider>,
+      </Redux.Provider>,
     );
     fireEvent.click(getByTestId('toggleButton'));
     expect(enableProfileSyncingMock).toHaveBeenCalled();
   });
+
+  function arrangeMocks() {
+    const enableProfileSyncingMock = jest.fn(() => Promise.resolve());
+    const disableProfileSyncingMock = jest.fn(() => Promise.resolve());
+
+    jest.spyOn(ProfileSyncingHook, 'useEnableProfileSyncing').mockReturnValue({
+      enableProfileSyncing: enableProfileSyncingMock,
+      error: null,
+    });
+
+    jest.spyOn(ProfileSyncingHook, 'useDisableProfileSyncing').mockReturnValue({
+      disableProfileSyncing: disableProfileSyncingMock,
+      error: null,
+    });
+
+    return {
+      enableProfileSyncingMock,
+      disableProfileSyncingMock,
+    };
+  }
 });
diff --git a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
index c8f4759bd712..a0661635797d 100644
--- a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
+++ b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
@@ -1,10 +1,11 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   useEnableProfileSyncing,
   useDisableProfileSyncing,
+  useSetIsProfileSyncingEnabled,
 } from '../../../../hooks/metamask-notifications/useProfileSyncing';
 import {
   selectIsProfileSyncingEnabled,
@@ -26,6 +27,23 @@ import {
   TextVariant,
 } from '../../../../helpers/constants/design-system';
 import Preloader from '../../../../components/ui/icon/preloader/preloader-icon.component';
+import { getUseExternalServices } from '../../../../selectors';
+
+function ProfileSyncBasicFunctionalitySetting() {
+  const basicFunctionality: boolean = useSelector(getUseExternalServices);
+  const { setIsProfileSyncingEnabled } = useSetIsProfileSyncingEnabled();
+
+  // Effect - toggle profile syncing off when basic functionality is off
+  useEffect(() => {
+    if (basicFunctionality === false) {
+      setIsProfileSyncingEnabled(false);
+    }
+  }, [basicFunctionality, setIsProfileSyncingEnabled]);
+
+  return {
+    isProfileSyncDisabled: !basicFunctionality,
+  };
+}
 
 const ProfileSyncToggle = () => {
   const t = useI18nContext();
@@ -36,6 +54,8 @@ const ProfileSyncToggle = () => {
   const { disableProfileSyncing, error: disableProfileSyncingError } =
     useDisableProfileSyncing();
 
+  const { isProfileSyncDisabled } = ProfileSyncBasicFunctionalitySetting();
+
   const error = enableProfileSyncingError || disableProfileSyncingError;
 
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
@@ -113,6 +133,7 @@ const ProfileSyncToggle = () => {
         {!isProfileSyncingUpdateLoading && (
           <div className="settings-page__content-item-col">
             <ToggleButton
+              disabled={isProfileSyncDisabled}
               value={isProfileSyncingEnabled}
               onToggle={handleUseProfileSync}
               offLabel={t('off')}

From 00f77741db2405d3f229f98acc632edc686b20e4 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 12 Jun 2024 14:29:47 +0530
Subject: [PATCH 020/236] fix: addressing feedbacks in typed sign alerts
 (#25218)

---
 app/_locales/en/messages.json                             | 2 +-
 .../app/alert-system/alert-modal/alert-modal.tsx          | 6 +++++-
 .../app/alert-system/general-alert/general-alert.tsx      | 8 +++++++-
 ui/hooks/useAlerts.ts                                     | 5 +++--
 .../components/confirm/footer/footer.test.tsx             | 2 +-
 .../confirmations/components/confirm/footer/footer.tsx    | 4 ++--
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 95e0cee18115..82e826d107b7 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -679,7 +679,7 @@
     "message": "Blockaid"
   },
   "blockaidAlertInfo": {
-    "message": "If you sign in, a third party known for scams might take all your assets. Please review the alerts before you proceed."
+    "message": "We don't recommend proceeding with this request."
   },
   "blockaidDescriptionApproveFarming": {
     "message": "If you approve this request, a third party known for scams might take all your assets."
diff --git a/ui/components/app/alert-system/alert-modal/alert-modal.tsx b/ui/components/app/alert-system/alert-modal/alert-modal.tsx
index df6cb2b0e647..b53a49585649 100644
--- a/ui/components/app/alert-system/alert-modal/alert-modal.tsx
+++ b/ui/components/app/alert-system/alert-modal/alert-modal.tsx
@@ -137,7 +137,11 @@ function AlertHeader({
 
 function BlockaidAlertDetails() {
   const t = useI18nContext();
-  return <Text textAlign={TextAlign.Center}>{t('blockaidAlertInfo')}</Text>;
+  return (
+    <Text textAlign={TextAlign.Center} variant={TextVariant.bodyMd}>
+      {t('blockaidAlertInfo')}
+    </Text>
+  );
 }
 
 function AlertDetails({
diff --git a/ui/components/app/alert-system/general-alert/general-alert.tsx b/ui/components/app/alert-system/general-alert/general-alert.tsx
index 50a1975f861d..e446a5ba9dd2 100644
--- a/ui/components/app/alert-system/general-alert/general-alert.tsx
+++ b/ui/components/app/alert-system/general-alert/general-alert.tsx
@@ -11,6 +11,7 @@ import { DisclosureVariant } from '../../../ui/disclosure/disclosure.constants';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import {
   Display,
+  FontWeight,
   TextVariant,
 } from '../../../../helpers/constants/design-system';
 import { SecurityProvider } from '../../../../../shared/constants/security-provider';
@@ -79,7 +80,12 @@ function AlertDetails({
           <Box as="ul" className={'alert-modal__alert-details'} paddingLeft={6}>
             {details.map((detail, index) => (
               <Box as="li" key={`disclosure-detail-${index}`}>
-                <Text variant={TextVariant.bodySm}>{detail}</Text>
+                <Text
+                  variant={TextVariant.bodyMdMedium}
+                  fontWeight={FontWeight.Normal}
+                >
+                  {detail}
+                </Text>
               </Box>
             ))}
           </Box>
diff --git a/ui/hooks/useAlerts.ts b/ui/hooks/useAlerts.ts
index ba10a371f2b6..92440822bbdd 100644
--- a/ui/hooks/useAlerts.ts
+++ b/ui/hooks/useAlerts.ts
@@ -62,7 +62,7 @@ const useAlerts = (ownerId: string) => {
       !isAlertConfirmed(alert.key) && alert.severity === Severity.Danger,
   );
   const hasAlerts = alerts.length > 0;
-  const hasDangerAlerts = alerts.some(
+  const dangerAlerts = alerts.filter(
     (alert) => alert.severity === Severity.Danger,
   );
   const hasUnconfirmedDangerAlerts = unconfirmedDangerAlerts.length > 0;
@@ -73,7 +73,8 @@ const useAlerts = (ownerId: string) => {
     generalAlerts,
     getFieldAlerts,
     hasAlerts,
-    hasDangerAlerts,
+    dangerAlerts,
+    hasDangerAlerts: dangerAlerts?.length > 0,
     hasUnconfirmedDangerAlerts,
     isAlertConfirmed,
     setAlertConfirmed,
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
index c0216d45e66d..1645a7684d09 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.test.tsx
@@ -202,7 +202,7 @@ describe('ConfirmFooter', () => {
     };
     it('renders the review alerts button when there are unconfirmed alerts', () => {
       const { getByText } = render(stateWithAlertsMock);
-      expect(getByText('Review alerts')).toBeInTheDocument();
+      expect(getByText('Confirm')).toBeInTheDocument();
     });
 
     it('renders the confirm button when there are no unconfirmed alerts', () => {
diff --git a/ui/pages/confirmations/components/confirm/footer/footer.tsx b/ui/pages/confirmations/components/confirm/footer/footer.tsx
index ee4a58634a92..b47c6fcacff1 100644
--- a/ui/pages/confirmations/components/confirm/footer/footer.tsx
+++ b/ui/pages/confirmations/components/confirm/footer/footer.tsx
@@ -43,7 +43,7 @@ const ConfirmButton = ({
   const [confirmModalVisible, setConfirmModalVisible] =
     useState<boolean>(false);
 
-  const { alerts, hasDangerAlerts, hasUnconfirmedDangerAlerts } =
+  const { alerts, dangerAlerts, hasDangerAlerts, hasUnconfirmedDangerAlerts } =
     useAlerts(alertOwnerId);
 
   const handleCloseConfirmModal = useCallback(() => {
@@ -76,7 +76,7 @@ const ConfirmButton = ({
         size={ButtonSize.Lg}
         disabled={hasUnconfirmedDangerAlerts ? false : disabled}
       >
-        {hasUnconfirmedDangerAlerts ? t('reviewAlerts') : t('confirm')}
+        {dangerAlerts?.length > 1 ? t('reviewAlerts') : t('confirm')}
       </Button>
     </>
   );

From 8d721ab0bd767e6d12f9940605d9f5f6083984a8 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 12 Jun 2024 09:21:10 -0230
Subject: [PATCH 021/236] Version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 66d512f898c1..e196574c55e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.9",
+  "version": "11.16.10",
   "private": true,
   "repository": {
     "type": "git",

From 46a141eeaf51472272d792e46d7d80be3c65fd87 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 12 Jun 2024 09:17:34 -0230
Subject: [PATCH 022/236] fix: Capture Segment errors during initialization

We were submitting Segment events in the MetaMetrics constructor
without cathing errors. This was the sole place where we failed to
catch errors resulting from Segment calls.

Fixes #25244
---
 app/scripts/controllers/metametrics.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index 73e9fd9609df..c79733e0b0bd 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -188,7 +188,11 @@ export default class MetaMetricsController {
     // Code below submits any pending segmentApiCalls to Segment if/when the controller is re-instantiated
     if (isManifestV3) {
       Object.values(segmentApiCalls).forEach(({ eventType, payload }) => {
-        this._submitSegmentAPICall(eventType, payload);
+        try {
+          this._submitSegmentAPICall(eventType, payload);
+        } catch (error) {
+          this._captureException(error);
+        }
       });
     }
 

From ee0b90df12824f63dc0f909a7e6cecd865dafed6 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 12 Jun 2024 09:22:20 -0230
Subject: [PATCH 023/236] Update changelog

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9674ade44ef2..bded30067fe0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.10]
+### Fixed
+- Capture Segment errors during initialization ([#25253](https://github.com/MetaMask/metamask-extension/pull/25253))
+
 ## [11.16.9]
 ### Fixed
 - Fix an issue where Snaps would be unable to decrypt older state ([#25172](https://github.com/MetaMask/metamask-extension/pull/25172))
@@ -4804,7 +4808,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...HEAD
+[11.16.10]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...v11.16.10
 [11.16.9]: https://github.com/MetaMask/metamask-extension/compare/v11.16.8...v11.16.9
 [11.16.8]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v11.16.8
 [11.16.7]: https://github.com/MetaMask/metamask-extension/compare/v11.16.6...v11.16.7

From 87d2795a7cb33e0d917f384f41c4190bebcc7b3d Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Tue, 11 Jun 2024 13:45:26 +0200
Subject: [PATCH 024/236] fix: Disable MV3 for MV2 Flask production build
 (#25209)

## **Description**

Disables MV3 for the MV2 Flask production build. This was seemingly
missed when setting up the CI to build for production and caused
problems with the latest build submitted to Firefox.

Also updates the release script to use MV2 builds for Firefox.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25209?quickstart=1)
---
 .circleci/config.yml                           | 2 +-
 .circleci/scripts/release-create-gh-release.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f4b824285a19..a4d8905f9fe5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -749,7 +749,7 @@ jobs:
           steps:
             - run:
                 name: build:prod
-                command: yarn build --build-type flask prod
+                command: ENABLE_MV3=false yarn build --build-type flask prod
       - run:
           name: build:debug
           command: find dist/ -type f -exec md5sum {} \; | sort -k 2
diff --git a/.circleci/scripts/release-create-gh-release.sh b/.circleci/scripts/release-create-gh-release.sh
index e138e20c5b59..37a654798b9f 100755
--- a/.circleci/scripts/release-create-gh-release.sh
+++ b/.circleci/scripts/release-create-gh-release.sh
@@ -69,9 +69,9 @@ then
     release_body="$(awk -v version="${tag##v}" -f .circleci/scripts/show-changelog.awk CHANGELOG.md)"
     hub release create \
         --attach builds/metamask-chrome-*.zip \
-        --attach builds/metamask-firefox-*.zip \
+        --attach builds-mv2/metamask-firefox-*.zip \
         --attach builds-flask/metamask-flask-chrome-*.zip \
-        --attach builds-flask/metamask-flask-firefox-*.zip \
+        --attach builds-flask-mv2/metamask-flask-firefox-*.zip \
         --attach builds-mmi/metamask-mmi-chrome-*.zip \
         --attach builds-mmi/metamask-mmi-firefox-*.zip \
         --message "Version ${tag##v}" \

From cbb35440188f8cc3420488ef16e2b914c2d10495 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Wed, 12 Jun 2024 18:19:21 +0200
Subject: [PATCH 025/236] =?UTF-8?q?v12.0.0=20Cherry-Pick=20=20fix:=20Avoid?=
 =?UTF-8?q?=20to=20send=20the=20snap=20notification=20id=20to=20the=20noti?=
 =?UTF-8?q?fications=20serv=E2=80=A6=20(#25215)?=
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 PR fixes a bug related to the "Mark all notifications as read"
button. The button is responsible, when clicked, for performing the
actions to mark a notification as read. In the case of on-chain
notifications, this state needs to be saved via API on the notification
server. The PR prevents the IDs of SNAP notifications from being sent to
the server, as their read/unread state is managed differently.

Original PR: https://github.com/MetaMask/metamask-extension/pull/25099
This Cherry-Pick did not have any merge conflicts that needed resolving.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25215?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../notifications-list-read-all-button.tsx      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/ui/pages/notifications/notifications-list-read-all-button.tsx b/ui/pages/notifications/notifications-list-read-all-button.tsx
index 0af80ef929d0..6fa200a772e9 100644
--- a/ui/pages/notifications/notifications-list-read-all-button.tsx
+++ b/ui/pages/notifications/notifications-list-read-all-button.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import {
@@ -16,6 +16,7 @@ import { markNotificationsAsRead } from '../../store/actions';
 import { Box, Button, ButtonVariant } from '../../components/component-library';
 import { BlockSize } from '../../helpers/constants/design-system';
 import type { NotificationType } from './notifications';
+import { SNAP } from './snap/types/types';
 
 export type NotificationsListReadAllButtonProps = {
   notifications: NotificationType[];
@@ -28,20 +29,17 @@ export const NotificationsListReadAllButton = ({
   const t = useI18nContext();
   const { markNotificationAsRead } = useMarkNotificationAsRead();
   const trackEvent = useContext(MetaMetricsContext);
-
   const unreadNotifications = useSelector(getUnreadNotifications);
 
-  const [notificationReadArray, setNotificationReadArray] =
-    useState<MarkAsReadNotificationsParam>([]);
-
-  useEffect(() => {
+  const handleOnClick = () => {
     let notificationsRead: MarkAsReadNotificationsParam = [];
 
     if (notifications && notifications.length > 0) {
       notificationsRead = notifications
         .filter(
           (notification): notification is Notification =>
-            (notification as Notification).id !== undefined,
+            (notification as Notification).id !== undefined &&
+            notification.type !== SNAP,
         )
         .map((notification: Notification) => ({
           id: notification.id,
@@ -49,17 +47,14 @@ export const NotificationsListReadAllButton = ({
           isRead: notification.isRead,
         }));
     }
-    setNotificationReadArray(notificationsRead);
-  }, [notifications]);
 
-  const handleOnClick = () => {
     trackEvent({
       category: MetaMetricsEventCategory.NotificationInteraction,
       event: MetaMetricsEventName.MarkAllNotificationsRead,
     });
 
     // Mark all metamask notifications as read
-    markNotificationAsRead(notificationReadArray);
+    markNotificationAsRead(notificationsRead);
 
     // Mark all snap notifications as read
     const unreadNotificationIds = unreadNotifications.map(({ id }) => id);

From b25d64ef7772f0d2254c953a11c429c96cef9ef6 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Wed, 12 Jun 2024 18:20:51 +0200
Subject: [PATCH 026/236] v12.0.0 Cherry-Pick fix: Notifications platform links
 (#24708) (#25214)
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 PR introduces the logic to handle links within notifications to
support the different platforms on which we can use the extension.

Original PR: https://github.com/MetaMask/metamask-extension/pull/24708
This Cherry-Pick did not have any conflicts to resolve.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/24708?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Open the notifications list page
2. Click on a product announcement
3. Check the link in the detail page

## **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**

- [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.


<!--
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/25214?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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 +-
 .../mocks/mock-feature-announcements.ts       | 12 ++--
 .../services/feature-announcements.ts         | 24 +++----
 .../feature-announcement.ts                   | 14 ++--
 .../types/feature-announcement/type-action.ts | 12 ----
 .../type-extension-link.ts                    | 14 ++++
 .../type-feature-announcement.ts              |  6 +-
 .../types/feature-announcement/type-link.ts   | 12 ----
 .../utils/get-notification-message.ts         |  7 +-
 ui/components/multichain/index.js             |  1 +
 .../index.ts                                  |  1 +
 ...tion-detail-block-explorer-button.test.tsx | 66 +++++++++++++++++++
 ...ification-detail-block-explorer-button.tsx | 55 ++++++++++++++++
 .../notification-detail-button.tsx            |  2 +-
 .../notification-details-footer.tsx           |  3 +-
 .../erc1155-sent-received.tsx                 | 18 ++---
 .../erc20-sent-received.tsx                   | 22 ++-----
 .../erc721-sent-received.tsx                  | 18 ++---
 .../eth-sent-received/eth-sent-received.tsx   | 18 ++---
 .../feature-announcement.tsx                  | 22 ++-----
 .../lido-stake-ready-to-be-withdrawn.tsx      | 18 ++---
 .../lido-withdrawal-requested.tsx             | 18 ++---
 .../notification-components/stake/stake.tsx   | 18 ++---
 .../swap-completed/swap-completed.tsx         | 18 ++---
 .../types/notifications/notifications.ts      |  3 +-
 25 files changed, 206 insertions(+), 198 deletions(-)
 delete mode 100644 app/scripts/controllers/metamask-notifications/types/feature-announcement/type-action.ts
 create mode 100644 app/scripts/controllers/metamask-notifications/types/feature-announcement/type-extension-link.ts
 delete mode 100644 app/scripts/controllers/metamask-notifications/types/feature-announcement/type-link.ts
 create mode 100644 ui/components/multichain/notification-detail-block-explorer-button/index.ts
 create mode 100644 ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx
 create mode 100644 ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 82e826d107b7..9b031453eaaf 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3149,7 +3149,7 @@
     "message": "Priority fee (GWEI)"
   },
   "notificationItemCheckBlockExplorer": {
-    "message": "Check on the BlockExplorer"
+    "message": "Check on the Block Explorer"
   },
   "notificationItemCollection": {
     "message": "Collection"
diff --git a/app/scripts/controllers/metamask-notifications/mocks/mock-feature-announcements.ts b/app/scripts/controllers/metamask-notifications/mocks/mock-feature-announcements.ts
index bf3a3fde2242..71e2b637e5bb 100644
--- a/app/scripts/controllers/metamask-notifications/mocks/mock-feature-announcements.ts
+++ b/app/scripts/controllers/metamask-notifications/mocks/mock-feature-announcements.ts
@@ -122,9 +122,8 @@ export function createMockFeatureAnnouncementAPIResult(): ContentfulResult {
             locale: 'en-US',
           },
           fields: {
-            linkText: 'Try now',
-            linkUrl: 'https://portfolio.metamask.io/explore',
-            isExternal: false,
+            extensionLinkText: 'Try now',
+            extensionLinkRoute: 'home.html',
           },
         },
       ],
@@ -193,10 +192,9 @@ export function createMockFeatureAnnouncementRaw(): FeatureAnnouncementRawNotifi
         description: '',
         url: '//images.ctfassets.net/jdkgyfmyd9sw/5jqq8sFeLc6XEoeWlpI3aB/73ee0f1afa9916c3a7538b0bbee09c26/PDAPP_notification_image_Airdrops___NFT_mints.png',
       },
-      link: {
-        linkText: 'Try now',
-        linkUrl: 'https://portfolio.metamask.io/explore',
-        isExternal: false,
+      extensionLink: {
+        extensionLinkText: 'Try now',
+        extensionLinkRoute: 'home.html',
       },
     },
   };
diff --git a/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts b/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
index 548646138e85..0fb911497cd7 100644
--- a/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
+++ b/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
@@ -9,8 +9,7 @@ import type { Notification } from '../types/notification/notification';
 import { processFeatureAnnouncement } from '../processors/process-feature-announcement';
 import { TRIGGER_TYPES } from '../constants/notification-schema';
 import { ImageFields } from '../types/feature-announcement/type-feature-announcement';
-import { TypeLinkFields } from '../types/feature-announcement/type-link';
-import { TypeActionFields } from '../types/feature-announcement/type-action';
+import { TypeExtensionLinkFields } from '../types/feature-announcement/type-extension-link';
 
 const spaceId = process.env.CONTENTFUL_ACCESS_SPACE_ID || ':space_id';
 const accessToken = process.env.CONTENTFUL_ACCESS_TOKEN || '';
@@ -78,11 +77,10 @@ async function fetchFeatureAnnouncementNotifications(): Promise<
       const imageFields = fields.image
         ? (findIncludedItem(fields.image.sys.id) as ImageFields['fields'])
         : undefined;
-      const actionFields = fields.action
-        ? (findIncludedItem(fields.action.sys.id) as TypeActionFields['fields'])
-        : undefined;
-      const linkFields = fields.link
-        ? (findIncludedItem(fields.link.sys.id) as TypeLinkFields['fields'])
+      const extensionLinkFields = fields.extensionLink
+        ? (findIncludedItem(
+            fields.extensionLink.sys.id,
+          ) as TypeExtensionLinkFields['fields'])
         : undefined;
 
       const notification: FeatureAnnouncementRawNotification = {
@@ -99,15 +97,9 @@ async function fetchFeatureAnnouncementNotifications(): Promise<
             description: imageFields?.description,
             url: imageFields?.file?.url ?? '',
           },
-          link: linkFields && {
-            linkText: linkFields?.linkText,
-            linkUrl: linkFields?.linkUrl,
-            isExternal: linkFields?.isExternal,
-          },
-          action: actionFields && {
-            actionText: actionFields?.actionText,
-            actionUrl: actionFields?.actionUrl,
-            isExternal: actionFields?.isExternal,
+          extensionLink: extensionLinkFields && {
+            extensionLinkText: extensionLinkFields?.extensionLinkText,
+            extensionLinkRoute: extensionLinkFields?.extensionLinkRoute,
           },
         },
       };
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/feature-announcement.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/feature-announcement.ts
index 4141dab2618a..6155c9dcd156 100644
--- a/app/scripts/controllers/metamask-notifications/types/feature-announcement/feature-announcement.ts
+++ b/app/scripts/controllers/metamask-notifications/types/feature-announcement/feature-announcement.ts
@@ -6,7 +6,7 @@ export type { TypeFeatureAnnouncementFields } from './type-feature-announcement'
 
 export type FeatureAnnouncementRawNotificationData = Omit<
   TypeFeatureAnnouncement['fields'],
-  'image' | 'longDescription' | 'link' | 'action'
+  'image' | 'longDescription' | 'extensionLink'
 > & {
   longDescription: string;
   image: {
@@ -14,15 +14,9 @@ export type FeatureAnnouncementRawNotificationData = Omit<
     description?: string;
     url: string;
   };
-  link?: {
-    linkText: string;
-    linkUrl: string;
-    isExternal: boolean;
-  };
-  action?: {
-    actionText: string;
-    actionUrl: string;
-    isExternal: boolean;
+  extensionLink?: {
+    extensionLinkText: string;
+    extensionLinkRoute: string;
   };
 };
 
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-action.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-action.ts
deleted file mode 100644
index 453bd5d9b206..000000000000
--- a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-action.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { Entry } from 'contentful';
-
-export type TypeActionFields = {
-  fields: {
-    actionText: string;
-    actionUrl: string;
-    isExternal: boolean;
-  };
-  contentTypeId: 'action';
-};
-
-export type TypeAction = Entry<TypeActionFields, 'WITHOUT_UNRESOLVABLE_LINKS'>;
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-extension-link.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-extension-link.ts
new file mode 100644
index 000000000000..bfc3d40267ae
--- /dev/null
+++ b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-extension-link.ts
@@ -0,0 +1,14 @@
+import type { Entry } from 'contentful';
+
+export type TypeExtensionLinkFields = {
+  fields: {
+    extensionLinkText: string;
+    extensionLinkRoute: string;
+  };
+  contentTypeId: 'extensionLink';
+};
+
+export type TypeExtensionLink = Entry<
+  TypeExtensionLinkFields,
+  'WITHOUT_UNRESOLVABLE_LINKS'
+>;
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-feature-announcement.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-feature-announcement.ts
index 6716a9844ec9..8cff6cbd7d9d 100644
--- a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-feature-announcement.ts
+++ b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-feature-announcement.ts
@@ -1,6 +1,5 @@
 import type { Entry, EntryFieldTypes } from 'contentful';
-import type { TypeActionFields } from './type-action';
-import type { TypeLinkFields } from './type-link';
+import type { TypeExtensionLinkFields } from './type-extension-link';
 
 export type ImageFields = {
   fields: {
@@ -30,8 +29,7 @@ export type TypeFeatureAnnouncementFields = {
     shortDescription: EntryFieldTypes.Text;
     image: EntryFieldTypes.EntryLink<ImageFields>;
     longDescription: EntryFieldTypes.RichText;
-    link?: EntryFieldTypes.EntryLink<TypeLinkFields>;
-    action?: EntryFieldTypes.EntryLink<TypeActionFields>;
+    extensionLink?: EntryFieldTypes.EntryLink<TypeExtensionLinkFields>;
     clients?: EntryFieldTypes.Text<'extension' | 'mobile' | 'portfolio'>;
   };
   contentTypeId: 'productAnnouncement';
diff --git a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-link.ts b/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-link.ts
deleted file mode 100644
index fec717ce9da2..000000000000
--- a/app/scripts/controllers/metamask-notifications/types/feature-announcement/type-link.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { Entry } from 'contentful';
-
-export type TypeLinkFields = {
-  fields: {
-    linkText: string;
-    linkUrl: string;
-    isExternal: boolean;
-  };
-  contentTypeId: 'link';
-};
-
-export type TypeLink = Entry<TypeLinkFields, 'WITHOUT_UNRESOLVABLE_LINKS'>;
diff --git a/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
index 8dccb78872d0..e979e9cc5b53 100644
--- a/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
+++ b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
@@ -7,6 +7,7 @@ import type { TRIGGER_TYPES } from '../../metamask-notifications/constants/notif
 import type { OnChainRawNotification } from '../../metamask-notifications/types/on-chain-notification/on-chain-notification';
 import { t } from '../../../translate';
 import type { Notification } from '../../metamask-notifications/types/types';
+import ExtensionPlatform from '../../../platforms/extension';
 import { getAmount, formatAmount } from './get-notification-data';
 
 type PushNotificationMessage = {
@@ -27,6 +28,7 @@ type NotificationMessageDict = {
 };
 
 const sw = self as unknown as ServiceWorkerGlobalScope;
+const extensionPlatform = new ExtensionPlatform();
 
 function getChainSymbol(chainId: number) {
   return CHAIN_SYMBOLS[chainId] ?? null;
@@ -65,7 +67,10 @@ export async function onNotificationClick(
   emitEvent?.(data);
 
   // Navigate
-  const destination = `chrome-extension://${sw.location.host}/home.html#notifications/${data.id}`;
+  const destination = `${extensionPlatform.getExtensionURL(
+    null,
+    null,
+  )}#notifications/${data.id}`;
   event.waitUntil(sw.clients.openWindow(destination));
 }
 
diff --git a/ui/components/multichain/index.js b/ui/components/multichain/index.js
index d2b8f06e0946..4f4ca9468bac 100644
--- a/ui/components/multichain/index.js
+++ b/ui/components/multichain/index.js
@@ -40,6 +40,7 @@ export { NotificationDetailInfo } from './notification-detail-info';
 export { NotificationDetailNft } from './notification-detail-nft';
 export { NotificationDetailTitle } from './notification-detail-title';
 export { NotificationDetailButton } from './notification-detail-button';
+export { NotificationDetailBlockExplorerButton } from './notification-detail-block-explorer-button';
 export { NotificationsPage } from './notifications-page';
 export { NotificationsSettingsBox } from './notifications-settings-box';
 export { NotificationsSettingsType } from './notifications-settings-type';
diff --git a/ui/components/multichain/notification-detail-block-explorer-button/index.ts b/ui/components/multichain/notification-detail-block-explorer-button/index.ts
new file mode 100644
index 000000000000..1a19f8f9b359
--- /dev/null
+++ b/ui/components/multichain/notification-detail-block-explorer-button/index.ts
@@ -0,0 +1 @@
+export { NotificationDetailBlockExplorerButton } from './notification-detail-block-explorer-button';
diff --git a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx
new file mode 100644
index 000000000000..fd63e34dffee
--- /dev/null
+++ b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.test.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import type { Notification } from '../../../../app/scripts/controllers/metamask-notifications/types/notification/notification';
+import mockState from '../../../../test/data/mock-state.json';
+import { NotificationDetailBlockExplorerButton } from './notification-detail-block-explorer-button';
+
+const mockStore = configureStore();
+const store = mockStore({
+  ...mockState,
+});
+
+const mockNotification = {
+  createdAt: '2023-12-11T22:27:13.020176Z',
+  isRead: false,
+  block_number: 18765683,
+  block_timestamp: '1702330595',
+  chain_id: 1,
+  created_at: '2023-12-11T22:27:13.020176Z',
+  data: {
+    to: '0xeae7380dd4cef6fbd1144f49e4d1e6964258a4f4',
+    from: '0xdbf5e9c5206d0db70a90108bf936da60221dc080',
+    kind: 'erc20_received',
+    token: {
+      usd: '1.00',
+      name: 'Dai Stablecoin',
+      image:
+        'https://raw.githubusercontent.com/MetaMask/contract-metadata/master/images/dai.svg',
+      amount: '232708000000000000000000',
+      symbol: 'DAI',
+      address: '0x6b175474e89094c44da98b954eedeac495271d0f',
+      decimals: '18',
+    },
+    network_fee: {
+      gas_price: '40060432936',
+      native_token_price_in_usd: '2192.74',
+    },
+  },
+  id: '0441bf59-d211-5c55-91b5-c5d859a3d301',
+  trigger_id: 'e6a9210c-f367-4c9f-8767-12a6153e5c37',
+  tx_hash: '0xf8d58eb524e9ac1ba924599adef1df3b75a3dfa1de68d20918979934db4eb379',
+  unread: true,
+  type: 'ERC20_RECEIVED',
+};
+
+describe('NotificationDetailBlockExplorerButton', () => {
+  it('renders correctly with a valid block explorer URL', () => {
+    render(
+      <Provider store={store}>
+        <NotificationDetailBlockExplorerButton
+          notification={mockNotification as Notification}
+          chainId={1}
+          txHash="0xf8d58eb524e9ac1ba924599adef1df3b75a3dfa1de68d20918979934db4eb379"
+          id="button1"
+        />
+      </Provider>,
+    );
+    expect(screen.getByRole('link')).toHaveAttribute(
+      'href',
+      expect.stringContaining(
+        '/tx/0xf8d58eb524e9ac1ba924599adef1df3b75a3dfa1de68d20918979934db4eb379',
+      ),
+    );
+  });
+});
diff --git a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
new file mode 100644
index 000000000000..572762578d4b
--- /dev/null
+++ b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
@@ -0,0 +1,55 @@
+import React, { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import type { NetworkConfiguration } from '@metamask/network-controller';
+import type { Notification } from '../../../../app/scripts/controllers/metamask-notifications/types/types';
+import { getAllNetworks } from '../../../selectors';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import { ButtonVariant } from '../../component-library';
+import { decimalToHex } from '../../../../shared/modules/conversion.utils';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getNetworkDetailsByChainId } from '../../../helpers/utils/notification.util';
+import { NotificationDetailButton } from '../notification-detail-button';
+
+type NotificationDetailBlockExplorerButtonProps = {
+  notification: Notification;
+  chainId: number;
+  txHash: string;
+  id: string;
+};
+
+export const NotificationDetailBlockExplorerButton = ({
+  notification,
+  chainId,
+  txHash,
+  id,
+}: NotificationDetailBlockExplorerButtonProps) => {
+  const t = useI18nContext();
+
+  const chainIdHex = decimalToHex(chainId);
+  const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
+    `0x${chainId}` as keyof typeof CHAIN_IDS,
+  );
+
+  const defaultNetworks: NetworkConfiguration[] = useSelector(getAllNetworks);
+  const defaultNetwork = useMemo(() => {
+    return defaultNetworks.find((n) => n.chainId === chainIdHex);
+  }, [defaultNetworks]);
+
+  const blockExplorerUrl =
+    defaultNetwork?.rpcPrefs?.blockExplorerUrl ?? nativeBlockExplorerUrl;
+
+  if (!blockExplorerUrl) {
+    return null;
+  }
+
+  return (
+    <NotificationDetailButton
+      notification={notification}
+      variant={ButtonVariant.Secondary}
+      text={t('notificationItemCheckBlockExplorer') || ''}
+      href={`${blockExplorerUrl}/tx/${txHash}`}
+      id={id}
+      isExternal={true}
+    />
+  );
+};
diff --git a/ui/components/multichain/notification-detail-button/notification-detail-button.tsx b/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
index 33a8e81ce47e..190b5cc4fa51 100644
--- a/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
+++ b/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
@@ -50,7 +50,7 @@ export const NotificationDetailButton = ({
       key={id}
       href={href}
       variant={variant}
-      externalLink={isExternal || true}
+      externalLink={isExternal}
       size={ButtonSize.Lg}
       width={BlockSize.Full}
       endIconName={endIconName ? IconName.Arrow2UpRight : undefined}
diff --git a/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx b/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx
index 4af979524f8b..9eefec357f7f 100644
--- a/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx
+++ b/ui/pages/notification-details/notification-details-footer/notification-details-footer.tsx
@@ -34,8 +34,7 @@ export const NotificationDetailsFooter = ({
       )}
       {footer.type === 'footer_feature_announcement' && (
         <>
-          <footer.Action notification={notification} />
-          <footer.Link notification={notification} />
+          <footer.ExtensionLink notification={notification} />
         </>
       )}
     </Box>
diff --git a/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx b/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx
index 2372b6d6b410..cf73c16a12bc 100644
--- a/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/erc1155-sent-received/erc1155-sent-received.tsx
@@ -26,7 +26,7 @@ import {
   NotificationDetailInfo,
   NotificationDetailAsset,
   NotificationDetailNetworkFee,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailTitle,
   NotificationDetailCollection,
   NotificationDetailNft,
@@ -35,7 +35,6 @@ import { NotificationListItemIconType } from '../../../../components/multichain/
 import {
   BadgeWrapperPosition,
   IconName,
-  ButtonVariant,
 } from '../../../../components/component-library';
 
 type ERC1155Notification = ExtractedNotification<
@@ -187,20 +186,11 @@ export const components: NotificationComponent<ERC1155Notification> = {
   footer: {
     type: 'footer_onchain_notification',
     ScanLink: ({ notification }) => {
-      const chainId = decimalToHex(notification.chain_id);
-      const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-        `0x${chainId}` as keyof typeof CHAIN_IDS,
-      );
       return (
-        <NotificationDetailButton
+        <NotificationDetailBlockExplorerButton
           notification={notification}
-          variant={ButtonVariant.Secondary}
-          text={t('notificationItemCheckBlockExplorer') || ''}
-          href={
-            nativeBlockExplorerUrl
-              ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-              : '#'
-          }
+          chainId={notification.chain_id}
+          txHash={notification.tx_hash}
           id={notification.id}
         />
       );
diff --git a/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx b/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx
index d2e8f23c6666..aacb7f9502dd 100644
--- a/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/erc20-sent-received/erc20-sent-received.tsx
@@ -19,7 +19,7 @@ import {
 import {
   NotificationListItem,
   NotificationDetailTitle,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailAddress,
   NotificationDetailInfo,
   NotificationDetailCopyButton,
@@ -34,7 +34,6 @@ import {
 import {
   BadgeWrapperPosition,
   IconName,
-  ButtonVariant,
 } from '../../../../components/component-library';
 
 type ERC20Notification = ExtractedNotification<
@@ -161,7 +160,9 @@ export const components: NotificationComponent<ERC20Notification> = {
             value={`${getAmount(
               notification.data.token.amount,
               notification.data.token.decimals,
-              { shouldEllipse: true },
+              {
+                shouldEllipse: true,
+              },
             )} ${notification.data.token.symbol}`}
           />
         );
@@ -189,20 +190,11 @@ export const components: NotificationComponent<ERC20Notification> = {
   footer: {
     type: 'footer_onchain_notification',
     ScanLink: ({ notification }) => {
-      const chainId = decimalToHex(notification.chain_id);
-      const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-        `0x${chainId}` as keyof typeof CHAIN_IDS,
-      );
       return (
-        <NotificationDetailButton
+        <NotificationDetailBlockExplorerButton
           notification={notification}
-          variant={ButtonVariant.Secondary}
-          text={t('notificationItemCheckBlockExplorer') || ''}
-          href={
-            nativeBlockExplorerUrl
-              ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-              : '#'
-          }
+          chainId={notification.chain_id}
+          txHash={notification.tx_hash}
           id={notification.id}
         />
       );
diff --git a/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx b/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx
index e7625405fd2c..4529a1823ad2 100644
--- a/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/erc721-sent-received/erc721-sent-received.tsx
@@ -26,7 +26,7 @@ import {
   NotificationDetailInfo,
   NotificationDetailAsset,
   NotificationDetailNetworkFee,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailTitle,
   NotificationDetailNft,
   NotificationDetailCollection,
@@ -35,7 +35,6 @@ import { NotificationListItemIconType } from '../../../../components/multichain/
 import {
   BadgeWrapperPosition,
   IconName,
-  ButtonVariant,
 } from '../../../../components/component-library';
 
 type ERC721Notification = ExtractedNotification<
@@ -186,20 +185,11 @@ export const components: NotificationComponent<ERC721Notification> = {
   footer: {
     type: 'footer_onchain_notification',
     ScanLink: ({ notification }) => {
-      const chainId = decimalToHex(notification.chain_id);
-      const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-        `0x${chainId}` as keyof typeof CHAIN_IDS,
-      );
       return (
-        <NotificationDetailButton
+        <NotificationDetailBlockExplorerButton
           notification={notification}
-          variant={ButtonVariant.Secondary}
-          text={t('notificationItemCheckBlockExplorer') || ''}
-          href={
-            nativeBlockExplorerUrl
-              ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-              : '#'
-          }
+          chainId={notification.chain_id}
+          txHash={notification.tx_hash}
           id={notification.id}
         />
       );
diff --git a/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx b/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
index 77df4592babb..5b44e42f7112 100644
--- a/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
@@ -22,7 +22,7 @@ import {
 import {
   NotificationListItem,
   NotificationDetailTitle,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailAddress,
   NotificationDetailInfo,
   NotificationDetailCopyButton,
@@ -33,7 +33,6 @@ import { NotificationListItemIconType } from '../../../../components/multichain/
 import {
   BadgeWrapperPosition,
   IconName,
-  ButtonVariant,
 } from '../../../../components/component-library';
 
 type ETHNotification = ExtractedNotification<
@@ -200,20 +199,11 @@ export const components: NotificationComponent<ETHNotification> = {
   footer: {
     type: 'footer_onchain_notification',
     ScanLink: ({ notification }) => {
-      const chainId = decimalToHex(notification.chain_id);
-      const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-        `0x${chainId}` as keyof typeof CHAIN_IDS,
-      );
       return (
-        <NotificationDetailButton
+        <NotificationDetailBlockExplorerButton
           notification={notification}
-          variant={ButtonVariant.Secondary}
-          text={t('notificationItemCheckBlockExplorer') || ''}
-          href={
-            nativeBlockExplorerUrl
-              ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-              : '#'
-          }
+          chainId={notification.chain_id}
+          txHash={notification.tx_hash}
           id={notification.id}
         />
       );
diff --git a/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx b/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx
index 7851a48ce5fa..05a30de61530 100644
--- a/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx
+++ b/ui/pages/notifications/notification-components/feature-announcement/feature-announcement.tsx
@@ -103,28 +103,16 @@ export const components: NotificationComponent<FeatureAnnouncementNotification>
     },
     footer: {
       type: 'footer_feature_announcement',
-      Link: ({ notification }) =>
-        notification.data.link ? (
+      ExtensionLink: ({ notification }) =>
+        notification.data.extensionLink ? (
           <NotificationDetailButton
             notification={notification}
             variant={ButtonVariant.Primary}
-            text={notification.data.link.linkText}
-            href={notification.data.link.linkUrl}
+            text={notification.data.extensionLink.extensionLinkText}
+            href={`/${notification.data.extensionLink.extensionLinkRoute}`}
             id={notification.id}
-            isExternal={notification.data.link.isExternal}
-            endIconName={false}
-          />
-        ) : null,
-      Action: ({ notification }) =>
-        notification.data.action ? (
-          <NotificationDetailButton
-            notification={notification}
-            variant={ButtonVariant.Secondary}
-            text={notification.data.action.actionText}
-            href={notification.data.action.actionUrl}
-            id={notification.id}
-            isExternal={notification.data.action.isExternal}
             endIconName={false}
+            isExternal={true}
           />
         ) : null,
     },
diff --git a/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx b/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx
index dc6a770ed0ac..c1cffb1b0c7b 100644
--- a/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx
+++ b/ui/pages/notifications/notification-components/lido-stake-ready-to-be-withdrawn/lido-stake-ready-to-be-withdrawn.tsx
@@ -8,7 +8,7 @@ import {
   NotificationDetailInfo,
   NotificationDetailTitle,
   NotificationDetailAsset,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailAddress,
 } from '../../../../components/multichain';
 import { t } from '../../../../../app/scripts/translate';
@@ -25,7 +25,6 @@ import {
 } from '../../../../helpers/constants/design-system';
 import { NotificationListItemIconType } from '../../../../components/multichain/notification-list-item-icon/notification-list-item-icon';
 import {
-  ButtonVariant,
   BadgeWrapperPosition,
   IconName,
 } from '../../../../components/component-library';
@@ -164,20 +163,11 @@ export const components: NotificationComponent<LidoReadyWithDrawnNotification> =
     footer: {
       type: 'footer_onchain_notification',
       ScanLink: ({ notification }) => {
-        const chainId = decimalToHex(notification.chain_id);
-        const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-          `0x${chainId}` as keyof typeof CHAIN_IDS,
-        );
         return (
-          <NotificationDetailButton
+          <NotificationDetailBlockExplorerButton
             notification={notification}
-            variant={ButtonVariant.Secondary}
-            text={t('notificationItemCheckBlockExplorer') || ''}
-            href={
-              nativeBlockExplorerUrl
-                ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-                : '#'
-            }
+            chainId={notification.chain_id}
+            txHash={notification.tx_hash}
             id={notification.id}
           />
         );
diff --git a/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx b/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx
index 12679213dcd9..f539f4bbe511 100644
--- a/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx
+++ b/ui/pages/notifications/notification-components/lido-withdrawal-requested/lido-withdrawal-requested.tsx
@@ -8,7 +8,7 @@ import {
   NotificationDetailAsset,
   NotificationListItem,
   NotificationDetailInfo,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailCopyButton,
   NotificationDetailTitle,
   NotificationDetailAddress,
@@ -28,7 +28,6 @@ import {
 } from '../../../../helpers/constants/design-system';
 
 import {
-  ButtonVariant,
   BadgeWrapperPosition,
   IconName,
 } from '../../../../components/component-library';
@@ -183,20 +182,11 @@ export const components: NotificationComponent<LidoWithdrawalRequestedNotificati
     footer: {
       type: 'footer_onchain_notification',
       ScanLink: ({ notification }) => {
-        const chainId = decimalToHex(notification.chain_id);
-        const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-          `0x${chainId}` as keyof typeof CHAIN_IDS,
-        );
         return (
-          <NotificationDetailButton
+          <NotificationDetailBlockExplorerButton
             notification={notification}
-            variant={ButtonVariant.Secondary}
-            text={t('notificationItemCheckBlockExplorer') || ''}
-            href={
-              nativeBlockExplorerUrl
-                ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-                : '#'
-            }
+            chainId={notification.chain_id}
+            txHash={notification.tx_hash}
             id={notification.id}
           />
         );
diff --git a/ui/pages/notifications/notification-components/stake/stake.tsx b/ui/pages/notifications/notification-components/stake/stake.tsx
index f6bb3c89eb86..b07d5aca9def 100644
--- a/ui/pages/notifications/notification-components/stake/stake.tsx
+++ b/ui/pages/notifications/notification-components/stake/stake.tsx
@@ -9,7 +9,7 @@ import {
   NotificationListItem,
   NotificationDetailInfo,
   NotificationDetailNetworkFee,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailTitle,
   NotificationDetailAsset,
   NotificationDetailCopyButton,
@@ -19,7 +19,6 @@ import { NotificationListItemIconType } from '../../../../components/multichain/
 import {
   BadgeWrapperPosition,
   IconName,
-  ButtonVariant,
 } from '../../../../components/component-library';
 
 import {
@@ -265,20 +264,11 @@ export const components: NotificationComponent<StakeNotification> = {
   footer: {
     type: 'footer_onchain_notification',
     ScanLink: ({ notification }) => {
-      const chainId = decimalToHex(notification.chain_id);
-      const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-        `0x${chainId}` as keyof typeof CHAIN_IDS,
-      );
       return (
-        <NotificationDetailButton
+        <NotificationDetailBlockExplorerButton
           notification={notification}
-          variant={ButtonVariant.Secondary}
-          text={t('notificationItemCheckBlockExplorer') || ''}
-          href={
-            nativeBlockExplorerUrl
-              ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-              : '#'
-          }
+          chainId={notification.chain_id}
+          txHash={notification.tx_hash}
           id={notification.id}
         />
       );
diff --git a/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx b/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx
index 7abbdd4b53a3..aadd2694398c 100644
--- a/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx
+++ b/ui/pages/notifications/notification-components/swap-completed/swap-completed.tsx
@@ -10,7 +10,7 @@ import {
   NotificationDetailInfo,
   NotificationDetailAsset,
   NotificationDetailNetworkFee,
-  NotificationDetailButton,
+  NotificationDetailBlockExplorerButton,
   NotificationDetailTitle,
   NotificationDetailCopyButton,
   NotificationDetailAddress,
@@ -19,7 +19,6 @@ import { NotificationListItemIconType } from '../../../../components/multichain/
 import {
   BadgeWrapperPosition,
   IconName,
-  ButtonVariant,
 } from '../../../../components/component-library';
 
 import {
@@ -222,20 +221,11 @@ export const components: NotificationComponent<SwapCompletedNotification> = {
   footer: {
     type: 'footer_onchain_notification',
     ScanLink: ({ notification }) => {
-      const chainId = decimalToHex(notification.chain_id);
-      const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-        `0x${chainId}` as keyof typeof CHAIN_IDS,
-      );
       return (
-        <NotificationDetailButton
+        <NotificationDetailBlockExplorerButton
           notification={notification}
-          variant={ButtonVariant.Secondary}
-          text={t('notificationItemCheckBlockExplorer') || ''}
-          href={
-            nativeBlockExplorerUrl
-              ? `${nativeBlockExplorerUrl}//tx/${notification.tx_hash}`
-              : '#'
-          }
+          chainId={notification.chain_id}
+          txHash={notification.tx_hash}
           id={notification.id}
         />
       );
diff --git a/ui/pages/notifications/notification-components/types/notifications/notifications.ts b/ui/pages/notifications/notification-components/types/notifications/notifications.ts
index e586ecfd8dd9..b3b688309106 100644
--- a/ui/pages/notifications/notification-components/types/notifications/notifications.ts
+++ b/ui/pages/notifications/notification-components/types/notifications/notifications.ts
@@ -37,8 +37,7 @@ type FooterOnChainNotification<N = Notification> = {
 
 type FooterFeatureAnnouncement<N = Notification> = {
   type: 'footer_feature_announcement';
-  Link: NotificationFC<N>;
-  Action: NotificationFC<N>;
+  ExtensionLink: NotificationFC<N>;
 };
 
 /**

From 4fc4bdb5cfad7c1614d029f229ecc35b7ccafd20 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 12 Jun 2024 13:34:35 -0500
Subject: [PATCH 027/236] fix (cherry-pick): Remove old What's New messages
 (#25048) for 12.0.0 (#25157)

Removes old what's new items and prevents the What's New modal from displaying.
---
 app/_locales/de/messages.json                 |  75 ---------
 app/_locales/el/messages.json                 |  75 ---------
 app/_locales/en/messages.json                 |  75 ---------
 app/_locales/es/messages.json                 |  75 ---------
 app/_locales/es_419/messages.json             |  16 --
 app/_locales/fr/messages.json                 |  75 ---------
 app/_locales/hi/messages.json                 |  75 ---------
 app/_locales/id/messages.json                 |  75 ---------
 app/_locales/ja/messages.json                 |  75 ---------
 app/_locales/ko/messages.json                 |  75 ---------
 app/_locales/pt/messages.json                 |  75 ---------
 app/_locales/pt_BR/messages.json              |  16 --
 app/_locales/ru/messages.json                 |  75 ---------
 app/_locales/tl/messages.json                 |  75 ---------
 app/_locales/tr/messages.json                 |  75 ---------
 app/_locales/vi/messages.json                 |  75 ---------
 app/_locales/zh_CN/messages.json              |  75 ---------
 app/images/blockaid-whats-new-theme-dark.svg  |  82 ----------
 app/images/blockaid-whats-new.svg             |  82 ----------
 app/images/petnames-whatsnew-banner.svg       |  16 --
 .../simulations-whatsnew-banner-dark.svg      | 145 ------------------
 app/images/simulations-whatsnew-banner.svg    | 145 ------------------
 shared/notifications/index.ts                 | 137 -----------------
 .../app/whats-new-popup/whats-new-popup.js    |  47 +-----
 .../whats-new-popup/whats-new-popup.test.js   |   9 --
 ui/pages/home/home.container.js               |   7 +-
 ui/selectors/selectors.js                     |  23 +--
 27 files changed, 9 insertions(+), 1841 deletions(-)
 delete mode 100644 app/images/blockaid-whats-new-theme-dark.svg
 delete mode 100644 app/images/blockaid-whats-new.svg
 delete mode 100644 app/images/petnames-whatsnew-banner.svg
 delete mode 100644 app/images/simulations-whatsnew-banner-dark.svg
 delete mode 100644 app/images/simulations-whatsnew-banner.svg

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index a6d9509f2eaa..e82214fceddf 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3219,55 +3219,6 @@
   "notifications": {
     "message": "Benachrichtigungen"
   },
-  "notifications20ActionText": {
-    "message": "Mehr erfahren",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Falls Sie die neueste Version von Firefox nutzen, könnte ein Problem auftreten, das mit der Einstellung der U2F-Unterstützung seitens Firefox in Verbindung steht.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Nutzer von Ledger und Firefox haben Verbindungsprobleme.",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Verstanden"
-  },
-  "notifications24Description": {
-    "message": "Die Einstellungen für erweiterte Gasgebühren werden jetzt je nach dem von Ihnen verwendeten Netz gespeichert. Das bedeutet, dass Sie für jedes Netz spezifische erweiterte Gasgebühren festlegen und so vermeiden können, dass Sie zu viel für Gas bezahlen oder Transaktionen stecken bleiben."
-  },
-  "notifications24Title": {
-    "message": "Erweiterte Gas-Gebühr nach Netzwerk"
-  },
-  "notifications8ActionText": {
-    "message": "Zu den erweiterten Einstellungen gehen",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "Ab MetaMask v10.4.0 benötigen Sie kein Ledger Live mehr, um Ihr Ledger-Gerät mit MetaMask zu verbinden.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Für ein einfacheres und stabileres Ledger-Erlebnis gehen Sie zu Einstellungen > Erweitert und stellen Sie den „Bevorzugten Ledger-Verbindungstyp“ auf „WebHID“ um.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Verbesserung der Ledger-Verbindung",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Verstanden"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Vermeiden Sie bekannte Betrügereien und bewahren Sie gleichzeitig Ihre Privatsphäre mit Sicherheitsbenachrichtigungen von Blockaid. Diese Funktion ist auf Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon, Base und Sepolia verfügbar."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Führen Sie immer Ihre eigene Due-Diligence-Prüfung durch, bevor Sie Anfragen genehmigen."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Bleiben Sie sicher mit Sicherheitsbenachrichtigungen"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox unterstützt U2F nicht mehr, daher wird Ledger nicht mit MetaMask auf Firefox funktionieren. Probieren Sie stattdessen MetaMask auf Google Chrome aus.",
     "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."
@@ -3299,18 +3250,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Sie haben noch keine Benachrichtigungen empfangen."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Verstanden"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Wenn Sie während einer Transaktion auf eine Adresse klicken, sehen Sie vorgeschlagene Spitznamen von Drittquellen wie ENS, Lens und Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Auf diese Weise können Sie Adressen künftig einfacher identifizieren. Weisen Sie daher vertrauenswürdigen Adressen einen Spitznamen zu."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Vorgeschlagene Spitznamen finden Sie hier!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Etwas ist schiefgelaufen! Bitte versuchen Sie es erneut."
   },
@@ -3320,20 +3259,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Erfahren Sie, wie wir Ihre Privatsphäre bei der Nutzung dieser Funktion schützen."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Jetzt können Sie das mögliche Ergebnis Ihrer Transaktionen sehen, bevor Sie sie tätigen!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Dies ist nur eine Simulation, wir können also nicht für das Endergebnis garantieren. Sie können dies jederzeit unter Einstellungen > Sicherheit und Datenschutz ausschalten. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F und Ledger Live sind in Chrome nicht mehr verfügbar. Sie können Ledger-Geräte in Chrome weiterhin über WebHID verbinden.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Abkündigung von U2F und Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 07444377c33e..24d47016f8bb 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3219,55 +3219,6 @@
   "notifications": {
     "message": "Ειδοποιήσεις"
   },
-  "notifications20ActionText": {
-    "message": "Μάθετε περισσότερα",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Αν χρησιμοποιείτε την τελευταία έκδοση του Firefox, ίσως αντιμετωπίζετε ένα πρόβλημα που σχετίζεται με την κατάργηση της υποστήριξης U2F από τον Firefox.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Οι χρήστες του Ledger και του Firefox αντιμετωπίζουν προβλήματα σύνδεσης",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Κατάλαβα"
-  },
-  "notifications24Description": {
-    "message": "Οι προηγμένες ρυθμίσεις τελών συναλλαγών καταχωρούνται τώρα με βάση το δίκτυο που χρησιμοποιείτε. Αυτό σημαίνει ότι μπορείτε να ορίσετε συγκεκριμένα προηγμένα τέλη συναλλαγών για κάθε δίκτυο και να αποφύγετε την υπερπληρωμή για τα τέλη ή την καθυστέρηση των συναλλαγών."
-  },
-  "notifications24Title": {
-    "message": "Προηγμένα τέλη συναλλαγών ανά δίκτυο"
-  },
-  "notifications8ActionText": {
-    "message": "Μεταβείτε στις Ρυθμίσεις > Για Προχωρημένους",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "Από το MetaMask v10.4.0, δεν χρειάζεστε πλέον το Ledger Live για να συνδέσετε τη συσκευή Ledger με το MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Για μια ευκολότερη και πιο σταθερή εμπειρία με το Ledger, μεταβείτε στις Ρυθμίσεις > Για προχωρημένους και αλλάξτε τον \"Προτιμώμενο τύπο σύνδεσης στο Ledger\" σε \"WebHID\".",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Βελτίωση της σύνδεσης στο Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Κατανοητό"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Αποφύγετε τις γνωστές απάτες, προστατεύοντας παράλληλα το απόρρητό σας με τις ειδοποιήσεις ασφαλείας που παρέχονται από την Blockaid. Αυτή η λειτουργία είναι διαθέσιμη στα Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon, Base και Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Κάνετε πάντα τη δική σας ενδελεχή έρευνα προτού εγκρίνετε τα αιτήματα."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Μείνετε ασφαλείς με ειδοποιήσεις ασφαλείας"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Ο Firefox δεν υποστηρίζει πλέον το U2F, οπότε το Ledger δεν θα λειτουργεί με το MetaMask στον Firefox. Δοκιμάστε αντ' αυτού το MetaMask στο Google Chrome.",
     "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."
@@ -3299,18 +3250,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Δεν έχετε λάβει καμία ειδοποίηση ακόμα."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Κατανοητό"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Όταν κάνετε κλικ σε μια διεύθυνση κατά τη διάρκεια μιας συναλλαγής, μπορείτε να δείτε προτεινόμενα ψευδώνυμα από πηγές τρίτων, όπως τα ENS, Lens και Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Αυτό θα σας διευκολύνει να αναγνωρίζετε τις διευθύνσεις στο μέλλον, γι' αυτό φροντίστε να δίνετε ψευδώνυμο σε διευθύνσεις που εμπιστεύεστε."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Τα προτεινόμενα ψευδώνυμα είναι εδώ!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Κάτι πήγε στραβά. Προσπαθήστε ξανά."
   },
@@ -3320,20 +3259,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Μάθετε πώς προστατεύουμε το απόρρητό σας κατά τη χρήση αυτής της λειτουργίας."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Τώρα μπορείτε να δείτε τα πιθανά κέρδη των συναλλαγών σας πριν τις πραγματοποιήσετε!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Πρόκειται απλώς για μια προσομοίωση, οπότε δεν μπορούμε να εγγυηθούμε τα τελικά κέρδη. Μπορείτε να την απενεργοποιήσετε ανά πάσα στιγμή στις \nΡυθμίσεις > Ασφάλεια και προστασία προσωπικών δεδομένων. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "Το U2F και το Ledger Live δεν είναι πλέον διαθέσιμα στο Chrome. Μπορείτε ακόμα να συνδέσετε συσκευές Ledger στο Chrome χρησιμοποιώντας το Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Κατάργηση των U2F και Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 9b031453eaaf..f1373c3dbbad 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3256,55 +3256,6 @@
   "notifications": {
     "message": "Notifications"
   },
-  "notifications20ActionText": {
-    "message": "Learn more",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "If you're on the latest version of Firefox, you might be experiencing an issue related to Firefox dropping U2F support.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Ledger and Firefox Users Experiencing Connection Issues",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Got it"
-  },
-  "notifications24Description": {
-    "message": "Advanced gas fee settings are now remembered based on the network you're using. This means you can set specific advanced gas fees for each network and avoid overpaying for gas or stuck transactions."
-  },
-  "notifications24Title": {
-    "message": "Advanced gas fees by network"
-  },
-  "notifications8ActionText": {
-    "message": "Go to Settings > Advanced",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "As of MetaMask v10.4.0, you no longer need Ledger Live to connect your Ledger device to MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "For an easier and more stable ledger experience, go to Settings > Advanced and switch the 'Preferred Ledger Connection Type' to 'WebHID'.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Ledger connection improvement",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "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, Base and Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Always do your own due diligence before approving requests."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Stay safe with security alerts"
-  },
   "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."
@@ -3336,18 +3287,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "You have not received any notifications yet."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Got it"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "When you click on an address during a transaction, you can see suggested nicknames from third-party sources such as ENS, Lens, and Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "This will make it easier for you to recognize addresses in the future, so be sure to give a nickname to addresses you trust."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Suggested nicknames are here!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Something went wrong. Please try again."
   },
@@ -3357,20 +3296,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Learn how we protect your privacy while using this feature."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Now you can see the potential outcome of your transactions before you make them!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "This is just a simulation, so we can’t guarantee the final outcome. You can turn this off anytime in \nSettings > Security & Privacy. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F and Ledger Live are no longer available on Chrome. You can still connect Ledger devices on Chrome using Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "U2F and Ledger Live deprecation",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 new tokens found in this account",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 9a433fa6cec5..2be97677557d 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3216,55 +3216,6 @@
   "notifications": {
     "message": "Notificaciones"
   },
-  "notifications20ActionText": {
-    "message": "Más información",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Si tiene la última versión de Firefox, es posible que experimente un problema relacionado con la eliminación de la compatibilidad con U2F de Firefox.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Usuarios de Ledger y Firefox están experimentando problemas de conexión",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Entendido"
-  },
-  "notifications24Description": {
-    "message": "Las configuraciones avanzadas de tarifas de gas ahora se recuerdan según la red que esté utilizando. Esto significa que puede establecer tarifas de gas avanzadas específicas para cada red y evitar pagar de más por el gas o transacciones estancadas."
-  },
-  "notifications24Title": {
-    "message": "Tarifas avanzadas de gas por red"
-  },
-  "notifications8ActionText": {
-    "message": "Ir a Configuración > Avanzado",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "A partir de MetaMask v10.4.0, ya no necesita Ledger Live para conectar su dispositivo Ledger a MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Para una experiencia más fácil y estable, vaya a la pestaña de Configuración > Avanzado y cambie el 'Tipo de conexión a Ledger preferida' a 'WebHID'.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Mejora de la conexión de Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Entendido"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Manténgase alejado de estafas conocidas y al mismo tiempo preserve su privacidad con alertas de seguridad impulsadas por Blockaid. Esta función está disponible en Arbitrum, Avalanche, BNB Chain, la red principal de Ethereum, Linea, Optimism, Polygon, Base y Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Siempre asegúrese de hacer su propia diligencia debida antes de aprobar cualquier solicitud."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Manténgase seguro con alertas de seguridad"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox ya no es compatible con U2F, por lo que Ledger no funcionará con MetaMask en Firefox. En su lugar, pruebe MetaMask en Google Chrome.",
     "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."
@@ -3296,18 +3247,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Aún no ha recibido ninguna notificación."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Entendido"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Al hacer clic en una dirección durante una transacción, puede ver apodos sugeridos de fuentes de terceros como ENS, Lens y Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Esto le facilitará el reconocimiento de direcciones en el futuro, así que asegúrese de asignar un apodo a las direcciones en las que confíe."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "¡Los apodos sugeridos están aquí!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Se produjo un error. Vuelva a intentarlo."
   },
@@ -3317,20 +3256,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Obtenga más información sobre cómo protegemos su privacidad mientras utiliza esta función."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "¡Ahora puede ver el resultado potencial de sus transacciones antes de realizarlas!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Esto es solo una simulación, por lo que no podemos garantizar el resultado final. Puede desactivar esto en cualquier momento en \nConfiguración > Seguridad y privacidad. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F y Ledger Live ya no están disponibles en Chrome. Todavía puede conectar dispositivos Ledger en Chrome usando Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Desuso de U2F y Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 nuevos tokens encontrados en esta cuenta",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index f8aa4e49b646..b2f763ced384 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -1381,22 +1381,6 @@
   "notEnoughGas": {
     "message": "No hay gas suficiente"
   },
-  "notifications8ActionText": {
-    "message": "Ir a Configuración Avanzada",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "A partir de MetaMask v10.4.0, ya no necesita Ledger Live para conectar su dispositivo Ledger a MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Para una experiencia más fácil y estable, vaya a la pestaña de Configuración Avanzada y cambie el 'Tipo de Conexión de Ledger Preferida' a 'WebHID'.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Mejora de la conexión de Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
   "ofTextNofM": {
     "message": "de"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index bfc83939ea44..3534270713d3 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3219,55 +3219,6 @@
   "notifications": {
     "message": "Notifications"
   },
-  "notifications20ActionText": {
-    "message": "En savoir plus",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Si vous utilisez la dernière version de Firefox, il se peut que vous rencontriez un problème, car Firefox ne prend plus en charge la norme d’authentification U2F.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Les utilisateurs de Ledger et de Firefox rencontrent des problèmes de connexion",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "J’ai compris"
-  },
-  "notifications24Description": {
-    "message": "Les paramètres des frais de gaz avancés sont désormais ajustés en fonction du réseau que vous utilisez. Cela signifie que vous pouvez définir des frais de gaz avancés pour chaque réseau et éviter de payer trop cher pour le gaz ou le blocage des transactions."
-  },
-  "notifications24Title": {
-    "message": "Frais de gaz avancés pour chaque réseau"
-  },
-  "notifications8ActionText": {
-    "message": "Allez dans Paramètres > Avancés",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "Depuis MetaMask v10.4.0, vous n’avez plus besoin de Ledger Live pour connecter votre appareil Ledger à MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Pour améliorer votre expérience utilisateur, allez dans Paramètres > Avancés et changez le « Type de connexion préférée au Ledger » en « WebHID ».",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Amélioration de la connexion Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "D’accord"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Évitez les arnaques tout en protégeant votre vie privée grâce aux alertes de sécurité fournies par Blockaid. Cette fonctionnalité est disponible sur Arbitrum, Avalanche, BNB chain, Linea, Optimism, Polygon, Base, Sepolia et le réseau principal Ethereum."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Vous devez faire preuve de diligence raisonnable avant d’approuver toute demande."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Restez en sécurité grâce aux alertes de sécurité"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox ne prend plus en charge la norme d’authentification U2F, donc Ledger ne fonctionnera pas avec MetaMask sur Firefox. Essayez plutôt d’utiliser MetaMask sur Google Chrome.",
     "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."
@@ -3299,18 +3250,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Vous n’avez pas encore reçu de notifications."
   },
-  "notificationsPetnamesActionText": {
-    "message": "D’accord"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Si vous cliquez sur une adresse lors de l’exécution d’une transaction, vous pourrez voir les pseudonymes suggérés par des sources tierces telles que ENS, Lens et Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Cela vous permettra d’identifier plus facilement les adresses à l’avenir. Veillez donc à donner un pseudonyme aux adresses auxquelles vous faites confiance."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "La proposition de pseudonymes est enfin disponible !"
-  },
   "notificationsSettingsBoxError": {
     "message": "Un problème est survenu, veuillez réessayer."
   },
@@ -3320,20 +3259,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Découvrez comment nous protégeons vos données personnelles lorsque vous utilisez cette fonctionnalité."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Vous pouvez désormais connaître le résultat potentiel de vos transactions avant de les effectuer !"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Il s’agit d’une simple simulation, nous ne pouvons donc pas garantir le résultat final. Vous pouvez la désactiver à tout moment dans Paramètres > Sécurité et confidentialité. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F et Ledger Live ne sont plus disponibles sur Chrome. Vous pouvez toujours connecter des appareils Ledger sur Chrome à l’aide de Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Obsolescence de U2F et de Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 7862528c3aa7..6c2b08cac53b 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3216,55 +3216,6 @@
   "notifications": {
     "message": "सूचनाएं"
   },
-  "notifications20ActionText": {
-    "message": "और अधिक जानें",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "यदि आप फायरफॉक्स के लेटेस्ट वर्शन का इस्तेमाल कर रहे हैं, तो आप फायरफॉक्स से U2F सपोर्ट छोड़ने से संबंधित समस्या का अनुभव कर सकते हैं।",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Ledger और फायरफॉक्स यूज़र कनेक्शन संबंधी समस्याओं का सामना कर रहे हैं",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "समझ गए"
-  },
-  "notifications24Description": {
-    "message": "आपके द्वारा उपयोग किए जा रहे नेटवर्क के आधार पर एडवांस्ड गैस फीस सेटिंग्स अब याद रखी जाती हैं। इसका मतलब है कि आप हरेक नेटवर्क के लिए खास एडवांस्ड गैस फीस तय कर सकते हैं और गैस के लिए ज़्यादा पेमेंट करने से या ट्रांजेक्शन अटकने की समस्या से बच सकते हैं।"
-  },
-  "notifications24Title": {
-    "message": "नेटवर्क द्वारा एडवांस्ड गैस फीस"
-  },
-  "notifications8ActionText": {
-    "message": "सेटिंग्स पर जाएं > एडवांस्ड",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "MetaMask v10.4.0 के अनुसार, अब आपको अपने Ledger डिवाइस को MetaMask से कनेक्ट करने के लिए Ledger लाइव की आवश्यकता नहीं है।",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "एक आसान और अधिक स्थिर Ledger अनुभव के लिए, सेटिंग्स के एडवांस्ड टैब पर जाएं और 'पसंदीदा Ledger कनेक्शन प्रकार' को 'WebHID' पर स्विच करें।",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Ledger कनेक्शन में सुधार",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "समझ गए"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Blockaid द्वारा संचालित सुरक्षा एलर्ट के साथ अपनी गोपनीयता बनाए रखते हुए ज्ञात स्कैमों से दूर रहें। यह सुविधा Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism और Polygon, Base और Sepolia पर उपलब्ध है।"
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "किसी भी अनुरोध को एप्रूव करने से पहले हमेशा पूरी जांच-पड़ताल ज़रूर करें।"
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "सुरक्षा एलर्ट के साथ सुरक्षित रहें"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox अब U2F का सपोर्ट नहीं करता है, इसलिए Firefox पर MetaMask के साथ Ledger काम नहीं करेगा। इसके बजाय, Google Chrome पर MetaMask इस्तेमाल करके देखें।",
     "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."
@@ -3296,18 +3247,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "आपको अभी तक कोई नोटिफिकेशंस नहीं मिली है।"
   },
-  "notificationsPetnamesActionText": {
-    "message": "समझ गए"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "जब आप ट्रांसेक्शन के दौरान किसी एड्रेस पर क्लिक करते हैं, तो आप ENS, लेंस और Etherscan जैसे थर्ड पार्टी स्रोतों से सुझाए गए उपनाम देख सकते हैं।"
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "इससे भविष्य में आपके लिए एड्रेसों को पहचानना आसान हो जाएगा, इसलिए अपने भरोसेमंद एड्रेसों को एक उपनाम ज़रूर दें।"
-  },
-  "notificationsPetnamesTitle": {
-    "message": "सुझाए गए उपनाम यहाँ हैं!"
-  },
   "notificationsSettingsBoxError": {
     "message": "कुछ गलत हो गया। कृपया फिर से कोशिश करें"
   },
@@ -3317,20 +3256,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "जानें कि इस फीचर का उपयोग करते समय हम आपकी गोपनीयता की सुरक्षा कैसे करते हैं।"
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "अब आप अपने ट्रांसेक्शन करने से पहले उनका पोटेंशियल आउटकम देख सकते हैं!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "यह केवल एक सिमुलेशन है, इसलिए हम फाइनल आउटकम की गारंटी नहीं दे सकते। आप इसे Settings > Security & Privacy में जाकर किसी भी समय बंद कर सकते हैं। "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F और Ledger Live अब Chrome पर उपलब्ध नहीं हैं। आप अभी भी Webhid का उपयोग करके Chrome पर Ledger डिवाइस कनेक्ट कर सकते हैं।",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "U2F और Ledger Live को हटाना",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 c78f823a3482..6436b7e13c7b 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3219,55 +3219,6 @@
   "notifications": {
     "message": "Notifikasi"
   },
-  "notifications20ActionText": {
-    "message": "Pelajari selengkapnya",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Jika menggunakan Firefox versi terbaru, Anda dapat mengalami masalah terkait Firefox yang menghentikan dukungan U2F.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Pengguna Ledger dan Firefox Mengalami Masalah Koneksi",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Mengerti"
-  },
-  "notifications24Description": {
-    "message": "Pengaturan biaya gas lanjutan kini diingat berdasarkan jaringan yang Anda gunakan. Artinya, Anda dapat menetapkan biaya gas lanjutan yang spesifik untuk setiap jaringan dan menghindari kelebihan pembayaran untuk gas atau transaksi yang macet."
-  },
-  "notifications24Title": {
-    "message": "Biaya gas lanjutan berdasarkan jaringan"
-  },
-  "notifications8ActionText": {
-    "message": "Buka Pengaturan > Lanjutan",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "Pada MetaMask v10.4.0, Anda tidak lagi memerlukan Ledger Live untuk menghubungkan perangkat Ledger Anda ke MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Untuk pengalaman Ledger yang lebih mudah dan stabil, buka tab Pengaturan > Lanjutan dan alihkan 'Jenis Koneksi Ledger Pilihan' ke 'WebHID'.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Peningkatan koneksi Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Mengerti"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Hindari penipuan yang terdeteksi sambil tetap menjaga privasi dengan peringatan keamanan yang didukung oleh Blockaid. Fitur ini tersedia di Arbitrum, Avalanche, BNB chain, Mainnet Ethereum, Linea, Optimism, Polygon, Base, dan Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Selalu lakukan uji tuntas sendiri sebelum menyetujui permintaan."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Tetap aman bersama peringatan keamanan"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox tidak lagi mendukung U2F, sehingga Ledger tidak akan berfungsi dengan MetaMask di Firefox. Cobalah MetaMask di Google Chrome sebagai gantinya.",
     "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."
@@ -3299,18 +3250,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Anda belum menerima notifikasi."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Mengerti"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Saat mengklik alamat selama transaksi, Anda dapat melihat nama panggilan yang disarankan dari sumber pihak ketiga seperti ENS, Lens, dan Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Ini akan memudahkan Anda untuk mengenali alamat di kemudian hari, jadi pastikan untuk memberikan nama panggilan ke alamat yang Anda percayai."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Nama panggilan yang disarankan ada di sini!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Terjadi kesalahan. Coba lagi."
   },
@@ -3320,20 +3259,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Pelajari cara kami melindungi privasi Anda saat menggunakan fitur ini."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Kini Anda dapat melihat potensi hasil transaksi sebelum melakukannya!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Ini hanyalah simulasi, jadi kami tidak bisa menjamin hasil akhirnya. Anda dapat menonaktifkannya kapan saja di \nPengaturan > Keamanan & Privasi. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F dan Ledger Live tidak lagi tersedia di Chrome. Anda masih dapat menghubungkan perangkat Ledger di Chrome menggunakan Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Penghentian U2F dan Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 c4bd9a76e9d3..cf498721afe2 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3216,55 +3216,6 @@
   "notifications": {
     "message": "通知"
   },
-  "notifications20ActionText": {
-    "message": "詳細",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Firefoxの最新バージョンを使用している場合、FirefoxのU2Fサポート廃止に関連した問題が発生する可能性があります。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "LedgerとFirefoxのユーザーに発生している接続の問題について",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "了解"
-  },
-  "notifications24Description": {
-    "message": "使用中のネットワークに基づき高度なガス代設定が保存されるようになりました。これにより、ネットワークごとに高度なガス代設定を行い、ガス代の払い過ぎやトランザクション詰まりを防ぐことができます。"
-  },
-  "notifications24Title": {
-    "message": "ネットワークごとの高度なガス代設定"
-  },
-  "notifications8ActionText": {
-    "message": "「設定」>「高度な設定」に移動します",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "MetaMask v10.4.0以降では、LedgerデバイスのMetaMaskへの接続にLedger Liveが不要になりました。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Ledgerをより簡単かつ安定してご利用いただくには、「設定」の「高度な設定」タブに移動し、「優先Ledger接続タイプ」を「WebHID」に切り替えてください。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Ledgerの接続の改善",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "了解"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Blockaidのセキュリティアラートでプライバシーを守りつつ、既知の詐欺を回避しましょう。この機能はArbitrum、Avalanche、BNB chain、イーサリアムメインネット、Linea、Optimism、Polygon、Base、Sepoliaで利用できます。"
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "要求を承認する前に、必ず独自のデューデリジェンスを行ってください。"
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "セキュリティアラートで安全を確保"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "FirefoxはU2Fをサポートしなくなったため、LedgerはFirefox版の MetaMaskでは機能しません。代わりにGoogle Chrome版のMetaMaskをお試しください。",
     "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."
@@ -3296,18 +3247,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "まだ通知を受け取っていません。"
   },
-  "notificationsPetnamesActionText": {
-    "message": "了解"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "トランザクションの際にアドレスをクリックすると、ENS、Lens、Etherscanなどのサードパーティソースから提案されたニックネームを確認できます。"
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "これにより、今後そのアドレスを認識しやすくなるため、信頼するアドレスにはニックネームを付けるようにしましょう。"
-  },
-  "notificationsPetnamesTitle": {
-    "message": "ニックネームの提案が利用可能になりました！"
-  },
   "notificationsSettingsBoxError": {
     "message": "問題が発生しました。もう一度お試しください。"
   },
@@ -3317,20 +3256,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "この機能を使用する際に当社がどのようにユーザーのプライバシーを保護するのか、ご覧ください。"
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "トランザクションを実行する前に、予測される結果を確認できるようになりました！"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "これは単なるシミュレーションに過ぎないため、最終的な結果は保証できません。この機能は「設定」>「セキュリティとプライバシー」でいつでもオフにできます。"
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2FとLedger LiveはChromeで利用できなくなりました。引き続きWebHIDを使用してChromeでLedgerデバイスを接続することはできます。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "U2FとLedger Liveの非推奨化",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 9a6f5e4f1e57..fc4d896cf0e8 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3216,55 +3216,6 @@
   "notifications": {
     "message": "알림"
   },
-  "notifications20ActionText": {
-    "message": "자세히 알아보기",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Firefox 최신 버전을 사용하신다면 Firefox에서 U2F 지원 중단과 관련된 문제가 발생할 수 있습니다.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Ledger 및 Firefox 사용자의 연결 문제점 경험",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "확인"
-  },
-  "notifications24Description": {
-    "message": "이제 사용 중인 네트워크에 따라 고급 가스비 설정을 기억합니다. 즉, 각 네트워크에 대해 특정 고급 가스비를 설정하여 가스비가 과다하게 지출되거나 트랜잭션이 중단되는 것을 방지할 수 있습니다."
-  },
-  "notifications24Title": {
-    "message": "네트워크별 고급 가스비"
-  },
-  "notifications8ActionText": {
-    "message": "설정 > 고급으로 이동",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "MetaMask v10.4.0부터는 Ledger 장치를 MetaMask에 연결할 때 더 이상 Ledger Live를 사용하지 않아도 됩니다.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "더 쉽고 안정적인 Ledger 경험을 위해 설정의 고급 탭으로 이동하여 '선호하는 Ledger 연결 유형'을 'WebHID'로 전환하세요.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Ledger 연결 개선 사항",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "확인"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Blockaid에서 제공하는 보안 알림을 통해 개인 정보를 보호하고 알려진 사기를 피하세요. 이 기능은 Arbitrum, Avalanche, BNB Chain, 이더리움 메인넷, Linea, Optimism, Polygon, Base, Sepolia에서 사용할 수 있습니다."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "요청을 승인하기 전에 항상 직접 확인하세요."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "보안 경고로 안전성을 유지하세요"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox에서 더 이상 U2F를 지원하지 않아 Firefox를 이용한 MetaMask에서 Ledger를 이용할 수 없습니다. 대신 Google Chrome에서 MetaMask를 이용해 보세요.",
     "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."
@@ -3296,18 +3247,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "아직 알림을 받지 못했습니다."
   },
-  "notificationsPetnamesActionText": {
-    "message": "확인"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "트랜잭션 중 주소를 클릭하면 ENS, Lens, Etherscan과 같은 제3자에서 추천하는 닉네임을 볼 수 있습니다."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "이렇게 하면 나중에 주소를 더 쉽게 알아볼 수 있으므로 신뢰할 수 있는 주소에 닉네임을 지정하세요."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "추천 닉네임입니다!"
-  },
   "notificationsSettingsBoxError": {
     "message": "문제가 발생했습니다. 다시 시도해 주세요."
   },
@@ -3317,20 +3256,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "이 기능을 사용하는 동안 개인정보가 어떻게 보호되는지 알아보세요."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "이제 트랜잭션 전에 잠재적인 결과를 확인할 수 있습니다!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "이는 시뮬레이션일 뿐 최종 결과를 보장하지는 않습니다. 언제든 '설정 > 보호 및 보안'에서 이 기능을 끌 수 있습니다. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "Chrome에서 U2F와 Ledger Live를 더 이상 사용할 수 없습니다. Webhid를 사용하면 여전히 Chrome에서 Ledger 기기를 사용할 수 있습니다.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "U2F 및 Ledger Live 지원 중단",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 7c2cb8d46847..b973dd5d67cf 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3219,55 +3219,6 @@
   "notifications": {
     "message": "Notificações"
   },
-  "notifications20ActionText": {
-    "message": "Saiba mais",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Se você está usando a versão mais recente do Firefox, talvez esteja com um problema relacionado ao Firefox ter abandonado o suporte ao U2F.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Usuários do Ledger e Firefox com problemas de conexão",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Entendi"
-  },
-  "notifications24Description": {
-    "message": "As configurações de taxas de gás avançadas agora são lembradas com base na rede que você estiver usando. Isso significa que você pode definir taxas de gás avançadas específicas para cada rede e evitar pagar a mais por gás ou por transações travadas."
-  },
-  "notifications24Title": {
-    "message": "Taxas de gás avançadas por rede"
-  },
-  "notifications8ActionText": {
-    "message": "Ir para Configurações > Avançado",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "A partir da MetaMask v10.4.0, não é mais necessário o Ledger Live para conectar o seu dispositivo Ledger à MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Para ter uma experiência mais fácil e estável com o Ledger, vá até a aba Configurações > Avançado e alterne o \"Tipo de conexão preferencial com o Ledger\" para \"WebHID\".",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Melhoria na conexão com o Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Entendi"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Fique longe de golpes conhecidos enquanto protege sua privacidade com alertas de segurança fornecidos pela Blockaid. Esse recurso está disponível em Arbitrum, Avalanche, BNB Chain, Mainnet da Ethereum, Linea, Optimism, Polygon, Base e Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Sempre faça sua própria devida diligência antes de aprovar solicitações."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Fique protegido com os alertas de segurança"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "O Firefox não oferece mais suporte ao U2F, então a Ledger não funcionará com a MetaMask no Firefox. Em vez disso, experimente a MetaMask no Google Chrome.",
     "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."
@@ -3299,18 +3250,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Você ainda não recebeu nenhuma notificação."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Entendi"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Ao clicar em um endereço durante uma transação, você poderá ver os apelidos sugeridos de fontes terceirizadas como ENS, Lens e Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Isso facilitará o reconhecimento dos endereços posteriormente, então não deixe de dar um apelido aos endereços em que você confia."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Os apelidos sugeridos chegaram!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Ocorreu um erro. Tente novamente."
   },
@@ -3320,20 +3259,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Saiba como protegemos sua privacidade enquanto usa este recurso."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Agora você pode ver o resultado potencial de suas transações antes de fazê-las!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Isso é apenas uma simulação, então não podemos garantir o resultado. Você pode desativar isso a qualquer momento em Configurações > Segurança e Privacidade. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F e Ledger Live não estão mais disponíveis no Chrome. Você ainda pode conectar dispositivos Ledger no Chrome usando a Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Descontinuação da U2F e Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "$1 novos tokens encontrados nesta conta",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index b1325d0f3a60..cc4c97e70ff6 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -1381,22 +1381,6 @@
   "notEnoughGas": {
     "message": "Não há gás suficiente"
   },
-  "notifications8ActionText": {
-    "message": "Ir para Configurações Avançadas",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "A partir da MetaMask v10.4.0, não é mais necessário o Ledger Live para conectar o seu dispositivo Ledger à MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Para uma experiência mais fácil e estável com o ledger, vá até a aba Avançado das configurações e troque o \"Tipo de conexão preferencial com o Ledger\" para \"WebHID\".",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Melhoria na conexão com o Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
   "ofTextNofM": {
     "message": "de"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index fe34b9fb4074..871a49679471 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3219,55 +3219,6 @@
   "notifications": {
     "message": "Уведомления"
   },
-  "notifications20ActionText": {
-    "message": "Подробнее",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Если вы используете последнюю версию Firefox, у вас может возникнуть проблема, связанная с отказом Firefox от поддержки U2F.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Пользователи Ledger и Firefox испытывают проблемы с подключением",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Понятно"
-  },
-  "notifications24Description": {
-    "message": "Расширенные настройки платы за газ теперь запоминаются в зависимости от используемой вами сети. Это означает, что вы можете установить конкретную дополнительную плату за газ для каждой сети и избежать переплаты за газ или зависших транзакций."
-  },
-  "notifications24Title": {
-    "message": "Дополнительная плата за газ по сети"
-  },
-  "notifications8ActionText": {
-    "message": "Перейдите в «Настройки»> «Дополнительно».",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "Начиная с версии MetaMask 10.4.0, вам больше не требуется Ledger Live для подключения Ledger к MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Чтобы упростить и повысить стабильность работы с Ledger, перейдите на вкладку «Дополнительно» в настройках и смените «Предпочитаемый тип подключения с Ledger» на «WebHID».",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Улучшение связи с Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Понятно"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Держитесь подальше от известных мошенников, сохраняя при этом свою конфиденциальность с помощью предупреждений безопасности от Blockaid. Эта функция доступна в Arbitrum, Avalanche, BNB chain, Мейн-нете Ethereum, Linea, Optimism, Polygon, Base и Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Всегда проводите собственную комплексную проверку перед утверждением запросов."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Избегайте угроз с помощью оповещений безопасности"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox больше не поддерживает U2F, поэтому Ledger не будет работать с MetaMask в Firefox. Вместо этого попробуйте MetaMask в Google Chrome.",
     "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."
@@ -3299,18 +3250,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Вы еще не получили ни одного уведомления."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Понятно"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Когда вы нажимаете на адрес во время транзакции, вы можете увидеть предложенные псевдонимы из сторонних источников, таких как ENS, Lens и Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Это облегчит вам распознавание адресов в будущем, поэтому обязательно присваивайте псевдонимы адресам, которым вы доверяете."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Здесь содержатся рекомендованные псевдонимы!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Возникла проблема, повторите попытку позже."
   },
@@ -3320,20 +3259,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Узнайте, как мы защищаем вашу конфиденциальность при использовании этой функции."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Теперь вы можете увидеть потенциальный результат ваших транзакций еще до их совершения!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Это всего лишь симуляция, поэтому мы не можем гарантировать конечный результат. Вы можете отключить ее в любое время в\nразделе «Настройки» > «Безопасность и конфиденциальность». "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F и Ledger Live больше не доступны в Chrome. Вы по-прежнему можете подключать устройства Ledger к Chrome с помощью Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Прекращение поддержки U2F и Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 3cf94a3b2736..2b3de4abe1d0 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3216,55 +3216,6 @@
   "notifications": {
     "message": "Mga Abiso"
   },
-  "notifications20ActionText": {
-    "message": "Matuto pa",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Kung ikaw ay nasa pinakabagong bersyon ng Firefox, maaari kang makaranas ng isyu na nauugnay sa Firefox dropping U2F support.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Ang mga User ng Ledger at Firefox ay Nakakaranas ng Isyu sa Koneksyon",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Nakuha ko"
-  },
-  "notifications24Description": {
-    "message": "Ang setting sa paunang gas fee ay matatandaan ngayon ayon sa network na iyong ginagamit. Ibig sabihin maaari mong itakda ang ispesipikong paunang gas fee para sa bawat network at maiwasan ang pagbayad nang sobra para sa gas fee o naiwan na transaksyon."
-  },
-  "notifications24Title": {
-    "message": "Paunang gas fee ayon sa network"
-  },
-  "notifications8ActionText": {
-    "message": "Magpunta sa Mga Advanced Setting",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "Para sa MetaMask v10.4.0, hindi mo na kailangang ikonekta ang Ledger Live sa iyong Ledger device sa MetaMask.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Para sa mas madali at mas maayos na karanasan sa ledger, magpunta sa Advanced tab ng Mga Setting at ilipat sa 'WebHID' ang 'Napiling Uri ng Koneksyon ng Ledger'.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Pagpapabuti ng koneksyon ng ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Nakuha ko"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Iwasan ang mga kilalang scam habang pinananatili parin ang iyong privacy gamit ang mga alerto ng seguridad na pinapagana ng Blockaid. Ang tampok na ito ay available sa Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon, Base at Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Palaging gumawa ng sarili mong pagsusuri bago aprubahan ang mga kahilingan."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Manatiling ligtas gamit ang mga alerto sa seguridad"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Hindi na sinusuportahan ng Firefox ang U2F, kaya ang Ledger ay hindi gagana sa MetaMask sa Firefox. Subukan ang MetaMask sa Google Chrome.",
     "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."
@@ -3296,18 +3247,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Hindi ka pa nakatanggap ng anumang notipikasyon."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Nakuha ko"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Kapag pinindot mo ang isang address habang nasa isang transaksyon, maaari mong makita ang mga mungkahing palayaw mula sa mga third-party source tulad ng ENS, Lens, at Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Mapapadali nito na makilala mo ang mga address sa hinaharap, kaya tiyaking magbigay ng nickname sa mga address na pinagkakatiwalaan mo."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Narito na ang mga mungkahing palayaw!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Nagkaproblema. Pakisubukan muli."
   },
@@ -3317,20 +3256,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Matutunan kung paano namin protektahan ang iyong pagkapribado habang gamit ang tampok na ito."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Maaari mo na ngayong makita ang potensyal na resulta ng iyong mga transaksyon bago mo gawin ang mga iyon!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Ito ay isang simulasyon laman, kaya hindi namin matitiyak ang panghuling resulta. Maaari mo itong i-off anumang oras sa Mga Setting > Seguridad at Pagkapribado. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "Hindi na available ang U2F at Ledger Live sa Chrome. Maaari ka pa ring magkonekta ng mga Ledger device sa Chrome gamit ang Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Paghinto sa paggamit ng U2F at Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 d42faeb0fcf6..9d59ca5d1475 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3219,55 +3219,6 @@
   "notifications": {
     "message": "Bildirimler"
   },
-  "notifications20ActionText": {
-    "message": "Daha fazla bilgi",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Firefox'un en son sürümündeyseniz Firefox'un U2F desteğini bırakması ile ilgili sorun yaşıyor olabilirsiniz.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Bağlantı Sorunları Yaşayan Ledger ve Firefox Kullanıcıları",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Anladım"
-  },
-  "notifications24Description": {
-    "message": "Gelişmiş gaz ücreti ayarları, artık kullandığınız ağa göre hatırlanıyor. Başka bir deyişle her bir ağ için belirli gelişmiş gaz ücretleri belirleyebilir ve gaz veya sıkışmış işlemler için fazla ödeme yapmaktan kaçınabilirsiniz."
-  },
-  "notifications24Title": {
-    "message": "Ağa göre gelişmiş gaz ücretleri"
-  },
-  "notifications8ActionText": {
-    "message": "Ayarlar / Gelişmiş kısmına git",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "MetaMask 10.4.0 sürümü itibariyle Ledger cihazınızı MetaMask'e bağlamak için artık Ledger Live'e ihtiyacınız yok.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Daha kolay ve daha kararlı kayıt defteri deneyimi için Ayarlar > Gelişmiş sekmesine git ve \"Tercih Edilen Ledger Bağlantı Türü\" seçeneğini \"WebHID\" olarak değiştir.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Ledger bağlantı iyileştirmesi",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Anladım"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Bilinen dolandırıcılıklardan uzak dururken Blockaid tarafından desteklenen güvenlik uyarıları ile gizliliğinizi koruyun. Bu özellik Arbitrum, Avalanche, BNB chain, Ethereum Ana Ağı, Linea, Optimism, Polygon, Base ve Sepolia için sunulur."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Talepleri onaylamadan önce kendiniz her zaman gerekli özeni gösterin."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Güvenlik uyarıları ile güvende kalın"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox artık U2F'yi desteklemiyor, bu yüzden Ledger Firefox'ta Metamask ile çalışmayacaktır. Onun yerine MetaMask'i Google Chrome'da deneyin.",
     "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."
@@ -3299,18 +3250,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Henüz herhangi bir bildirim almadınız."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Anladım"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Bir işlem sırasında bir adrese tıkladığınızda, ENS, Lens ve Etherscan gibi üçüncü taraf kaynaklardan önerilen takma adları görebilirsiniz."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Bu, gelecekte adresleri tanımanızı kolaylaştırır, bu yüzden güvendiğiniz adreslere takma ad verdiğinizden emin olun."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "İşte önerilen takma adlar!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Bir şeyler ters gitti. Lütfen tekrar deneyin."
   },
@@ -3320,20 +3259,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Bu özelliği kullanırken gizliliğinizi nasıl koruduğumuzu öğrenin."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Artık gerçekleştirmeden önce işlemlerinizin potansiyel sonuçlarını görebilirsiniz!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Bu sadece bir simülasyondur, bu nedenle nihai sonucu garanti edemeyiz. Bunu dilediğiniz zaman şurada kapatabilirsiniz: \nAyarlar > Güvenlik ve Gizlilik. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F ve Ledger Live artık Chrome üzerinde mevcut değildir. Webhid'i kullanarak Chrome üzerinde Ledger cihazlarına bağlanmaya devam edebilirsiniz.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "U2F ve Ledger Live'in kullanımının sonlandırılması",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 4d433ab1c7b8..76f44543f897 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3216,55 +3216,6 @@
   "notifications": {
     "message": "Thông báo"
   },
-  "notifications20ActionText": {
-    "message": "Tìm hiểu thêm",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "Nếu đang sử dụng phiên bản Firefox mới nhất, bạn có thể gặp sự cố liên quan đến việc Firefox không còn hỗ trợ U2F.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Người dùng Ledger và Firefox gặp sự cố kết nối",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "Đã hiểu"
-  },
-  "notifications24Description": {
-    "message": "Cài đặt phí gas nâng cao hiện được ghi nhớ dựa trên mạng mà bạn đang sử dụng. Nghĩa là bạn có thể đặt các mức phí gas nâng cao cụ thể cho từng mạng và tránh phải trả quá nhiều tiền cho phí gas hoặc các giao dịch bị mắc kẹt."
-  },
-  "notifications24Title": {
-    "message": "Phí gas nâng cao theo mạng"
-  },
-  "notifications8ActionText": {
-    "message": "Đến Cài đặt > Nâng cao",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "Kể từ phiên bản MetaMask v10.4.0, bạn không cần phần mềm Ledger Live để kết nối thiết bị Ledger của mình với MetaMask nữa.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "Để có trải nghiệm sử dụng thiết bị Ledger dễ dàng và ổn định hơn, hãy đến Cài đặt > Nâng cao và chuyển \"Dạng kết nối Ledger ưu tiên\" thành \"WebHID\".",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Cải thiện kết nối Ledger",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "Đã hiểu"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "Tránh xa các hành vi gian lận đã biết trong khi vẫn bảo vệ quyền riêng tư của bạn với các cảnh báo bảo mật do Blockaid cung cấp. Tính năng này có sẵn trên Arbitrum, Avalanche, BNB chain, Ethereum Mainnet, Linea, Optimism, Polygon, Base và Sepolia."
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "Luôn tự thẩm định trước khi chấp thuận các yêu cầu."
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "Đảm bảo an toàn với cảnh báo bảo mật"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox không còn hỗ trợ U2F nên Ledger sẽ không hoạt động với MetaMask trên Firefox. Thay vào đó hãy dùng thử MetaMask trên Google Chrome.",
     "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."
@@ -3296,18 +3247,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "Bạn chưa nhận được bất kỳ thông báo nào."
   },
-  "notificationsPetnamesActionText": {
-    "message": "Đã hiểu"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "Khi bạn nhấn vào một địa chỉ trong quá trình giao dịch, bạn có thể nhìn thấy các biệt danh được đề xuất từ các nguồn bên thứ ba như ENS, Lens và Etherscan."
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "Điều này giúp bạn dễ nhận biết các địa chỉ hơn trong tương lai, vậy nên nhớ đặt biệt danh cho các địa chỉ mà bạn tin tưởng."
-  },
-  "notificationsPetnamesTitle": {
-    "message": "Đây là các biệt danh được đề xuất!"
-  },
   "notificationsSettingsBoxError": {
     "message": "Đã xảy ra lỗi. Vui lòng thử lại."
   },
@@ -3317,20 +3256,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "Tìm hiểu cách chúng tôi bảo vệ quyền riêng tư của bạn khi sử dụng tính năng này."
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "Bây giờ bạn có thể xem kết quả tiềm năng của các giao dịch trước khi thực hiện!"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "Đây chỉ là mô phỏng, vì vậy chúng tôi không thể đảm bảo kết quả cuối cùng. Bạn có thể tắt tính năng này bất cứ lúc nào trong phần \nCài đặt > Bảo mật & Quyền riêng tư. "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F và Ledger Live không còn khả dụng trên Chrome. Bạn vẫn có thể kết nối các thiết bị Ledger trên Chrome bằng cách sử dụng Webhid.",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "Ngừng sử dụng U2F và Ledger Live",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "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 87a5e2cdc6fd..8caa76780939 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3216,55 +3216,6 @@
   "notifications": {
     "message": "通知"
   },
-  "notifications20ActionText": {
-    "message": "了解更多",
-    "description": "The 'call to action' on the button, or link, of the 'Stay secure' notification. Upon clicking, users will be taken to a ledger page to resolve the U2F connection issue."
-  },
-  "notifications20Description": {
-    "message": "如果您使用的是最新版本的 Firefox，您可能会遇到 Firefox 放弃 U2F（通用第二因素）支持的相关问题。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F support being dropped by firefox and that it affects ledger users."
-  },
-  "notifications20Title": {
-    "message": "Ledger 和 Firefox 用户遇到连接问题",
-    "description": "Title for a notification in the 'See What's New' popup. Tells users that latest firefox users using U2F may experience connection issues."
-  },
-  "notifications24ActionText": {
-    "message": "知道了"
-  },
-  "notifications24Description": {
-    "message": "现在，会根据您使用的网络记住高级燃料费设置。这意味着您可以为每个网络设置特定的高级燃料费，以避免多付燃料费或交易被卡住。"
-  },
-  "notifications24Title": {
-    "message": "各网络的高级燃料费"
-  },
-  "notifications8ActionText": {
-    "message": "转到“设置 > 高级”",
-    "description": "Description on an action button that appears in the What's New popup. Tells the user that if they click it, they will go to our Advanced settings page."
-  },
-  "notifications8DescriptionOne": {
-    "message": "从 MetaMask v10.4.0 开始，您不再需要 Ledger Live 即可将您的 Ledger 设备连接到 MetaMask。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes changes for how Ledger Live is no longer needed to connect the device."
-  },
-  "notifications8DescriptionTwo": {
-    "message": "为了更轻松和更稳定的 ledger 体验，请转到设置中的“高级”选项卡，将“首选 Ledger 连接类型”切换为“WebHID”。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes how the user can turn off the Ledger Live setting."
-  },
-  "notifications8Title": {
-    "message": "Ledger 连接改进",
-    "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
-  },
-  "notificationsBlockaidDefaultDescriptionActionText": {
-    "message": "知道了"
-  },
-  "notificationsBlockaidDefaultDescriptionOne": {
-    "message": "通过 Blockaid 的安全提醒，您可避开已知欺诈，同时保护隐私。此功能适用于 Arbitrum、Avalanche、BNB Chain、以太坊主网、Linea、Optimism、Polygon、Base 和 Sepolia。"
-  },
-  "notificationsBlockaidDefaultDescriptionTwo": {
-    "message": "在批准请求之前，请务必自行作出审慎调查。"
-  },
-  "notificationsBlockaidDefaultTitle": {
-    "message": "使用安全提醒以确保安全"
-  },
   "notificationsDropLedgerFirefoxDescription": {
     "message": "Firefox 不再支持 U2F，因此在 Firefox 上，MetaMask 无法使用 Ledger。请尝试在 Google Chrome 上使用 MetaMask。",
     "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."
@@ -3296,18 +3247,6 @@
   "notificationsPageNoNotificationsContent": {
     "message": "您尚未收到任何通知。"
   },
-  "notificationsPetnamesActionText": {
-    "message": "知道了"
-  },
-  "notificationsPetnamesDescriptionOne": {
-    "message": "当您在交易过程中点击地址时，您可以看到来自第三方来源（如 ENS、Lens 和 Etherscan）建议的昵称。"
-  },
-  "notificationsPetnamesDescriptionTwo": {
-    "message": "这将使您将来更容易识别地址，因此请务必给您信任的地址添加昵称。"
-  },
-  "notificationsPetnamesTitle": {
-    "message": "建议的昵称在此！"
-  },
   "notificationsSettingsBoxError": {
     "message": "出错了。请重试。"
   },
@@ -3317,20 +3256,6 @@
   "notificationsSettingsPageAllowNotificationsLink": {
     "message": "了解我们如何在使用此功能时保护您的隐私。"
   },
-  "notificationsSimulationsDescriptionOne": {
-    "message": "现在，您可以在进行交易之前看到交易的潜在结果！"
-  },
-  "notificationsSimulationsDescriptionTwo": {
-    "message": "这只是一次模拟，所以我们不能保证最终的结果。您可以随时在“设置 >安全与隐私”中关闭它。 "
-  },
-  "notificationsU2FLedgerLiveDescription": {
-    "message": "U2F 和 Ledger Live 在 Chrome 上不再可用。您仍然可以使用 Webhid 在 Chrome 上连接 Ledger 设备。",
-    "description": "Description of a notification in the 'See What's New' popup. Describes the U2F and Ledger Live connection modes are now deprecated"
-  },
-  "notificationsU2FLedgerLiveTitle": {
-    "message": "U2F 和 Ledger Live 弃用",
-    "description": "Title for a notification in the 'See What's New' popup. Tells ledger and chrome users that U2F and Ledger Live options are now deprecated."
-  },
   "numberOfNewTokensDetectedPlural": {
     "message": "在此账户中找到$1枚新代币",
     "description": "$1 is the number of new tokens detected"
diff --git a/app/images/blockaid-whats-new-theme-dark.svg b/app/images/blockaid-whats-new-theme-dark.svg
deleted file mode 100644
index 8960d6f1d93f..000000000000
--- a/app/images/blockaid-whats-new-theme-dark.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<svg width="312" height="152" viewBox="0 0 312 152" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M47.3226 54.4875L47.3694 55.607C47.5231 55.242 47.5351 54.8417 47.3226 54.4875Z" fill="url(#paint0_linear_6861_7376)"/>
-<path d="M254.363 111.221C253.535 110.656 253.323 109.527 253.887 108.698C256.145 105.392 258.942 104.739 261.191 104.214C263.24 103.735 264.86 103.357 266.322 101.217C267.784 99.0769 267.547 97.431 267.247 95.3472C266.917 93.0621 266.508 90.2188 268.766 86.9122C271.024 83.6062 273.821 82.9528 276.07 82.429C278.12 81.9514 279.739 81.5724 281.2 79.4329C282.661 77.2935 282.425 75.6471 282.123 73.5637C281.794 71.2787 281.384 68.4356 283.641 65.1295C285.899 61.8234 288.696 61.17 290.945 60.6463C292.995 60.1686 294.615 59.7894 296.075 57.6502C296.64 56.8217 297.769 56.6096 298.598 57.1743C299.426 57.7392 299.638 58.8684 299.073 59.6969C296.816 63.003 294.018 63.6564 291.769 64.1801C289.719 64.6578 288.1 65.0367 286.639 67.1762C285.179 69.3157 285.415 70.9621 285.716 73.0455C286.045 75.3305 286.456 78.1736 284.198 81.4796C281.941 84.7857 279.143 85.4392 276.895 85.9629C274.844 86.4406 273.225 86.8197 271.765 88.9589C270.303 91.099 270.54 92.7449 270.84 94.8287C271.169 97.1137 271.579 99.9571 269.321 103.264C267.063 106.57 264.265 107.223 262.017 107.748C259.968 108.227 258.348 108.605 256.886 110.745C256.321 111.572 255.192 111.786 254.363 111.221Z" fill="#82FDB8"/>
-<path d="M260.689 74.2954C263.582 75.6711 259.505 62.6288 254.344 65.1325C249.182 67.6361 245.826 76.174 250.725 72.6463C254.868 69.663 256.069 72.0998 260.689 74.2954Z" fill="#86E29B"/>
-<mask id="path-4-inside-1_6861_7376" fill="white">
-<path d="M49.425 40.6982C49.425 39.3011 50.5577 38.1685 51.9548 38.1685H255.601C256.999 38.1685 258.131 39.3011 258.131 40.6982V61.7578C258.131 63.1549 256.999 64.2875 255.601 64.2875H51.9548C50.5577 64.2875 49.425 63.1549 49.425 61.7578V40.6982Z"/>
-</mask>
-<path d="M49.425 40.6982C49.425 39.3011 50.5577 38.1685 51.9548 38.1685H255.601C256.999 38.1685 258.131 39.3011 258.131 40.6982V61.7578C258.131 63.1549 256.999 64.2875 255.601 64.2875H51.9548C50.5577 64.2875 49.425 63.1549 49.425 61.7578V40.6982Z" fill="#FFD33D" fill-opacity="0.15"/>
-<path d="M49.425 38.1685H258.131H49.425ZM258.131 64.2875H49.425H258.131ZM51.9548 64.2875C49.1605 64.2875 46.8953 62.0223 46.8953 59.228V43.228C46.8953 40.4337 49.1605 38.1685 51.9548 38.1685C51.9548 38.1685 51.9548 39.3011 51.9548 40.6982V61.7578C51.9548 63.1549 51.9548 64.2875 51.9548 64.2875ZM258.131 38.1685V64.2875V38.1685Z" fill="#FFD33D" mask="url(#path-4-inside-1_6861_7376)"/>
-<path d="M64.6036 44.4929C61.1188 44.4929 58.2792 47.3326 58.2792 50.8173C58.2792 54.3021 61.1188 57.1418 64.6036 57.1418C68.0884 57.1418 70.928 54.3021 70.928 50.8173C70.928 47.3326 68.0884 44.4929 64.6036 44.4929ZM64.1293 48.2876C64.1293 48.0283 64.3443 47.8132 64.6036 47.8132C64.8629 47.8132 65.0779 48.0283 65.0779 48.2876V51.4498C65.0779 51.7091 64.8629 51.9241 64.6036 51.9241C64.3443 51.9241 64.1293 51.7091 64.1293 51.4498V48.2876ZM65.1855 53.5874C65.1538 53.6697 65.1096 53.7329 65.0526 53.7962C64.9894 53.8531 64.9198 53.8973 64.8439 53.929C64.768 53.9606 64.6858 53.9796 64.6036 53.9796C64.5214 53.9796 64.4392 53.9606 64.3633 53.929C64.2874 53.8973 64.2178 53.8531 64.1546 53.7962C64.0976 53.7329 64.0534 53.6697 64.0218 53.5874C63.9901 53.5116 63.9712 53.4293 63.9712 53.3471C63.9712 53.2649 63.9901 53.1827 64.0218 53.1068C64.0534 53.0309 64.0976 52.9613 64.1546 52.8981C64.2178 52.8412 64.2874 52.7969 64.3633 52.7653C64.5151 52.702 64.6921 52.702 64.8439 52.7653C64.9198 52.7969 64.9894 52.8412 65.0526 52.8981C65.1096 52.9613 65.1538 53.0309 65.1855 53.1068C65.2171 53.1827 65.236 53.2649 65.236 53.3471C65.236 53.4293 65.2171 53.5116 65.1855 53.5874Z" fill="#FFD33D"/>
-<path d="M79.5294 54.228V48.1768H77.4448V47.0435H82.8079V48.1768H80.7133V54.228H79.5294ZM84.7768 54.228H83.6637V46.6387H84.7768V49.8566C85.0939 49.3304 85.6066 49.0673 86.3149 49.0673C86.9018 49.0673 87.3707 49.2596 87.7215 49.6441C88.0723 50.0286 88.2477 50.5413 88.2477 51.1822V54.228H87.1346V51.3643C87.1346 50.9596 87.0401 50.6459 86.8512 50.4233C86.6623 50.1939 86.406 50.0792 86.0822 50.0792C85.6977 50.0792 85.384 50.2242 85.1411 50.5143C84.8982 50.8044 84.7768 51.2125 84.7768 51.7387V54.228ZM90.2285 48.0655C90.0261 48.0655 89.8507 47.9947 89.7023 47.853C89.5539 47.7046 89.4797 47.5258 89.4797 47.3167C89.4797 47.1143 89.5539 46.9423 89.7023 46.8006C89.8507 46.6522 90.0261 46.578 90.2285 46.578C90.4376 46.578 90.613 46.6522 90.7547 46.8006C90.8963 46.9423 90.9672 47.1143 90.9672 47.3167C90.9672 47.5258 90.8963 47.7046 90.7547 47.853C90.613 47.9947 90.4376 48.0655 90.2285 48.0655ZM89.6719 54.228V49.1685H90.785V54.228H89.6719ZM93.8897 54.3292C93.4242 54.3292 93.0127 54.2415 92.6552 54.0661C92.2976 53.884 92.0311 53.6141 91.8558 53.2566L92.6754 52.6697C92.7766 52.8856 92.9385 53.0576 93.1611 53.1858C93.3837 53.3072 93.6266 53.3679 93.8897 53.3679C94.0988 53.3679 94.2708 53.3207 94.4058 53.2262C94.5474 53.1318 94.6183 53.0002 94.6183 52.8316C94.6183 52.6832 94.5609 52.5618 94.4462 52.4673C94.3383 52.3729 94.1359 52.2784 93.8391 52.184L93.3939 52.0625C92.4966 51.8197 92.0548 51.3036 92.0683 50.5143C92.0683 50.0758 92.2403 49.725 92.5843 49.4619C92.9284 49.1988 93.3601 49.0673 93.8796 49.0673C94.6621 49.0673 95.2322 49.354 95.5897 49.9274L94.8206 50.5143C94.5643 50.1703 94.2439 49.9982 93.8593 49.9982C93.6772 49.9982 93.5187 50.0421 93.3837 50.1298C93.2488 50.2107 93.1814 50.3254 93.1814 50.4738C93.1814 50.6088 93.2252 50.7235 93.3129 50.8179C93.4006 50.9123 93.5591 50.9967 93.7885 51.0709L94.3046 51.2227C94.7768 51.3643 95.131 51.5566 95.3671 51.7994C95.6032 52.0356 95.7212 52.356 95.7212 52.7608C95.7212 53.2397 95.5492 53.6209 95.2052 53.9042C94.8611 54.1876 94.4226 54.3292 93.8897 54.3292ZM99.8139 48.0655C99.6116 48.0655 99.4362 47.9947 99.2877 47.853C99.1393 47.7046 99.0651 47.5258 99.0651 47.3167C99.0651 47.1143 99.1393 46.9423 99.2877 46.8006C99.4362 46.6522 99.6116 46.578 99.8139 46.578C100.023 46.578 100.198 46.6522 100.34 46.8006C100.482 46.9423 100.553 47.1143 100.553 47.3167C100.553 47.5258 100.482 47.7046 100.34 47.853C100.198 47.9947 100.023 48.0655 99.8139 48.0655ZM99.2574 54.228V49.1685H100.37V54.228H99.2574ZM103.475 54.3292C103.01 54.3292 102.598 54.2415 102.241 54.0661C101.883 53.884 101.617 53.6141 101.441 53.2566L102.261 52.6697C102.362 52.8856 102.524 53.0576 102.747 53.1858C102.969 53.3072 103.212 53.3679 103.475 53.3679C103.684 53.3679 103.856 53.3207 103.991 53.2262C104.133 53.1318 104.204 53.0002 104.204 52.8316C104.204 52.6832 104.146 52.5618 104.032 52.4673C103.924 52.3729 103.721 52.2784 103.425 52.184L102.979 52.0625C102.082 51.8197 101.64 51.3036 101.654 50.5143C101.654 50.0758 101.826 49.725 102.17 49.4619C102.514 49.1988 102.946 49.0673 103.465 49.0673C104.248 49.0673 104.818 49.354 105.175 49.9274L104.406 50.5143C104.15 50.1703 103.829 49.9982 103.445 49.9982C103.263 49.9982 103.104 50.0421 102.969 50.1298C102.834 50.2107 102.767 50.3254 102.767 50.4738C102.767 50.6088 102.811 50.7235 102.898 50.8179C102.986 50.9123 103.145 50.9967 103.374 51.0709L103.89 51.2227C104.362 51.3643 104.716 51.5566 104.953 51.7994C105.189 52.0356 105.307 52.356 105.307 52.7608C105.307 53.2397 105.135 53.6209 104.791 53.9042C104.447 54.1876 104.008 54.3292 103.475 54.3292ZM110.917 54.3292C110.229 54.3292 109.649 54.0729 109.177 53.5602C108.711 53.0475 108.479 52.4268 108.479 51.6983C108.479 50.9697 108.711 50.349 109.177 49.8363C109.649 49.3236 110.229 49.0673 110.917 49.0673C111.261 49.0673 111.578 49.1449 111.868 49.3C112.159 49.4484 112.381 49.6306 112.536 49.8465V49.1685H113.649V54.228H112.536V53.55C112.381 53.7659 112.159 53.9514 111.868 54.1066C111.578 54.255 111.261 54.3292 110.917 54.3292ZM110.037 52.8518C110.32 53.1622 110.681 53.3173 111.12 53.3173C111.558 53.3173 111.919 53.1622 112.202 52.8518C112.486 52.5415 112.627 52.157 112.627 51.6983C112.627 51.2395 112.486 50.855 112.202 50.5447C111.919 50.2344 111.558 50.0792 111.12 50.0792C110.681 50.0792 110.32 50.2344 110.037 50.5447C109.754 50.855 109.612 51.2395 109.612 51.6983C109.612 52.157 109.754 52.5415 110.037 52.8518ZM119.148 54.3292C118.682 54.3292 118.271 54.2415 117.913 54.0661C117.556 53.884 117.289 53.6141 117.114 53.2566L117.934 52.6697C118.035 52.8856 118.197 53.0576 118.419 53.1858C118.642 53.3072 118.885 53.3679 119.148 53.3679C119.357 53.3679 119.529 53.3207 119.664 53.2262C119.806 53.1318 119.876 53.0002 119.876 52.8316C119.876 52.6832 119.819 52.5618 119.704 52.4673C119.596 52.3729 119.394 52.2784 119.097 52.184L118.652 52.0625C117.755 51.8197 117.313 51.3036 117.326 50.5143C117.326 50.0758 117.498 49.725 117.843 49.4619C118.187 49.1988 118.618 49.0673 119.138 49.0673C119.92 49.0673 120.49 49.354 120.848 49.9274L120.079 50.5143C119.822 50.1703 119.502 49.9982 119.118 49.9982C118.935 49.9982 118.777 50.0421 118.642 50.1298C118.507 50.2107 118.44 50.3254 118.44 50.4738C118.44 50.6088 118.483 50.7235 118.571 50.8179C118.659 50.9123 118.817 50.9967 119.047 51.0709L119.563 51.2227C120.035 51.3643 120.389 51.5566 120.625 51.7994C120.861 52.0356 120.979 52.356 120.979 52.7608C120.979 53.2397 120.807 53.6209 120.463 53.9042C120.119 54.1876 119.681 54.3292 119.148 54.3292ZM123.945 54.3292C123.365 54.3292 122.906 54.137 122.569 53.7524C122.232 53.3612 122.063 52.8417 122.063 52.1941V49.1685H123.176V52.0119C123.176 52.4167 123.264 52.7371 123.439 52.9733C123.615 53.2026 123.864 53.3173 124.188 53.3173C124.566 53.3173 124.866 53.1756 125.089 52.8923C125.311 52.6022 125.423 52.1907 125.423 51.6578V49.1685H126.536V54.228H125.423V53.5399C125.126 54.0661 124.633 54.3292 123.945 54.3292ZM129.642 54.3292C129.177 54.3292 128.765 54.2415 128.408 54.0661C128.05 53.884 127.784 53.6141 127.609 53.2566L128.428 52.6697C128.529 52.8856 128.691 53.0576 128.914 53.1858C129.137 53.3072 129.379 53.3679 129.642 53.3679C129.852 53.3679 130.024 53.3207 130.159 53.2262C130.3 53.1318 130.371 53.0002 130.371 52.8316C130.371 52.6832 130.314 52.5618 130.199 52.4673C130.091 52.3729 129.889 52.2784 129.592 52.184L129.147 52.0625C128.249 51.8197 127.808 51.3036 127.821 50.5143C127.821 50.0758 127.993 49.725 128.337 49.4619C128.681 49.1988 129.113 49.0673 129.632 49.0673C130.415 49.0673 130.985 49.354 131.342 49.9274L130.573 50.5143C130.317 50.1703 129.997 49.9982 129.612 49.9982C129.43 49.9982 129.271 50.0421 129.137 50.1298C129.002 50.2107 128.934 50.3254 128.934 50.4738C128.934 50.6088 128.978 50.7235 129.066 50.8179C129.153 50.9123 129.312 50.9967 129.541 51.0709L130.057 51.2227C130.53 51.3643 130.884 51.5566 131.12 51.7994C131.356 52.0356 131.474 52.356 131.474 52.7608C131.474 53.2397 131.302 53.6209 130.958 53.9042C130.614 54.1876 130.175 54.3292 129.642 54.3292ZM133.742 56.3429H132.629V49.1685H133.742V49.8465C133.897 49.6306 134.12 49.4484 134.41 49.3C134.706 49.1449 135.027 49.0673 135.371 49.0673C136.059 49.0673 136.636 49.3236 137.101 49.8363C137.573 50.349 137.81 50.9697 137.81 51.6983C137.81 52.4268 137.573 53.0475 137.101 53.5602C136.636 54.0729 136.059 54.3292 135.371 54.3292C135.027 54.3292 134.706 54.255 134.41 54.1066C134.12 53.9514 133.897 53.7659 133.742 53.55V56.3429ZM135.169 53.3173C135.607 53.3173 135.968 53.1622 136.251 52.8518C136.535 52.5415 136.676 52.157 136.676 51.6983C136.676 51.2395 136.535 50.855 136.251 50.5447C135.968 50.2344 135.607 50.0792 135.169 50.0792C134.723 50.0792 134.359 50.2344 134.076 50.5447C133.792 50.855 133.651 51.2395 133.651 51.6983C133.651 52.157 133.792 52.5415 134.076 52.8518C134.359 53.1622 134.723 53.3173 135.169 53.3173ZM139.5 48.0655C139.297 48.0655 139.122 47.9947 138.974 47.853C138.825 47.7046 138.751 47.5258 138.751 47.3167C138.751 47.1143 138.825 46.9423 138.974 46.8006C139.122 46.6522 139.297 46.578 139.5 46.578C139.709 46.578 139.884 46.6522 140.026 46.8006C140.168 46.9423 140.238 47.1143 140.238 47.3167C140.238 47.5258 140.168 47.7046 140.026 47.853C139.884 47.9947 139.709 48.0655 139.5 48.0655ZM138.943 54.228V49.1685H140.056V54.228H138.943ZM143.859 54.3292C143.097 54.3292 142.459 54.0796 141.947 53.5804C141.441 53.0745 141.188 52.4471 141.188 51.6983C141.188 50.9494 141.441 50.3254 141.947 49.8262C142.459 49.3203 143.097 49.0673 143.859 49.0673C144.379 49.0673 144.844 49.1921 145.256 49.4417C145.674 49.6913 145.994 50.032 146.217 50.4637L145.245 50.9899C145.117 50.7201 144.932 50.5042 144.689 50.3423C144.446 50.1804 144.169 50.0994 143.859 50.0994C143.414 50.0994 143.046 50.2546 142.756 50.5649C142.466 50.8685 142.321 51.2463 142.321 51.6983C142.321 52.1502 142.466 52.5314 142.756 52.8417C143.046 53.1453 143.414 53.2971 143.859 53.2971C144.169 53.2971 144.446 53.2161 144.689 53.0542C144.932 52.8923 145.117 52.6764 145.245 52.4066L146.217 52.9328C145.994 53.3645 145.674 53.7052 145.256 53.9548C144.844 54.2044 144.379 54.3292 143.859 54.3292ZM147.791 48.0655C147.588 48.0655 147.413 47.9947 147.264 47.853C147.116 47.7046 147.042 47.5258 147.042 47.3167C147.042 47.1143 147.116 46.9423 147.264 46.8006C147.413 46.6522 147.588 46.578 147.791 46.578C148 46.578 148.175 46.6522 148.317 46.8006C148.459 46.9423 148.529 47.1143 148.529 47.3167C148.529 47.5258 148.459 47.7046 148.317 47.853C148.175 47.9947 148 48.0655 147.791 48.0655ZM147.234 54.228V49.1685H148.347V54.228H147.234ZM154.012 53.5703C153.506 54.0762 152.879 54.3292 152.13 54.3292C151.381 54.3292 150.75 54.0762 150.238 53.5703C149.732 53.0576 149.479 52.4336 149.479 51.6983C149.479 50.9629 149.732 50.3423 150.238 49.8363C150.75 49.3236 151.381 49.0673 152.13 49.0673C152.879 49.0673 153.506 49.3236 154.012 49.8363C154.525 50.3423 154.781 50.9629 154.781 51.6983C154.781 52.4336 154.525 53.0576 154.012 53.5703ZM152.13 53.2971C152.568 53.2971 152.929 53.1453 153.213 52.8417C153.503 52.5314 153.648 52.1502 153.648 51.6983C153.648 51.2463 153.503 50.8685 153.213 50.5649C152.929 50.2546 152.568 50.0994 152.13 50.0994C151.685 50.0994 151.317 50.2546 151.027 50.5649C150.744 50.8685 150.602 51.2463 150.602 51.6983C150.602 52.1502 150.744 52.5314 151.027 52.8417C151.317 53.1453 151.685 53.2971 152.13 53.2971ZM157.712 54.3292C157.132 54.3292 156.673 54.137 156.336 53.7524C155.998 53.3612 155.83 52.8417 155.83 52.1941V49.1685H156.943V52.0119C156.943 52.4167 157.031 52.7371 157.206 52.9733C157.381 53.2026 157.631 53.3173 157.955 53.3173C158.333 53.3173 158.633 53.1756 158.855 52.8923C159.078 52.6022 159.189 52.1907 159.189 51.6578V49.1685H160.302V54.228H159.189V53.5399C158.892 54.0661 158.4 54.3292 157.712 54.3292ZM163.409 54.3292C162.944 54.3292 162.532 54.2415 162.174 54.0661C161.817 53.884 161.55 53.6141 161.375 53.2566L162.195 52.6697C162.296 52.8856 162.458 53.0576 162.68 53.1858C162.903 53.3072 163.146 53.3679 163.409 53.3679C163.618 53.3679 163.79 53.3207 163.925 53.2262C164.067 53.1318 164.138 53.0002 164.138 52.8316C164.138 52.6832 164.08 52.5618 163.966 52.4673C163.858 52.3729 163.655 52.2784 163.358 52.184L162.913 52.0625C162.016 51.8197 161.574 51.3036 161.588 50.5143C161.588 50.0758 161.76 49.725 162.104 49.4619C162.448 49.1988 162.879 49.0673 163.399 49.0673C164.181 49.0673 164.751 49.354 165.109 49.9274L164.34 50.5143C164.084 50.1703 163.763 49.9982 163.379 49.9982C163.197 49.9982 163.038 50.0421 162.903 50.1298C162.768 50.2107 162.701 50.3254 162.701 50.4738C162.701 50.6088 162.745 50.7235 162.832 50.8179C162.92 50.9123 163.078 50.9967 163.308 51.0709L163.824 51.2227C164.296 51.3643 164.65 51.5566 164.886 51.7994C165.123 52.0356 165.241 52.356 165.241 52.7608C165.241 53.2397 165.069 53.6209 164.724 53.9042C164.38 54.1876 163.942 54.3292 163.409 54.3292ZM168.777 54.228V49.1685H169.89V50.0691C169.984 49.7857 170.156 49.5564 170.406 49.381C170.662 49.2056 170.935 49.1179 171.226 49.1179C171.401 49.1179 171.546 49.1314 171.661 49.1584V50.3018C171.499 50.2411 171.313 50.2107 171.104 50.2107C170.767 50.2107 170.48 50.349 170.244 50.6256C170.008 50.8955 169.89 51.2733 169.89 51.759V54.228H168.777ZM174.73 54.3292C173.961 54.3292 173.327 54.083 172.827 53.5905C172.335 53.0981 172.089 52.4673 172.089 51.6983C172.089 50.9494 172.338 50.3254 172.838 49.8262C173.337 49.3203 173.968 49.0673 174.73 49.0673C175.431 49.0673 176.012 49.2899 176.47 49.7352C176.936 50.1804 177.169 50.7943 177.169 51.5768C177.169 51.7117 177.165 51.8332 177.158 51.9411H173.182C173.209 52.3526 173.367 52.6866 173.657 52.9429C173.947 53.1925 174.308 53.3173 174.74 53.3173C175.388 53.3173 175.87 53.061 176.187 52.5483L177.037 53.1554C176.551 53.9379 175.782 54.3292 174.73 54.3292ZM173.232 51.1316H176.045C175.985 50.7808 175.826 50.5076 175.57 50.3119C175.32 50.1096 175.027 50.0084 174.689 50.0084C174.339 50.0084 174.025 50.1062 173.748 50.3018C173.478 50.4975 173.306 50.774 173.232 51.1316ZM183.119 56.3429H182.006V53.55C181.851 53.7659 181.628 53.9514 181.338 54.1066C181.048 54.255 180.731 54.3292 180.387 54.3292C179.699 54.3292 179.119 54.0729 178.647 53.5602C178.181 53.0475 177.948 52.4268 177.948 51.6983C177.948 50.9697 178.181 50.349 178.647 49.8363C179.119 49.3236 179.699 49.0673 180.387 49.0673C180.731 49.0673 181.048 49.1449 181.338 49.3C181.628 49.4484 181.851 49.6306 182.006 49.8465V49.1685H183.119V56.3429ZM179.507 52.8518C179.79 53.1622 180.151 53.3173 180.59 53.3173C181.028 53.3173 181.389 53.1622 181.672 52.8518C181.956 52.5415 182.097 52.157 182.097 51.6983C182.097 51.2395 181.956 50.855 181.672 50.5447C181.389 50.2344 181.028 50.0792 180.59 50.0792C180.151 50.0792 179.79 50.2344 179.507 50.5447C179.223 50.855 179.082 51.2395 179.082 51.6983C179.082 52.157 179.223 52.5415 179.507 52.8518ZM186.439 54.3292C185.858 54.3292 185.4 54.137 185.062 53.7524C184.725 53.3612 184.556 52.8417 184.556 52.1941V49.1685H185.67V52.0119C185.67 52.4167 185.757 52.7371 185.933 52.9733C186.108 53.2026 186.358 53.3173 186.681 53.3173C187.059 53.3173 187.359 53.1756 187.582 52.8923C187.805 52.6022 187.916 52.1907 187.916 51.6578V49.1685H189.029V54.228H187.916V53.5399C187.619 54.0661 187.127 54.3292 186.439 54.3292ZM192.814 54.3292C192.045 54.3292 191.411 54.083 190.911 53.5905C190.419 53.0981 190.173 52.4673 190.173 51.6983C190.173 50.9494 190.422 50.3254 190.921 49.8262C191.421 49.3203 192.051 49.0673 192.814 49.0673C193.515 49.0673 194.095 49.2899 194.554 49.7352C195.02 50.1804 195.252 50.7943 195.252 51.5768C195.252 51.7117 195.249 51.8332 195.242 51.9411H191.266C191.292 52.3526 191.451 52.6866 191.741 52.9429C192.031 53.1925 192.392 53.3173 192.824 53.3173C193.471 53.3173 193.954 53.061 194.271 52.5483L195.121 53.1554C194.635 53.9379 193.866 54.3292 192.814 54.3292ZM191.316 51.1316H194.129C194.068 50.7808 193.91 50.5076 193.654 50.3119C193.404 50.1096 193.111 50.0084 192.773 50.0084C192.422 50.0084 192.109 50.1062 191.832 50.3018C191.562 50.4975 191.39 50.774 191.316 51.1316ZM198.006 54.3292C197.54 54.3292 197.129 54.2415 196.771 54.0661C196.414 53.884 196.147 53.6141 195.972 53.2566L196.791 52.6697C196.893 52.8856 197.054 53.0576 197.277 53.1858C197.5 53.3072 197.743 53.3679 198.006 53.3679C198.215 53.3679 198.387 53.3207 198.522 53.2262C198.663 53.1318 198.734 53.0002 198.734 52.8316C198.734 52.6832 198.677 52.5618 198.562 52.4673C198.454 52.3729 198.252 52.2784 197.955 52.184L197.51 52.0625C196.613 51.8197 196.171 51.3036 196.184 50.5143C196.184 50.0758 196.356 49.725 196.7 49.4619C197.044 49.1988 197.476 49.0673 197.995 49.0673C198.778 49.0673 199.348 49.354 199.706 49.9274L198.937 50.5143C198.68 50.1703 198.36 49.9982 197.975 49.9982C197.793 49.9982 197.635 50.0421 197.5 50.1298C197.365 50.2107 197.297 50.3254 197.297 50.4738C197.297 50.6088 197.341 50.7235 197.429 50.8179C197.517 50.9123 197.675 50.9967 197.904 51.0709L198.42 51.2227C198.893 51.3643 199.247 51.5566 199.483 51.7994C199.719 52.0356 199.837 52.356 199.837 52.7608C199.837 53.2397 199.665 53.6209 199.321 53.9042C198.977 54.1876 198.539 54.3292 198.006 54.3292ZM203.118 54.2786C202.606 54.2786 202.187 54.137 201.864 53.8536C201.547 53.5635 201.388 53.1453 201.388 52.5989V50.1602H200.336V49.1685H201.388V47.7619H202.501V49.1685H203.948V50.1602H202.501V52.4167C202.501 52.727 202.569 52.9496 202.704 53.0846C202.838 53.2127 203.054 53.2768 203.351 53.2768C203.594 53.2768 203.793 53.2431 203.948 53.1756V54.1673C203.705 54.2415 203.429 54.2786 203.118 54.2786Z" fill="white"/>
-<mask id="path-8-inside-2_6861_7376" fill="white">
-<path d="M49.425 78.6448C49.425 77.2476 50.5577 76.115 51.9548 76.115H255.601C256.999 76.115 258.131 77.2476 258.131 78.6448V99.7043C258.131 101.101 256.999 102.234 255.601 102.234H51.9548C50.5577 102.234 49.425 101.101 49.425 99.7043V78.6448Z"/>
-</mask>
-<path d="M49.425 78.6448C49.425 77.2476 50.5577 76.115 51.9548 76.115H255.601C256.999 76.115 258.131 77.2476 258.131 78.6448V99.7043C258.131 101.101 256.999 102.234 255.601 102.234H51.9548C50.5577 102.234 49.425 101.101 49.425 99.7043V78.6448Z" fill="#FF5263" fill-opacity="0.15"/>
-<path d="M49.425 76.115H258.131H49.425ZM258.131 102.234H49.425H258.131ZM51.9548 102.234C49.1605 102.234 46.8953 99.9688 46.8953 97.1745V81.1745C46.8953 78.3802 49.1605 76.115 51.9548 76.115C51.9548 76.115 51.9548 77.2476 51.9548 78.6448V99.7043C51.9548 101.101 51.9548 102.234 51.9548 102.234ZM258.131 76.115V102.234V76.115Z" fill="#FF5263" mask="url(#path-8-inside-2_6861_7376)"/>
-<path d="M69.9249 90.512L66.4355 83.8313C65.9666 82.9324 65.3178 82.4395 64.6036 82.4395C63.8894 82.4395 63.2406 82.9324 62.7717 83.8313L59.2823 90.512C58.8407 91.3645 58.7916 92.1822 59.146 92.826C59.5004 93.4697 60.1983 93.8234 61.1142 93.8234H68.093C69.0089 93.8234 69.7068 93.4697 70.0612 92.826C70.4156 92.1822 70.3665 91.3587 69.9249 90.512ZM64.1947 86.4989C64.1947 86.2612 64.3801 86.064 64.6036 86.064C64.8271 86.064 65.0125 86.2612 65.0125 86.4989V89.3986C65.0125 89.6364 64.8271 89.8335 64.6036 89.8335C64.3801 89.8335 64.1947 89.6364 64.1947 89.3986V86.4989ZM64.9907 91.5501C64.9634 91.5733 64.9362 91.5965 64.9089 91.6197C64.8762 91.6429 64.8435 91.6603 64.8108 91.6719C64.7781 91.6893 64.7454 91.7009 64.7072 91.7067C64.6745 91.7125 64.6363 91.7183 64.6036 91.7183C64.5709 91.7183 64.5327 91.7125 64.4946 91.7067C64.4619 91.7009 64.4291 91.6893 64.3964 91.6719C64.3637 91.6603 64.331 91.6429 64.2983 91.6197C64.271 91.5965 64.2438 91.5733 64.2165 91.5501C64.1184 91.4399 64.0584 91.2891 64.0584 91.1384C64.0584 90.9876 64.1184 90.8368 64.2165 90.7266C64.2438 90.7034 64.271 90.6802 64.2983 90.657C64.331 90.6338 64.3637 90.6164 64.3964 90.6048C64.4291 90.5874 64.4619 90.5758 64.4946 90.57C64.5654 90.5526 64.6418 90.5526 64.7072 90.57C64.7454 90.5758 64.7781 90.5874 64.8108 90.6048C64.8435 90.6164 64.8762 90.6338 64.9089 90.657C64.9362 90.6802 64.9634 90.7034 64.9907 90.7266C65.0888 90.8368 65.1488 90.9876 65.1488 91.1384C65.1488 91.2891 65.0888 91.4399 64.9907 91.5501Z" fill="#FF5263"/>
-<path d="M79.5294 92.1746V86.1233H77.4448V84.99H82.8079V86.1233H80.7133V92.1746H79.5294ZM84.7768 92.1746H83.6637V84.5852H84.7768V87.8031C85.0939 87.2769 85.6066 87.0138 86.3149 87.0138C86.9018 87.0138 87.3707 87.2061 87.7215 87.5906C88.0723 87.9751 88.2477 88.4878 88.2477 89.1287V92.1746H87.1346V89.3109C87.1346 88.9061 87.0401 88.5924 86.8512 88.3698C86.6623 88.1404 86.406 88.0257 86.0822 88.0257C85.6977 88.0257 85.384 88.1708 85.1411 88.4609C84.8982 88.7509 84.7768 89.1591 84.7768 89.6853V92.1746ZM90.2285 86.012C90.0261 86.012 89.8507 85.9412 89.7023 85.7995C89.5539 85.6511 89.4797 85.4724 89.4797 85.2632C89.4797 85.0608 89.5539 84.8888 89.7023 84.7472C89.8507 84.5987 90.0261 84.5245 90.2285 84.5245C90.4376 84.5245 90.613 84.5987 90.7547 84.7472C90.8963 84.8888 90.9672 85.0608 90.9672 85.2632C90.9672 85.4724 90.8963 85.6511 90.7547 85.7995C90.613 85.9412 90.4376 86.012 90.2285 86.012ZM89.6719 92.1746V87.115H90.785V92.1746H89.6719ZM93.8897 92.2758C93.4242 92.2758 93.0127 92.1881 92.6552 92.0127C92.2976 91.8305 92.0311 91.5607 91.8558 91.2031L92.6754 90.6162C92.7766 90.8321 92.9385 91.0041 93.1611 91.1323C93.3837 91.2537 93.6266 91.3144 93.8897 91.3144C94.0988 91.3144 94.2708 91.2672 94.4058 91.1728C94.5474 91.0783 94.6183 90.9468 94.6183 90.7781C94.6183 90.6297 94.5609 90.5083 94.4462 90.4138C94.3383 90.3194 94.1359 90.2249 93.8391 90.1305L93.3939 90.0091C92.4966 89.7662 92.0548 89.2501 92.0683 88.4609C92.0683 88.0224 92.2403 87.6716 92.5843 87.4085C92.9284 87.1454 93.3601 87.0138 93.8796 87.0138C94.6621 87.0138 95.2322 87.3005 95.5897 87.8739L94.8206 88.4609C94.5643 88.1168 94.2439 87.9448 93.8593 87.9448C93.6772 87.9448 93.5187 87.9886 93.3837 88.0763C93.2488 88.1573 93.1814 88.272 93.1814 88.4204C93.1814 88.5553 93.2252 88.67 93.3129 88.7644C93.4006 88.8589 93.5591 88.9432 93.7885 89.0174L94.3046 89.1692C94.7768 89.3109 95.131 89.5031 95.3671 89.746C95.6032 89.9821 95.7212 90.3025 95.7212 90.7073C95.7212 91.1863 95.5492 91.5674 95.2052 91.8507C94.8611 92.1341 94.4226 92.2758 93.8897 92.2758ZM99.8139 86.012C99.6116 86.012 99.4362 85.9412 99.2877 85.7995C99.1393 85.6511 99.0651 85.4724 99.0651 85.2632C99.0651 85.0608 99.1393 84.8888 99.2877 84.7472C99.4362 84.5987 99.6116 84.5245 99.8139 84.5245C100.023 84.5245 100.198 84.5987 100.34 84.7472C100.482 84.8888 100.553 85.0608 100.553 85.2632C100.553 85.4724 100.482 85.6511 100.34 85.7995C100.198 85.9412 100.023 86.012 99.8139 86.012ZM99.2574 92.1746V87.115H100.37V92.1746H99.2574ZM103.475 92.2758C103.01 92.2758 102.598 92.1881 102.241 92.0127C101.883 91.8305 101.617 91.5607 101.441 91.2031L102.261 90.6162C102.362 90.8321 102.524 91.0041 102.747 91.1323C102.969 91.2537 103.212 91.3144 103.475 91.3144C103.684 91.3144 103.856 91.2672 103.991 91.1728C104.133 91.0783 104.204 90.9468 104.204 90.7781C104.204 90.6297 104.146 90.5083 104.032 90.4138C103.924 90.3194 103.721 90.2249 103.425 90.1305L102.979 90.0091C102.082 89.7662 101.64 89.2501 101.654 88.4609C101.654 88.0224 101.826 87.6716 102.17 87.4085C102.514 87.1454 102.946 87.0138 103.465 87.0138C104.248 87.0138 104.818 87.3005 105.175 87.8739L104.406 88.4609C104.15 88.1168 103.829 87.9448 103.445 87.9448C103.263 87.9448 103.104 87.9886 102.969 88.0763C102.834 88.1573 102.767 88.272 102.767 88.4204C102.767 88.5553 102.811 88.67 102.898 88.7644C102.986 88.8589 103.145 88.9432 103.374 89.0174L103.89 89.1692C104.362 89.3109 104.716 89.5031 104.953 89.746C105.189 89.9821 105.307 90.3025 105.307 90.7073C105.307 91.1863 105.135 91.5674 104.791 91.8507C104.447 92.1341 104.008 92.2758 103.475 92.2758ZM110.917 92.2758C110.229 92.2758 109.649 92.0194 109.177 91.5067C108.711 90.994 108.479 90.3734 108.479 89.6448C108.479 88.9162 108.711 88.2956 109.177 87.7829C109.649 87.2702 110.229 87.0138 110.917 87.0138C111.261 87.0138 111.578 87.0914 111.868 87.2466C112.159 87.395 112.381 87.5771 112.536 87.793V87.115H113.649V92.1746H112.536V91.4966C112.381 91.7125 112.159 91.898 111.868 92.0531C111.578 92.2015 111.261 92.2758 110.917 92.2758ZM110.037 90.7984C110.32 91.1087 110.681 91.2638 111.12 91.2638C111.558 91.2638 111.919 91.1087 112.202 90.7984C112.486 90.488 112.627 90.1035 112.627 89.6448C112.627 89.1861 112.486 88.8015 112.202 88.4912C111.919 88.1809 111.558 88.0257 111.12 88.0257C110.681 88.0257 110.32 88.1809 110.037 88.4912C109.754 88.8015 109.612 89.1861 109.612 89.6448C109.612 90.1035 109.754 90.488 110.037 90.7984ZM119.613 92.2758C118.925 92.2758 118.345 92.0194 117.873 91.5067C117.407 90.994 117.175 90.3734 117.175 89.6448C117.175 88.9162 117.407 88.2956 117.873 87.7829C118.345 87.2702 118.925 87.0138 119.613 87.0138C119.957 87.0138 120.274 87.0914 120.565 87.2466C120.855 87.395 121.077 87.5771 121.232 87.793V84.5852H122.346V92.1746H121.232V91.4966C121.077 91.7125 120.855 91.898 120.565 92.0531C120.274 92.2015 119.957 92.2758 119.613 92.2758ZM118.733 90.7984C119.016 91.1087 119.377 91.2638 119.816 91.2638C120.254 91.2638 120.615 91.1087 120.898 90.7984C121.182 90.488 121.323 90.1035 121.323 89.6448C121.323 89.1861 121.182 88.8015 120.898 88.4912C120.615 88.1809 120.254 88.0257 119.816 88.0257C119.377 88.0257 119.016 88.1809 118.733 88.4912C118.45 88.8015 118.308 89.1861 118.308 89.6448C118.308 90.1035 118.45 90.488 118.733 90.7984ZM126.14 92.2758C125.371 92.2758 124.737 92.0295 124.238 91.5371C123.746 91.0446 123.499 90.4138 123.499 89.6448C123.499 88.896 123.749 88.272 124.248 87.7728C124.747 87.2668 125.378 87.0138 126.14 87.0138C126.842 87.0138 127.422 87.2364 127.881 87.6817C128.346 88.1269 128.579 88.7408 128.579 89.5234C128.579 89.6583 128.576 89.7797 128.569 89.8876H124.592C124.619 90.2992 124.778 90.6331 125.068 90.8894C125.358 91.139 125.719 91.2638 126.151 91.2638C126.798 91.2638 127.28 91.0075 127.598 90.4948L128.448 91.1019C127.962 91.8845 127.193 92.2758 126.14 92.2758ZM124.643 89.0781H127.456C127.395 88.7273 127.237 88.4541 126.98 88.2585C126.731 88.0561 126.437 87.9549 126.1 87.9549C125.749 87.9549 125.435 88.0527 125.159 88.2484C124.889 88.444 124.717 88.7206 124.643 89.0781ZM132.031 92.2758C131.268 92.2758 130.631 92.0261 130.118 91.5269C129.612 91.021 129.359 90.3936 129.359 89.6448C129.359 88.896 129.612 88.272 130.118 87.7728C130.631 87.2668 131.268 87.0138 132.031 87.0138C132.55 87.0138 133.015 87.1386 133.427 87.3882C133.845 87.6378 134.166 87.9785 134.388 88.4103L133.417 88.9365C133.289 88.6666 133.103 88.4507 132.86 88.2888C132.617 88.1269 132.341 88.046 132.031 88.046C131.585 88.046 131.218 88.2011 130.928 88.5115C130.637 88.815 130.492 89.1928 130.492 89.6448C130.492 90.0968 130.637 90.4779 130.928 90.7882C131.218 91.0918 131.585 91.2436 132.031 91.2436C132.341 91.2436 132.617 91.1627 132.86 91.0007C133.103 90.8388 133.289 90.623 133.417 90.3531L134.388 90.8793C134.166 91.3111 133.845 91.6517 133.427 91.9013C133.015 92.1509 132.55 92.2758 132.031 92.2758ZM137.692 92.2758C136.923 92.2758 136.289 92.0295 135.79 91.5371C135.298 91.0446 135.051 90.4138 135.051 89.6448C135.051 88.896 135.301 88.272 135.8 87.7728C136.299 87.2668 136.93 87.0138 137.692 87.0138C138.394 87.0138 138.974 87.2364 139.433 87.6817C139.898 88.1269 140.131 88.7408 140.131 89.5234C140.131 89.6583 140.128 89.7797 140.121 89.8876H136.144C136.171 90.2992 136.33 90.6331 136.62 90.8894C136.91 91.139 137.271 91.2638 137.702 91.2638C138.35 91.2638 138.832 91.0075 139.15 90.4948L140 91.1019C139.514 91.8845 138.745 92.2758 137.692 92.2758ZM136.195 89.0781H139.008C138.947 88.7273 138.789 88.4541 138.532 88.2585C138.283 88.0561 137.989 87.9549 137.652 87.9549C137.301 87.9549 136.987 88.0527 136.711 88.2484C136.441 88.444 136.269 88.7206 136.195 89.0781ZM142.388 94.2894H141.275V87.115H142.388V87.793C142.544 87.5771 142.766 87.395 143.056 87.2466C143.353 87.0914 143.674 87.0138 144.018 87.0138C144.706 87.0138 145.282 87.2702 145.748 87.7829C146.22 88.2956 146.456 88.9162 146.456 89.6448C146.456 90.3734 146.22 90.994 145.748 91.5067C145.282 92.0194 144.706 92.2758 144.018 92.2758C143.674 92.2758 143.353 92.2015 143.056 92.0531C142.766 91.898 142.544 91.7125 142.388 91.4966V94.2894ZM143.815 91.2638C144.254 91.2638 144.615 91.1087 144.898 90.7984C145.181 90.488 145.323 90.1035 145.323 89.6448C145.323 89.1861 145.181 88.8015 144.898 88.4912C144.615 88.1809 144.254 88.0257 143.815 88.0257C143.37 88.0257 143.006 88.1809 142.722 88.4912C142.439 88.8015 142.297 89.1861 142.297 89.6448C142.297 90.1035 142.439 90.488 142.722 90.7984C143.006 91.1087 143.37 91.2638 143.815 91.2638ZM149.687 92.2252C149.174 92.2252 148.756 92.0835 148.432 91.8002C148.115 91.5101 147.957 91.0918 147.957 90.5454V88.1067H146.904V87.115H147.957V85.7085H149.07V87.115H150.517V88.1067H149.07V90.3632C149.07 90.6736 149.137 90.8962 149.272 91.0311C149.407 91.1593 149.623 91.2234 149.92 91.2234C150.162 91.2234 150.361 91.1896 150.517 91.1222V92.1138C150.274 92.1881 149.997 92.2252 149.687 92.2252ZM152.129 86.012C151.926 86.012 151.751 85.9412 151.603 85.7995C151.454 85.6511 151.38 85.4724 151.38 85.2632C151.38 85.0608 151.454 84.8888 151.603 84.7472C151.751 84.5987 151.926 84.5245 152.129 84.5245C152.338 84.5245 152.513 84.5987 152.655 84.7472C152.797 84.8888 152.868 85.0608 152.868 85.2632C152.868 85.4724 152.797 85.6511 152.655 85.7995C152.513 85.9412 152.338 86.012 152.129 86.012ZM151.572 92.1746V87.115H152.685V92.1746H151.572ZM155.76 92.1746L153.473 87.115H154.707L156.245 90.6668L157.794 87.115H159.038L156.741 92.1746H155.76ZM161.972 92.2758C161.203 92.2758 160.569 92.0295 160.07 91.5371C159.577 91.0446 159.331 90.4138 159.331 89.6448C159.331 88.896 159.581 88.272 160.08 87.7728C160.579 87.2668 161.21 87.0138 161.972 87.0138C162.674 87.0138 163.254 87.2364 163.713 87.6817C164.178 88.1269 164.411 88.7408 164.411 89.5234C164.411 89.6583 164.408 89.7797 164.401 89.8876H160.424C160.451 90.2992 160.61 90.6331 160.9 90.8894C161.19 91.139 161.551 91.2638 161.982 91.2638C162.63 91.2638 163.112 91.0075 163.429 90.4948L164.279 91.1019C163.794 91.8845 163.025 92.2758 161.972 92.2758ZM160.475 89.0781H163.288C163.227 88.7273 163.068 88.4541 162.812 88.2585C162.563 88.0561 162.269 87.9549 161.932 87.9549C161.581 87.9549 161.267 88.0527 160.991 88.2484C160.721 88.444 160.549 88.7206 160.475 89.0781ZM167.937 92.1746V87.115H169.05V88.0156C169.144 87.7323 169.316 87.5029 169.566 87.3275C169.822 87.1521 170.095 87.0644 170.386 87.0644C170.561 87.0644 170.706 87.0779 170.821 87.1049V88.2484C170.659 88.1876 170.473 88.1573 170.264 88.1573C169.927 88.1573 169.64 88.2956 169.404 88.5722C169.168 88.842 169.05 89.2198 169.05 89.7055V92.1746H167.937ZM173.89 92.2758C173.121 92.2758 172.487 92.0295 171.987 91.5371C171.495 91.0446 171.249 90.4138 171.249 89.6448C171.249 88.896 171.498 88.272 171.998 87.7728C172.497 87.2668 173.128 87.0138 173.89 87.0138C174.591 87.0138 175.172 87.2364 175.63 87.6817C176.096 88.1269 176.329 88.7408 176.329 89.5234C176.329 89.6583 176.325 89.7797 176.318 89.8876H172.342C172.369 90.2992 172.527 90.6331 172.817 90.8894C173.107 91.139 173.468 91.2638 173.9 91.2638C174.548 91.2638 175.03 91.0075 175.347 90.4948L176.197 91.1019C175.711 91.8845 174.942 92.2758 173.89 92.2758ZM172.392 89.0781H175.205C175.145 88.7273 174.986 88.4541 174.73 88.2585C174.48 88.0561 174.187 87.9549 173.849 87.9549C173.499 87.9549 173.185 88.0527 172.908 88.2484C172.638 88.444 172.466 88.7206 172.392 89.0781ZM182.279 94.2894H181.166V91.4966C181.011 91.7125 180.788 91.898 180.498 92.0531C180.208 92.2015 179.891 92.2758 179.547 92.2758C178.859 92.2758 178.279 92.0194 177.807 91.5067C177.341 90.994 177.109 90.3734 177.109 89.6448C177.109 88.9162 177.341 88.2956 177.807 87.7829C178.279 87.2702 178.859 87.0138 179.547 87.0138C179.891 87.0138 180.208 87.0914 180.498 87.2466C180.788 87.395 181.011 87.5771 181.166 87.793V87.115H182.279V94.2894ZM178.667 90.7984C178.95 91.1087 179.311 91.2638 179.75 91.2638C180.188 91.2638 180.549 91.1087 180.832 90.7984C181.116 90.488 181.257 90.1035 181.257 89.6448C181.257 89.1861 181.116 88.8015 180.832 88.4912C180.549 88.1809 180.188 88.0257 179.75 88.0257C179.311 88.0257 178.95 88.1809 178.667 88.4912C178.384 88.8015 178.242 89.1861 178.242 89.6448C178.242 90.1035 178.384 90.488 178.667 90.7984ZM185.599 92.2758C185.018 92.2758 184.56 92.0835 184.222 91.699C183.885 91.3077 183.717 90.7882 183.717 90.1406V87.115H184.83V89.9585C184.83 90.3632 184.917 90.6837 185.093 90.9198C185.268 91.1492 185.518 91.2638 185.842 91.2638C186.219 91.2638 186.519 91.1222 186.742 90.8388C186.965 90.5488 187.076 90.1373 187.076 89.6043V87.115H188.189V92.1746H187.076V91.4865C186.779 92.0127 186.287 92.2758 185.599 92.2758ZM191.974 92.2758C191.205 92.2758 190.571 92.0295 190.071 91.5371C189.579 91.0446 189.333 90.4138 189.333 89.6448C189.333 88.896 189.582 88.272 190.081 87.7728C190.581 87.2668 191.211 87.0138 191.974 87.0138C192.675 87.0138 193.256 87.2364 193.714 87.6817C194.18 88.1269 194.412 88.7408 194.412 89.5234C194.412 89.6583 194.409 89.7797 194.402 89.8876H190.426C190.453 90.2992 190.611 90.6331 190.901 90.8894C191.191 91.139 191.552 91.2638 191.984 91.2638C192.632 91.2638 193.114 91.0075 193.431 90.4948L194.281 91.1019C193.795 91.8845 193.026 92.2758 191.974 92.2758ZM190.476 89.0781H193.289C193.229 88.7273 193.07 88.4541 192.814 88.2585C192.564 88.0561 192.271 87.9549 191.933 87.9549C191.582 87.9549 191.269 88.0527 190.992 88.2484C190.722 88.444 190.55 88.7206 190.476 89.0781ZM197.166 92.2758C196.7 92.2758 196.289 92.1881 195.931 92.0127C195.574 91.8305 195.307 91.5607 195.132 91.2031L195.951 90.6162C196.053 90.8321 196.214 91.0041 196.437 91.1323C196.66 91.2537 196.903 91.3144 197.166 91.3144C197.375 91.3144 197.547 91.2672 197.682 91.1728C197.823 91.0783 197.894 90.9468 197.894 90.7781C197.894 90.6297 197.837 90.5083 197.722 90.4138C197.614 90.3194 197.412 90.2249 197.115 90.1305L196.67 90.0091C195.773 89.7662 195.331 89.2501 195.344 88.4609C195.344 88.0224 195.516 87.6716 195.86 87.4085C196.204 87.1454 196.636 87.0138 197.156 87.0138C197.938 87.0138 198.508 87.3005 198.866 87.8739L198.097 88.4609C197.84 88.1168 197.52 87.9448 197.135 87.9448C196.953 87.9448 196.795 87.9886 196.66 88.0763C196.525 88.1573 196.457 88.272 196.457 88.4204C196.457 88.5553 196.501 88.67 196.589 88.7644C196.677 88.8589 196.835 88.9432 197.064 89.0174L197.581 89.1692C198.053 89.3109 198.407 89.5031 198.643 89.746C198.879 89.9821 198.997 90.3025 198.997 90.7073C198.997 91.1863 198.825 91.5674 198.481 91.8507C198.137 92.1341 197.699 92.2758 197.166 92.2758ZM202.278 92.2252C201.766 92.2252 201.348 92.0835 201.024 91.8002C200.707 91.5101 200.548 91.0918 200.548 90.5454V88.1067H199.496V87.115H200.548V85.7085H201.661V87.115H203.108V88.1067H201.661V90.3632C201.661 90.6736 201.729 90.8962 201.864 91.0311C201.999 91.1593 202.214 91.2234 202.511 91.2234C202.754 91.2234 202.953 91.1896 203.108 91.1222V92.1138C202.865 92.1881 202.589 92.2252 202.278 92.2252Z" fill="white"/>
-<path d="M241.769 68.3709C242.705 67.9679 243.136 66.8828 242.733 65.9476C242.33 65.0124 241.245 64.5811 240.31 64.984C239.375 65.387 238.944 66.4718 239.347 67.407C239.75 68.3423 240.834 68.7738 241.769 68.3709Z" fill="url(#paint1_linear_6861_7376)"/>
-<path d="M241.276 110.045C240.977 110.045 240.682 109.978 240.408 109.841L224.471 101.891C223.743 101.528 223.299 100.745 223.351 99.9106C223.401 99.075 223.938 98.3579 224.706 98.0937L246.653 90.5451C247.388 90.2926 248.199 90.5009 248.732 91.0813C249.266 91.6631 249.423 92.5104 249.134 93.2522L243.127 108.75C242.921 109.279 242.512 109.698 241.996 109.902C241.764 109.998 241.52 110.045 241.276 110.045ZM230.615 100.391L240.217 105.183L243.838 95.8422L230.615 100.391Z" fill="url(#paint2_linear_6861_7376)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M225.228 0.067937C235.225 0.627712 245.117 4.81202 251.924 12.1546C258.252 18.9814 262.553 28.8491 260.774 37.8481C258.852 50.1203 253.237 61.7945 244.834 70.9444C243.838 72.0297 242.635 73.1554 241.162 73.1611C238.842 73.1706 237.463 70.2614 238.015 68.0067C238.489 66.0732 239.847 64.5324 241.179 63.0216C241.4 62.7712 241.62 62.5215 241.835 62.2711C246.148 57.2527 248.961 50.9605 249.826 44.3995C250.069 42.5509 249.536 39.9661 247.671 39.9965C246.134 40.0215 245.691 41.6588 245.236 43.3386C244.797 44.9605 244.347 46.622 242.892 46.9103C241.517 47.1835 240.293 45.765 240.173 44.3692C240.067 43.1328 240.543 41.9426 241.007 40.781C241.067 40.6312 241.127 40.4818 241.185 40.3329C243.032 35.6058 243.462 30.3677 242.556 25.3774C233.006 20.6251 222.142 18.484 211.513 19.4624C206.762 19.8992 202.088 20.9248 197.416 21.9499C192.002 23.138 186.591 24.3253 181.066 24.5943C179.774 24.6562 178.326 24.6154 177.541 23.4278C176.882 22.4305 177.005 21.1117 177.752 20.1791C179.288 18.2613 181.693 18.1858 183.927 18.1157L184.001 18.1134C194.183 17.7904 204.316 15.9646 213.97 12.7144C214.027 12.6962 214.085 12.6737 214.142 12.651C216.363 11.7532 215.648 8.40632 213.252 8.42295C209.792 8.44711 207.453 8.84542 202.916 10.2397C194.749 12.7898 192.872 10.0466 196.602 7.57187C205.191 2.42638 215.231 -0.490384 225.228 0.067937Z" fill="url(#paint3_linear_6861_7376)"/>
-<path d="M171.742 16.3118C170.57 16.3118 169.385 15.9994 168.314 15.346C165.213 13.4493 164.232 9.38418 166.129 6.28179C168.025 3.18093 172.091 2.20013 175.193 4.09683C178.294 5.99359 179.275 10.0587 177.378 13.1611C176.136 15.1906 173.965 16.3118 171.742 16.3118ZM171.761 4.96751C170.159 4.96751 168.593 5.77628 167.698 7.24001C166.331 9.47626 167.037 12.4096 169.275 13.7768C171.513 15.1438 174.445 14.4377 175.811 12.1999C177.179 9.96362 176.472 7.03023 174.235 5.66314C173.461 5.19235 172.605 4.96751 171.761 4.96751Z" fill="#FFB0EB"/>
-<path d="M272.165 28.0695C273.184 28.0695 274.009 27.2439 274.009 26.2255C274.009 25.2072 273.184 24.3816 272.165 24.3816C271.146 24.3816 270.321 25.2072 270.321 26.2255C270.321 27.2439 271.146 28.0695 272.165 28.0695Z" fill="url(#paint4_linear_6861_7376)"/>
-<path d="M211.637 26.6947C221.312 25.4634 222.674 30.0657 215.059 37.4822C207.445 44.8986 206.863 39.563 208.533 35.0603C210.203 30.5576 207.71 30.5123 204.296 31.3664C200.88 32.2205 201.461 29.2765 211.637 26.6947Z" fill="#75C4FD"/>
-<path d="M39.1251 53.4022C39.8676 53.4989 40.6189 53.2789 41.2982 52.9645C42.6187 52.3549 43.7666 51.379 44.5818 50.1761C46.8422 46.84 43.3789 44.8313 40.7581 47.2024C39.4571 48.3793 34.9908 52.8608 39.1251 53.4022Z" fill="url(#paint5_linear_6861_7376)"/>
-<path d="M101.208 128.879C94.1551 130.25 85.2191 122.539 92.7789 113.319C98.1613 106.727 98.3153 111.254 98.024 116.683C98.1523 120.083 98.6729 121.501 103.524 122.195C108.375 122.889 108.261 127.509 101.208 128.879Z" fill="url(#paint6_linear_6861_7376)"/>
-<path d="M18.0984 90.2282C16.5142 89.3592 14.4195 90.4786 12.9649 91.1395C12.7764 91.2256 12.0023 91.6253 11.7291 91.7144C10.745 92.0357 9.27698 92.8193 8.53006 93.7395C7.74236 95.2169 9.70704 96.4483 12.5652 96.4419C14.3 96.5191 16.2694 95.8614 17.6785 94.8665C18.4798 94.3011 19.221 93.5207 19.2526 92.4829C19.2798 91.5956 18.901 90.669 18.0984 90.2282Z" fill="url(#paint7_linear_6861_7376)"/>
-<path d="M40.2672 117.677C39.4207 117.677 38.5636 117.451 37.7895 116.978C35.5473 115.608 34.8396 112.668 36.2097 110.426C37.5798 108.184 40.5192 107.476 42.7615 108.846C43.848 109.51 44.61 110.557 44.9088 111.795C45.2075 113.032 45.0053 114.311 44.3414 115.398C43.4436 116.866 41.8742 117.677 40.2672 117.677ZM40.2808 109.477C39.1234 109.477 37.9917 110.061 37.3444 111.12C36.8661 111.903 36.7212 112.825 36.9355 113.717C37.1513 114.609 37.7005 115.365 38.4837 115.843C40.0997 116.832 42.2183 116.32 43.2067 114.704C43.685 113.921 43.8298 112.999 43.6155 112.107C43.3998 111.215 42.8505 110.459 42.0674 109.981C41.5091 109.64 40.8919 109.477 40.2808 109.477Z" fill="#FFD23D"/>
-<path d="M86.6857 111.835C87.7041 111.835 88.5297 111.01 88.5297 109.991C88.5297 108.973 87.7041 108.148 86.6857 108.148C85.6674 108.148 84.8418 108.973 84.8418 109.991C84.8418 111.01 85.6674 111.835 86.6857 111.835Z" fill="url(#paint8_linear_6861_7376)"/>
-<path d="M95.8128 149.449L98.0096 147.725C98.2692 147.519 98.4809 147.075 98.4809 146.735V143.337C98.4849 142.864 98.1414 142.343 97.722 142.176L95.8128 149.449ZM95.8128 149.449C95.4254 149.755 94.7903 149.755 94.4029 149.449M95.8128 149.449H94.4029M94.4029 149.449L92.2062 147.725M94.4029 149.449L92.2062 147.725M92.2062 147.725C91.9466 147.523 91.7349 147.075 91.7349 146.735M92.2062 147.725L91.7349 146.735M91.7349 143.337C91.7349 142.864 92.0784 142.343 92.5017 142.176L91.7349 143.337ZM91.7349 143.337V146.735M91.7349 143.337V146.735M95.4112 141.607L97.6046 142.469C97.6048 142.469 97.6051 142.469 97.6053 142.47C97.7416 142.524 97.8851 142.646 97.9957 142.815C98.1061 142.984 98.1661 143.172 98.1647 143.335L98.1647 143.335V143.337V146.735C98.1647 146.845 98.1282 146.995 98.0571 147.144C97.9858 147.294 97.8948 147.412 97.8138 147.476C97.8136 147.477 97.8135 147.477 97.8133 147.477L95.6176 149.2L95.6168 149.2C95.3443 149.416 94.8715 149.416 94.599 149.2L94.5981 149.2L92.4014 147.476L92.4014 147.476L92.3999 147.475C92.3211 147.414 92.2304 147.297 92.1588 147.146C92.0876 146.996 92.0511 146.846 92.0511 146.735V143.337C92.0511 143.173 92.1122 142.984 92.2234 142.816C92.335 142.647 92.4795 142.525 92.6179 142.47C92.618 142.47 92.6181 142.47 92.6182 142.47L94.8133 141.606C94.8799 141.581 94.9879 141.562 95.1119 141.562C95.2358 141.562 95.3438 141.581 95.4105 141.606C95.4107 141.606 95.4109 141.606 95.4112 141.607ZM95.8514 143.858L94.5747 145.198L94.3723 144.986C94.1319 144.733 93.7314 144.733 93.4909 144.986C93.2591 145.229 93.2588 145.622 93.4901 145.866C93.4904 145.866 93.4907 145.866 93.4909 145.867L94.1286 146.545L94.1286 146.545L94.13 146.546C94.2511 146.673 94.4104 146.737 94.5707 146.737C94.7309 146.737 94.8903 146.673 95.0114 146.546L96.7273 144.744C96.9657 144.5 96.9647 144.101 96.7328 143.858C96.4924 143.605 96.0919 143.605 95.8514 143.858Z" fill="#1098FC" stroke="#1098FC" stroke-width="0.632443"/>
-<path d="M104.86 148.053C103.972 148.053 103.259 147.636 102.97 147.082L103.54 146.657C103.836 147.112 104.268 147.393 104.875 147.393C105.429 147.393 105.869 147.097 105.869 146.588C105.869 146.156 105.604 145.867 105.095 145.678L104.382 145.404C103.532 145.093 103.16 144.653 103.16 143.917C103.16 143.036 103.881 142.482 104.845 142.482C105.52 142.482 106.082 142.786 106.416 143.219L105.9 143.674C105.627 143.348 105.293 143.143 104.83 143.143C104.298 143.143 103.858 143.439 103.858 143.886C103.858 144.342 104.124 144.547 104.67 144.752L105.323 145.002C106.12 145.306 106.575 145.761 106.575 146.558C106.575 147.469 105.854 148.053 104.86 148.053ZM109.342 148.038C108.158 148.038 107.376 147.18 107.376 146.065C107.376 144.949 108.188 144.091 109.35 144.091C110.336 144.091 111.156 144.782 111.156 145.996C111.156 146.065 111.156 146.11 111.148 146.194H108.037C108.059 146.899 108.598 147.438 109.35 147.438C109.934 147.438 110.298 147.18 110.533 146.778L111.05 147.135C110.708 147.689 110.131 148.038 109.342 148.038ZM108.082 145.662H110.488C110.389 145.04 109.904 144.668 109.327 144.668C108.758 144.668 108.204 145.032 108.082 145.662ZM113.933 148.038C112.779 148.038 111.944 147.165 111.944 146.065C111.944 144.964 112.779 144.091 113.933 144.091C114.722 144.091 115.352 144.501 115.686 145.108L115.117 145.427C114.904 144.994 114.479 144.699 113.933 144.699C113.143 144.699 112.604 145.306 112.604 146.065C112.604 146.824 113.143 147.431 113.933 147.431C114.479 147.431 114.904 147.135 115.117 146.702L115.686 147.021C115.352 147.628 114.722 148.038 113.933 148.038ZM118.033 148.038C117.206 148.038 116.636 147.438 116.636 146.497V144.167H117.289V146.399C117.289 147.036 117.623 147.438 118.147 147.438C118.731 147.438 119.202 146.922 119.202 146.049V144.167H119.854V147.962H119.202V147.378C118.951 147.825 118.519 148.038 118.033 148.038ZM121.243 147.962V144.167H121.895V144.903C122.04 144.418 122.525 144.129 122.958 144.129C123.056 144.129 123.155 144.137 123.254 144.16V144.835C123.132 144.782 123.026 144.774 122.897 144.774C122.419 144.774 121.895 145.192 121.895 146.08V147.962H121.243ZM124.514 143.15C124.248 143.15 124.043 142.953 124.043 142.687C124.043 142.437 124.248 142.224 124.514 142.224C124.78 142.224 124.969 142.437 124.969 142.687C124.969 142.953 124.78 143.15 124.514 143.15ZM124.18 147.962V144.167H124.833V147.962H124.18ZM127.7 148C127.033 148 126.539 147.628 126.539 146.839V144.767H125.735V144.167H126.539V143.112H127.192V144.167H128.285V144.767H127.192V146.755C127.192 147.241 127.404 147.4 127.822 147.4C127.981 147.4 128.163 147.378 128.285 147.324V147.909C128.125 147.962 127.936 148 127.7 148ZM130.286 149.548H129.557L130.385 147.765L128.723 144.167H129.444L130.749 147.051L132.047 144.167H132.775L130.286 149.548ZM136.967 148.038C135.904 148.038 135.107 147.15 135.107 146.065C135.107 144.979 135.904 144.091 136.967 144.091C137.544 144.091 138.052 144.387 138.303 144.752V144.167H138.955V147.962H138.303V147.378C138.052 147.742 137.544 148.038 136.967 148.038ZM137.065 147.438C137.824 147.438 138.356 146.831 138.356 146.065C138.356 145.298 137.824 144.691 137.065 144.691C136.299 144.691 135.768 145.298 135.768 146.065C135.768 146.831 136.299 147.438 137.065 147.438ZM141.905 148.038C140.843 148.038 140.046 147.15 140.046 146.065C140.046 144.979 140.843 144.091 141.905 144.091C142.482 144.091 142.991 144.387 143.241 144.752V142.27H143.894V147.962H143.241V147.378C142.991 147.742 142.482 148.038 141.905 148.038ZM142.004 147.438C142.763 147.438 143.294 146.831 143.294 146.065C143.294 145.298 142.763 144.691 142.004 144.691C141.237 144.691 140.706 145.298 140.706 146.065C140.706 146.831 141.237 147.438 142.004 147.438ZM146.464 147.962L144.711 144.167H145.44L146.738 147.044L148.035 144.167H148.764L147.011 147.962H146.464ZM149.915 143.15C149.65 143.15 149.445 142.953 149.445 142.687C149.445 142.437 149.65 142.224 149.915 142.224C150.181 142.224 150.371 142.437 150.371 142.687C150.371 142.953 150.181 143.15 149.915 143.15ZM149.582 147.962V144.167H150.234V147.962H149.582ZM153.322 148.038C152.168 148.038 151.334 147.165 151.334 146.065C151.334 144.964 152.168 144.091 153.322 144.091C154.111 144.091 154.741 144.501 155.075 145.108L154.506 145.427C154.293 144.994 153.868 144.699 153.322 144.699C152.533 144.699 151.994 145.306 151.994 146.065C151.994 146.824 152.533 147.431 153.322 147.431C153.868 147.431 154.293 147.135 154.506 146.702L155.075 147.021C154.741 147.628 154.111 148.038 153.322 148.038ZM157.749 148.038C156.565 148.038 155.783 147.18 155.783 146.065C155.783 144.949 156.595 144.091 157.756 144.091C158.743 144.091 159.562 144.782 159.562 145.996C159.562 146.065 159.562 146.11 159.555 146.194H156.443C156.466 146.899 157.005 147.438 157.756 147.438C158.34 147.438 158.705 147.18 158.94 146.778L159.456 147.135C159.115 147.689 158.538 148.038 157.749 148.038ZM156.489 145.662H158.895C158.796 145.04 158.31 144.668 157.733 144.668C157.164 144.668 156.61 145.032 156.489 145.662ZM164.624 148.038C164.047 148.038 163.539 147.742 163.288 147.378V147.962H162.636V142.27H163.288V144.752C163.539 144.387 164.047 144.091 164.624 144.091C165.686 144.091 166.483 144.979 166.483 146.065C166.483 147.15 165.686 148.038 164.624 148.038ZM164.525 147.438C165.284 147.438 165.815 146.831 165.815 146.065C165.815 145.298 165.284 144.691 164.525 144.691C163.766 144.691 163.235 145.298 163.235 146.065C163.235 146.831 163.766 147.438 164.525 147.438ZM168.509 149.548H167.781L168.608 147.765L166.946 144.167H167.667L168.972 147.051L170.27 144.167H170.999L168.509 149.548Z" fill="#D6D9DC"/>
-<path d="M173.725 147.962V142.573H175.494C176.495 142.573 177.103 143.241 177.103 144C177.103 144.539 176.867 144.888 176.526 145.101C177.049 145.29 177.459 145.67 177.459 146.391C177.459 147.286 176.746 147.962 175.653 147.962H173.725ZM174.431 147.324H175.683C176.412 147.324 176.769 146.953 176.769 146.414C176.769 145.89 176.412 145.495 175.691 145.495H174.431V147.324ZM174.431 144.888H175.494C176.07 144.888 176.412 144.539 176.412 144.053C176.412 143.598 176.07 143.211 175.494 143.211H174.431V144.888ZM178.55 147.962V142.27H179.203V147.962H178.55ZM182.283 148.038C181.13 148.038 180.295 147.157 180.295 146.065C180.295 144.972 181.13 144.091 182.283 144.091C183.422 144.091 184.264 144.972 184.264 146.065C184.264 147.157 183.422 148.038 182.283 148.038ZM182.283 147.431C183.073 147.431 183.596 146.824 183.596 146.065C183.596 145.306 183.073 144.699 182.283 144.699C181.494 144.699 180.963 145.306 180.963 146.065C180.963 146.824 181.494 147.431 182.283 147.431ZM187.051 148.038C185.898 148.038 185.063 147.165 185.063 146.065C185.063 144.964 185.898 144.091 187.051 144.091C187.841 144.091 188.471 144.501 188.805 145.108L188.235 145.427C188.023 144.994 187.598 144.699 187.051 144.699C186.262 144.699 185.723 145.306 185.723 146.065C185.723 146.824 186.262 147.431 187.051 147.431C187.598 147.431 188.023 147.135 188.235 146.702L188.805 147.021C188.471 147.628 187.841 148.038 187.051 148.038ZM192.518 147.962L190.461 146.065V147.962H189.808V142.27H190.461V145.647L192.115 144.167H192.981L191.114 145.844L193.398 147.962H192.518ZM195.376 148.038C194.314 148.038 193.517 147.15 193.517 146.065C193.517 144.979 194.314 144.091 195.376 144.091C195.953 144.091 196.462 144.387 196.712 144.752V144.167H197.365V147.962H196.712V147.378C196.462 147.742 195.953 148.038 195.376 148.038ZM195.475 147.438C196.234 147.438 196.765 146.831 196.765 146.065C196.765 145.298 196.234 144.691 195.475 144.691C194.709 144.691 194.177 145.298 194.177 146.065C194.177 146.831 194.709 147.438 195.475 147.438ZM199.085 143.15C198.82 143.15 198.615 142.953 198.615 142.687C198.615 142.437 198.82 142.224 199.085 142.224C199.351 142.224 199.541 142.437 199.541 142.687C199.541 142.953 199.351 143.15 199.085 143.15ZM198.751 147.962V144.167H199.404V147.962H198.751ZM202.363 148.038C201.3 148.038 200.504 147.15 200.504 146.065C200.504 144.979 201.3 144.091 202.363 144.091C202.94 144.091 203.448 144.387 203.699 144.752V142.27H204.351V147.962H203.699V147.378C203.448 147.742 202.94 148.038 202.363 148.038ZM202.462 147.438C203.22 147.438 203.752 146.831 203.752 146.065C203.752 145.298 203.22 144.691 202.462 144.691C201.695 144.691 201.164 145.298 201.164 146.065C201.164 146.831 201.695 147.438 202.462 147.438Z" fill="#1098FC"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.425 75.5399C49.1559 74.5375 48.9312 73.5193 48.7488 72.4937L49.425 80.673V75.5399ZM51.145 101.476L51.8195 109.635C53.584 111.517 55.7802 113.033 58.0268 114.252C60.6792 115.689 63.5474 116.939 66.3563 118.039C69.1637 119.139 72.3028 120.146 75.3644 119.75C78.0285 119.405 80.7551 117.603 79.8244 114.605C79.0023 112.352 76.6106 110.59 72.7187 108.524C71.8404 108.059 71.612 106.899 72.2807 106.161C72.2852 106.155 72.293 106.148 72.2975 106.143C72.8847 105.495 73.9654 105.221 74.8501 105.076C77.0884 104.711 79.3274 104.913 81.5603 105.115C84.0129 105.336 86.4583 105.557 88.8875 105.025C90.0994 104.76 91.3002 104.432 92.5016 104.103C94.5544 103.542 96.6088 102.981 98.7221 102.734C99.8198 102.605 101.299 102.442 102.266 103.104C103.282 103.8 103.289 105.363 102.936 106.442C102.811 106.82 102.413 107.802 101.999 108.821C101.511 110.024 101.003 111.277 100.9 111.646C100.272 113.896 100.628 116.501 102.981 117.59C105.502 118.754 108.054 117.074 110.114 115.719C110.154 115.693 110.193 115.667 110.233 115.641C112.775 113.964 114.996 111.9 116.951 109.578C118.297 107.977 119.534 106.3 120.567 104.505L120.345 101.823H52.5872C52.0677 101.823 51.5774 101.698 51.145 101.476Z" fill="url(#paint9_linear_6861_7376)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M49.425 50.5422C43.2948 57.2579 37.0181 63.8981 29.6421 69.1967C28.4892 70.0246 27.2337 70.8474 25.8171 70.9378C24.3998 71.0283 22.8199 70.1005 22.7067 68.685C22.623 67.6291 23.2387 66.8117 23.8555 65.9928C24.4833 65.1594 25.1122 64.3244 25.0063 63.2347C24.7698 60.7991 21.2148 58.8272 18.9709 58.7165C14.6036 58.5018 9.3417 62.9355 5.57718 66.1075C4.90473 66.6741 4.28006 67.2005 3.7168 67.6529C2.09471 68.9551 0.388065 70.5526 0.285483 72.629C0.0481016 77.4043 3.06791 76.4398 5.95988 75.5161C9.0061 74.5431 11.9105 73.6155 10.7169 79.4891C10.0966 82.54 12.6344 85.5833 15.6468 86.3745C18.6566 87.165 21.8757 86.1721 24.5838 84.6403C26.0405 83.8173 27.4009 82.8415 28.7617 81.8654C29.9326 81.0256 31.1038 80.1855 32.3369 79.4423C34.03 78.4209 36.4636 77.6885 37.7766 79.1659C39.3716 80.9601 37.5413 83.6202 36.1759 85.594C33.4911 89.4753 32.6102 94.5513 33.8295 99.11C34.2456 100.665 34.9534 102.244 36.4807 102.986C37.2485 103.359 38.1522 103.407 38.9086 103.01C40.4581 102.197 40.4417 100.257 40.0116 98.716C39.328 94.7126 42.3896 94.9106 42.4845 96.7092C42.907 104.593 48.6786 110.059 56.4109 111.892L55.5866 101.823H52.5872C50.8408 101.823 49.425 100.408 49.425 98.6611V50.5422Z" fill="url(#paint10_linear_6861_7376)"/>
-<defs>
-<linearGradient id="paint0_linear_6861_7376" x1="56.8739" y1="55.0466" x2="8.26696" y2="55.0466" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint1_linear_6861_7376" x1="239.346" y1="67.4072" x2="242.733" y2="65.9478" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint2_linear_6861_7376" x1="223.346" y1="100.244" x2="249.277" y2="100.244" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint3_linear_6861_7376" x1="238.05" y1="44.1699" x2="261.178" y2="44.1699" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint4_linear_6861_7376" x1="270.322" y1="26.2254" x2="274.009" y2="26.2254" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint5_linear_6861_7376" x1="72.1178" y1="20.2799" x2="21.602" y2="69.2044" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint6_linear_6861_7376" x1="125.541" y1="119.542" x2="102.63" y2="119.542" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint7_linear_6861_7376" x1="19.2545" y1="93.1798" x2="8.35551" y2="93.1798" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint8_linear_6861_7376" x1="84.8422" y1="109.991" x2="88.5298" y2="109.991" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint9_linear_6861_7376" x1="50.8078" y1="97.3897" x2="119.505" y2="91.7099" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint10_linear_6861_7376" x1="47.4681" y1="80.2297" x2="-6.62396" y2="80.2297" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/app/images/blockaid-whats-new.svg b/app/images/blockaid-whats-new.svg
deleted file mode 100644
index 723431869fc3..000000000000
--- a/app/images/blockaid-whats-new.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<svg width="472" height="230" viewBox="0 0 472 230" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M71.8424 82.3037L71.9131 83.9946C72.1452 83.4434 72.1634 82.8387 71.8424 82.3037Z" fill="url(#paint0_linear_6657_17714)"/>
-<path d="M384.579 167.999C383.327 167.146 383.007 165.44 383.859 164.189C387.27 159.196 391.495 158.208 394.892 157.415C397.987 156.692 400.434 156.121 402.643 152.889C404.851 149.656 404.492 147.17 404.039 144.022C403.541 140.571 402.922 136.276 406.334 131.281C409.744 126.287 413.97 125.3 417.367 124.509C420.463 123.788 422.909 123.215 425.116 119.984C427.322 116.752 426.965 114.265 426.51 111.118C426.013 107.667 425.393 103.372 428.803 98.3783C432.213 93.3845 436.439 92.3975 439.835 91.6063C442.932 90.8848 445.378 90.3121 447.584 87.0808C448.438 85.8294 450.143 85.509 451.395 86.3619C452.646 87.2152 452.967 88.9209 452.113 90.1723C448.703 95.1662 444.477 96.1532 441.081 96.9443C437.984 97.6658 435.538 98.2381 433.332 101.47C431.125 104.702 431.482 107.188 431.937 110.335C432.435 113.787 433.055 118.082 429.644 123.075C426.234 128.069 422.009 129.056 418.612 129.847C415.515 130.569 413.069 131.141 410.863 134.373C408.655 137.605 409.014 140.091 409.467 143.239C409.964 146.691 410.583 150.986 407.171 155.98C403.761 160.974 399.536 161.961 396.14 162.754C393.044 163.478 390.597 164.048 388.388 167.281C387.535 168.53 385.83 168.853 384.579 167.999Z" fill="#82FDB8"/>
-<path d="M394.134 112.224C398.504 114.302 392.346 94.6012 384.549 98.3831C376.752 102.165 371.682 115.061 379.083 109.733C385.341 105.226 387.155 108.907 394.134 112.224Z" fill="#86E29B"/>
-<mask id="path-4-inside-1_6657_17714" fill="white">
-<path d="M75.018 62.059C75.018 59.9486 76.7288 58.2378 78.8392 58.2378H386.449C388.559 58.2378 390.27 59.9486 390.27 62.059V92.7015C390.27 94.8119 388.559 96.5227 386.449 96.5227H78.8392C76.7288 96.5227 75.018 94.8119 75.018 92.7015V62.059Z"/>
-</mask>
-<path d="M75.018 62.059C75.018 59.9486 76.7288 58.2378 78.8392 58.2378H386.449C388.559 58.2378 390.27 59.9486 390.27 62.059V92.7015C390.27 94.8119 388.559 96.5227 386.449 96.5227H78.8392C76.7288 96.5227 75.018 94.8119 75.018 92.7015V62.059Z" fill="#FFD33D" fill-opacity="0.1"/>
-<path d="M75.018 58.2378H390.27H75.018ZM390.27 96.5227H75.018H390.27ZM78.8392 96.5227C74.6184 96.5227 71.1968 93.1011 71.1968 88.8803V65.8803C71.1968 61.6594 74.6184 58.2378 78.8392 58.2378C78.8392 58.2378 78.8392 59.9486 78.8392 62.059V92.7015C78.8392 94.8119 78.8392 96.5227 78.8392 96.5227ZM390.27 58.2378V96.5227V58.2378Z" fill="#F66A0A" mask="url(#path-4-inside-1_6657_17714)"/>
-<path d="M97.9454 67.7908C92.6817 67.7908 88.3923 72.0801 88.3923 77.3439C88.3923 82.6076 92.6817 86.8969 97.9454 86.8969C103.209 86.8969 107.499 82.6076 107.499 77.3439C107.499 72.0801 103.209 67.7908 97.9454 67.7908ZM97.2289 73.5226C97.2289 73.1309 97.5537 72.8061 97.9454 72.8061C98.3371 72.8061 98.6619 73.1309 98.6619 73.5226V78.2992C98.6619 78.6908 98.3371 79.0156 97.9454 79.0156C97.5537 79.0156 97.2289 78.6908 97.2289 78.2992V73.5226ZM98.8243 81.5281C98.7765 81.6523 98.7097 81.7478 98.6237 81.8434C98.5282 81.9293 98.4231 81.9962 98.3084 82.044C98.1938 82.0917 98.0696 82.1204 97.9454 82.1204C97.8212 82.1204 97.697 82.0917 97.5824 82.044C97.4678 81.9962 97.3627 81.9293 97.2672 81.8434C97.1812 81.7478 97.1143 81.6523 97.0665 81.5281C97.0188 81.4135 96.9901 81.2893 96.9901 81.1651C96.9901 81.0409 97.0188 80.9167 97.0665 80.8021C97.1143 80.6874 97.1812 80.5824 97.2672 80.4868C97.3627 80.4008 97.4678 80.334 97.5824 80.2862C97.8117 80.1907 98.0792 80.1907 98.3084 80.2862C98.4231 80.334 98.5282 80.4008 98.6237 80.4868C98.7097 80.5824 98.7765 80.6874 98.8243 80.8021C98.8721 80.9167 98.9007 81.0409 98.9007 81.1651C98.9007 81.2893 98.8721 81.4135 98.8243 81.5281Z" fill="#BF5208"/>
-<path d="M120.491 82.8801V73.7397H117.342V72.0278H125.443V73.7397H122.279V82.8801H120.491ZM128.417 82.8801H126.736V71.4164H128.417V76.277C128.896 75.4822 129.67 75.0848 130.74 75.0848C131.627 75.0848 132.335 75.3752 132.865 75.9561C133.395 76.5369 133.66 77.3113 133.66 78.2794V82.8801H131.978V78.5545C131.978 77.9431 131.836 77.4693 131.55 77.133C131.265 76.7865 130.878 76.6133 130.389 76.6133C129.808 76.6133 129.334 76.8324 128.967 77.2706C128.6 77.7087 128.417 78.3252 128.417 79.12V82.8801ZM136.652 73.5716C136.346 73.5716 136.081 73.4646 135.857 73.2506C135.633 73.0264 135.521 72.7564 135.521 72.4405C135.521 72.1348 135.633 71.875 135.857 71.661C136.081 71.4368 136.346 71.3247 136.652 71.3247C136.968 71.3247 137.233 71.4368 137.447 71.661C137.661 71.875 137.768 72.1348 137.768 72.4405C137.768 72.7564 137.661 73.0264 137.447 73.2506C137.233 73.4646 136.968 73.5716 136.652 73.5716ZM135.811 82.8801V75.2377H137.492V82.8801H135.811ZM142.182 83.033C141.479 83.033 140.857 82.9005 140.317 82.6356C139.777 82.3604 139.375 81.9528 139.11 81.4128L140.348 80.5262C140.501 80.8523 140.745 81.1122 141.082 81.3058C141.418 81.4892 141.785 81.5809 142.182 81.5809C142.498 81.5809 142.758 81.5096 142.962 81.3669C143.176 81.2243 143.283 81.0256 143.283 80.7708C143.283 80.5466 143.196 80.3632 143.023 80.2205C142.86 80.0779 142.554 79.9352 142.106 79.7926L141.433 79.6092C140.078 79.2423 139.41 78.4628 139.431 77.2706C139.431 76.6082 139.691 76.0783 140.21 75.6809C140.73 75.2835 141.382 75.0848 142.167 75.0848C143.349 75.0848 144.21 75.5179 144.75 76.384L143.588 77.2706C143.201 76.7509 142.717 76.491 142.136 76.491C141.861 76.491 141.622 76.5573 141.418 76.6897C141.214 76.812 141.112 76.9852 141.112 77.2094C141.112 77.4132 141.178 77.5864 141.311 77.7291C141.443 77.8718 141.683 77.9991 142.029 78.1112L142.809 78.3405C143.522 78.5545 144.057 78.8449 144.414 79.2117C144.77 79.5684 144.949 80.0524 144.949 80.6638C144.949 81.3873 144.689 81.963 144.169 82.391C143.649 82.819 142.987 83.033 142.182 83.033ZM151.131 73.5716C150.825 73.5716 150.56 73.4646 150.336 73.2506C150.112 73.0264 150 72.7564 150 72.4405C150 72.1348 150.112 71.875 150.336 71.661C150.56 71.4368 150.825 71.3247 151.131 71.3247C151.447 71.3247 151.712 71.4368 151.926 71.661C152.14 71.875 152.247 72.1348 152.247 72.4405C152.247 72.7564 152.14 73.0264 151.926 73.2506C151.712 73.4646 151.447 73.5716 151.131 73.5716ZM150.29 82.8801V75.2377H151.971V82.8801H150.29ZM156.661 83.033C155.958 83.033 155.336 82.9005 154.796 82.6356C154.256 82.3604 153.854 81.9528 153.589 81.4128L154.827 80.5262C154.98 80.8523 155.224 81.1122 155.56 81.3058C155.897 81.4892 156.264 81.5809 156.661 81.5809C156.977 81.5809 157.237 81.5096 157.441 81.3669C157.655 81.2243 157.762 81.0256 157.762 80.7708C157.762 80.5466 157.675 80.3632 157.502 80.2205C157.339 80.0779 157.033 79.9352 156.585 79.7926L155.912 79.6092C154.557 79.2423 153.889 78.4628 153.91 77.2706C153.91 76.6082 154.17 76.0783 154.689 75.6809C155.209 75.2835 155.861 75.0848 156.646 75.0848C157.828 75.0848 158.689 75.5179 159.229 76.384L158.067 77.2706C157.68 76.7509 157.196 76.491 156.615 76.491C156.34 76.491 156.101 76.5573 155.897 76.6897C155.693 76.812 155.591 76.9852 155.591 77.2094C155.591 77.4132 155.657 77.5864 155.79 77.7291C155.922 77.8718 156.162 77.9991 156.508 78.1112L157.288 78.3405C158.001 78.5545 158.536 78.8449 158.893 79.2117C159.249 79.5684 159.428 80.0524 159.428 80.6638C159.428 81.3873 159.168 81.963 158.648 82.391C158.128 82.819 157.466 83.033 156.661 83.033ZM167.902 83.033C166.863 83.033 165.987 82.6458 165.273 81.8713C164.57 81.0969 164.219 80.1594 164.219 79.0589C164.219 77.9584 164.57 77.0209 165.273 76.2465C165.987 75.472 166.863 75.0848 167.902 75.0848C168.422 75.0848 168.901 75.202 169.339 75.4364C169.777 75.6605 170.114 75.9357 170.348 76.2617V75.2377H172.029V82.8801H170.348V81.856C170.114 82.1821 169.777 82.4623 169.339 82.6967C168.901 82.9209 168.422 83.033 167.902 83.033ZM166.573 80.8014C167.001 81.2701 167.546 81.5045 168.208 81.5045C168.87 81.5045 169.416 81.2701 169.844 80.8014C170.272 80.3326 170.486 79.7518 170.486 79.0589C170.486 78.366 170.272 77.7851 169.844 77.3164C169.416 76.8477 168.87 76.6133 168.208 76.6133C167.546 76.6133 167.001 76.8477 166.573 77.3164C166.145 77.7851 165.931 78.366 165.931 79.0589C165.931 79.7518 166.145 80.3326 166.573 80.8014ZM180.335 83.033C179.632 83.033 179.01 82.9005 178.47 82.6356C177.93 82.3604 177.527 81.9528 177.262 81.4128L178.501 80.5262C178.653 80.8523 178.898 81.1122 179.234 81.3058C179.57 81.4892 179.937 81.5809 180.335 81.5809C180.651 81.5809 180.91 81.5096 181.114 81.3669C181.328 81.2243 181.435 81.0256 181.435 80.7708C181.435 80.5466 181.349 80.3632 181.175 80.2205C181.012 80.0779 180.707 79.9352 180.258 79.7926L179.586 79.6092C178.231 79.2423 177.563 78.4628 177.583 77.2706C177.583 76.6082 177.843 76.0783 178.363 75.6809C178.883 75.2835 179.535 75.0848 180.319 75.0848C181.501 75.0848 182.363 75.5179 182.903 76.384L181.741 77.2706C181.354 76.7509 180.87 76.491 180.289 76.491C180.014 76.491 179.774 76.5573 179.57 76.6897C179.367 76.812 179.265 76.9852 179.265 77.2094C179.265 77.4132 179.331 77.5864 179.463 77.7291C179.596 77.8718 179.835 77.9991 180.182 78.1112L180.961 78.3405C181.675 78.5545 182.21 78.8449 182.566 79.2117C182.923 79.5684 183.101 80.0524 183.101 80.6638C183.101 81.3873 182.841 81.963 182.322 82.391C181.802 82.819 181.14 83.033 180.335 83.033ZM187.581 83.033C186.705 83.033 186.012 82.7426 185.503 82.1617C184.993 81.5707 184.738 80.7861 184.738 79.8079V75.2377H186.42V79.5327C186.42 80.1441 186.552 80.6281 186.817 80.9848C187.082 81.3313 187.459 81.5045 187.948 81.5045C188.519 81.5045 188.972 81.2905 189.309 80.8625C189.645 80.4243 189.813 79.8028 189.813 78.9978V75.2377H191.494V82.8801H189.813V81.8408C189.365 82.6356 188.621 83.033 187.581 83.033ZM196.187 83.033C195.484 83.033 194.862 82.9005 194.322 82.6356C193.782 82.3604 193.38 81.9528 193.115 81.4128L194.353 80.5262C194.506 80.8523 194.75 81.1122 195.086 81.3058C195.423 81.4892 195.789 81.5809 196.187 81.5809C196.503 81.5809 196.763 81.5096 196.966 81.3669C197.18 81.2243 197.287 81.0256 197.287 80.7708C197.287 80.5466 197.201 80.3632 197.028 80.2205C196.865 80.0779 196.559 79.9352 196.11 79.7926L195.438 79.6092C194.083 79.2423 193.415 78.4628 193.436 77.2706C193.436 76.6082 193.695 76.0783 194.215 75.6809C194.735 75.2835 195.387 75.0848 196.172 75.0848C197.354 75.0848 198.215 75.5179 198.755 76.384L197.593 77.2706C197.206 76.7509 196.722 76.491 196.141 76.491C195.866 76.491 195.626 76.5573 195.423 76.6897C195.219 76.812 195.117 76.9852 195.117 77.2094C195.117 77.4132 195.183 77.5864 195.316 77.7291C195.448 77.8718 195.688 77.9991 196.034 78.1112L196.814 78.3405C197.527 78.5545 198.062 78.8449 198.418 79.2117C198.775 79.5684 198.953 80.0524 198.953 80.6638C198.953 81.3873 198.694 81.963 198.174 82.391C197.654 82.819 196.992 83.033 196.187 83.033ZM202.379 86.0747H200.697V75.2377H202.379V76.2617C202.613 75.9357 202.949 75.6605 203.388 75.4364C203.836 75.202 204.32 75.0848 204.84 75.0848C205.879 75.0848 206.75 75.472 207.453 76.2465C208.167 77.0209 208.523 77.9584 208.523 79.0589C208.523 80.1594 208.167 81.0969 207.453 81.8713C206.75 82.6458 205.879 83.033 204.84 83.033C204.32 83.033 203.836 82.9209 203.388 82.6967C202.949 82.4623 202.613 82.1821 202.379 81.856V86.0747ZM204.534 81.5045C205.196 81.5045 205.742 81.2701 206.169 80.8014C206.597 80.3326 206.811 79.7518 206.811 79.0589C206.811 78.366 206.597 77.7851 206.169 77.3164C205.742 76.8477 205.196 76.6133 204.534 76.6133C203.861 76.6133 203.311 76.8477 202.883 77.3164C202.455 77.7851 202.241 78.366 202.241 79.0589C202.241 79.7518 202.455 80.3326 202.883 80.8014C203.311 81.2701 203.861 81.5045 204.534 81.5045ZM211.076 73.5716C210.771 73.5716 210.506 73.4646 210.282 73.2506C210.057 73.0264 209.945 72.7564 209.945 72.4405C209.945 72.1348 210.057 71.875 210.282 71.661C210.506 71.4368 210.771 71.3247 211.076 71.3247C211.392 71.3247 211.657 71.4368 211.871 71.661C212.085 71.875 212.192 72.1348 212.192 72.4405C212.192 72.7564 212.085 73.0264 211.871 73.2506C211.657 73.4646 211.392 73.5716 211.076 73.5716ZM210.236 82.8801V75.2377H211.917V82.8801H210.236ZM217.661 83.033C216.51 83.033 215.547 82.6559 214.772 81.9019C214.008 81.1376 213.626 80.19 213.626 79.0589C213.626 77.9278 214.008 76.9852 214.772 76.2312C215.547 75.4669 216.51 75.0848 217.661 75.0848C218.446 75.0848 219.149 75.2733 219.771 75.6504C220.402 76.0274 220.886 76.542 221.223 77.1941L219.755 77.9889C219.562 77.5813 219.281 77.2553 218.915 77.0107C218.548 76.7662 218.13 76.6439 217.661 76.6439C216.989 76.6439 216.433 76.8782 215.995 77.347C215.557 77.8055 215.338 78.3762 215.338 79.0589C215.338 79.7416 215.557 80.3174 215.995 80.7861C216.433 81.2446 216.989 81.4739 217.661 81.4739C218.13 81.4739 218.548 81.3516 218.915 81.1071C219.281 80.8625 219.562 80.5364 219.755 80.1288L221.223 80.9237C220.886 81.5758 220.402 82.0904 219.771 82.4674C219.149 82.8445 218.446 83.033 217.661 83.033ZM223.6 73.5716C223.294 73.5716 223.029 73.4646 222.805 73.2506C222.581 73.0264 222.469 72.7564 222.469 72.4405C222.469 72.1348 222.581 71.875 222.805 71.661C223.029 71.4368 223.294 71.3247 223.6 71.3247C223.916 71.3247 224.181 71.4368 224.395 71.661C224.609 71.875 224.716 72.1348 224.716 72.4405C224.716 72.7564 224.609 73.0264 224.395 73.2506C224.181 73.4646 223.916 73.5716 223.6 73.5716ZM222.759 82.8801V75.2377H224.44V82.8801H222.759ZM232.997 81.8866C232.233 82.6509 231.285 83.033 230.154 83.033C229.023 83.033 228.07 82.6509 227.296 81.8866C226.532 81.1122 226.15 80.1696 226.15 79.0589C226.15 77.9482 226.532 77.0107 227.296 76.2465C228.07 75.472 229.023 75.0848 230.154 75.0848C231.285 75.0848 232.233 75.472 232.997 76.2465C233.772 77.0107 234.159 77.9482 234.159 79.0589C234.159 80.1696 233.772 81.1122 232.997 81.8866ZM230.154 81.4739C230.817 81.4739 231.362 81.2446 231.79 80.7861C232.228 80.3174 232.447 79.7416 232.447 79.0589C232.447 78.3762 232.228 77.8055 231.79 77.347C231.362 76.8782 230.817 76.6439 230.154 76.6439C229.482 76.6439 228.926 76.8782 228.488 77.347C228.06 77.8055 227.846 78.3762 227.846 79.0589C227.846 79.7416 228.06 80.3174 228.488 80.7861C228.926 81.2446 229.482 81.4739 230.154 81.4739ZM238.586 83.033C237.71 83.033 237.017 82.7426 236.507 82.1617C235.998 81.5707 235.743 80.7861 235.743 79.8079V75.2377H237.424V79.5327C237.424 80.1441 237.557 80.6281 237.822 80.9848C238.087 81.3313 238.464 81.5045 238.953 81.5045C239.523 81.5045 239.977 81.2905 240.313 80.8625C240.649 80.4243 240.817 79.8028 240.817 78.9978V75.2377H242.499V82.8801H240.817V81.8408C240.369 82.6356 239.625 83.033 238.586 83.033ZM247.191 83.033C246.488 83.033 245.867 82.9005 245.327 82.6356C244.787 82.3604 244.384 81.9528 244.119 81.4128L245.357 80.5262C245.51 80.8523 245.755 81.1122 246.091 81.3058C246.427 81.4892 246.794 81.5809 247.191 81.5809C247.507 81.5809 247.767 81.5096 247.971 81.3669C248.185 81.2243 248.292 81.0256 248.292 80.7708C248.292 80.5466 248.205 80.3632 248.032 80.2205C247.869 80.0779 247.563 79.9352 247.115 79.7926L246.442 79.6092C245.087 79.2423 244.42 78.4628 244.44 77.2706C244.44 76.6082 244.7 76.0783 245.22 75.6809C245.739 75.2835 246.391 75.0848 247.176 75.0848C248.358 75.0848 249.219 75.5179 249.759 76.384L248.598 77.2706C248.21 76.7509 247.726 76.491 247.146 76.491C246.87 76.491 246.631 76.5573 246.427 76.6897C246.223 76.812 246.121 76.9852 246.121 77.2094C246.121 77.4132 246.188 77.5864 246.32 77.7291C246.453 77.8718 246.692 77.9991 247.039 78.1112L247.818 78.3405C248.531 78.5545 249.066 78.8449 249.423 79.2117C249.78 79.5684 249.958 80.0524 249.958 80.6638C249.958 81.3873 249.698 81.963 249.178 82.391C248.659 82.819 247.996 83.033 247.191 83.033ZM255.299 82.8801V75.2377H256.981V76.598C257.123 76.17 257.383 75.8236 257.76 75.5586C258.147 75.2937 258.56 75.1612 258.998 75.1612C259.263 75.1612 259.482 75.1816 259.656 75.2224V76.9496C259.411 76.8579 259.131 76.812 258.815 76.812C258.305 76.812 257.872 77.0209 257.516 77.4387C257.159 77.8463 256.981 78.4169 256.981 79.1506V82.8801H255.299ZM264.292 83.033C263.13 83.033 262.172 82.661 261.418 81.9172C260.674 81.1733 260.302 80.2205 260.302 79.0589C260.302 77.9278 260.679 76.9852 261.433 76.2312C262.187 75.4669 263.14 75.0848 264.292 75.0848C265.351 75.0848 266.228 75.4211 266.921 76.0936C267.624 76.7662 267.975 77.6934 267.975 78.8755C267.975 79.0793 267.97 79.2627 267.96 79.4257H261.953C261.994 80.0473 262.233 80.5517 262.671 80.9389C263.11 81.316 263.655 81.5045 264.307 81.5045C265.285 81.5045 266.014 81.1173 266.493 80.3428L267.777 81.2599C267.043 82.442 265.881 83.033 264.292 83.033ZM262.029 78.2029H266.279C266.187 77.6731 265.947 77.2604 265.56 76.9649C265.183 76.6592 264.74 76.5063 264.23 76.5063C263.701 76.5063 263.227 76.6541 262.809 76.9496C262.401 77.2451 262.141 77.6629 262.029 78.2029ZM276.964 86.0747H275.283V81.856C275.048 82.1821 274.712 82.4623 274.274 82.6967C273.836 82.9209 273.357 83.033 272.837 83.033C271.798 83.033 270.921 82.6458 270.208 81.8713C269.505 81.0969 269.153 80.1594 269.153 79.0589C269.153 77.9584 269.505 77.0209 270.208 76.2465C270.921 75.472 271.798 75.0848 272.837 75.0848C273.357 75.0848 273.836 75.202 274.274 75.4364C274.712 75.6605 275.048 75.9357 275.283 76.2617V75.2377H276.964V86.0747ZM271.507 80.8014C271.935 81.2701 272.48 81.5045 273.143 81.5045C273.805 81.5045 274.35 81.2701 274.778 80.8014C275.206 80.3326 275.42 79.7518 275.42 79.0589C275.42 78.366 275.206 77.7851 274.778 77.3164C274.35 76.8477 273.805 76.6133 273.143 76.6133C272.48 76.6133 271.935 76.8477 271.507 77.3164C271.079 77.7851 270.865 78.366 270.865 79.0589C270.865 79.7518 271.079 80.3326 271.507 80.8014ZM281.978 83.033C281.101 83.033 280.409 82.7426 279.899 82.1617C279.39 81.5707 279.135 80.7861 279.135 79.8079V75.2377H280.816V79.5327C280.816 80.1441 280.949 80.6281 281.214 80.9848C281.478 81.3313 281.855 81.5045 282.345 81.5045C282.915 81.5045 283.369 81.2905 283.705 80.8625C284.041 80.4243 284.209 79.8028 284.209 78.9978V75.2377H285.891V82.8801H284.209V81.8408C283.761 82.6356 283.017 83.033 281.978 83.033ZM291.607 83.033C290.446 83.033 289.488 82.661 288.734 81.9172C287.99 81.1733 287.618 80.2205 287.618 79.0589C287.618 77.9278 287.995 76.9852 288.749 76.2312C289.503 75.4669 290.456 75.0848 291.607 75.0848C292.667 75.0848 293.543 75.4211 294.236 76.0936C294.94 76.7662 295.291 77.6934 295.291 78.8755C295.291 79.0793 295.286 79.2627 295.276 79.4257H289.269C289.31 80.0473 289.549 80.5517 289.987 80.9389C290.425 81.316 290.971 81.5045 291.623 81.5045C292.601 81.5045 293.329 81.1173 293.808 80.3428L295.092 81.2599C294.359 82.442 293.197 83.033 291.607 83.033ZM289.345 78.2029H293.594C293.503 77.6731 293.263 77.2604 292.876 76.9649C292.499 76.6592 292.056 76.5063 291.546 76.5063C291.016 76.5063 290.543 76.6541 290.125 76.9496C289.717 77.2451 289.457 77.6629 289.345 78.2029ZM299.45 83.033C298.747 83.033 298.125 82.9005 297.585 82.6356C297.045 82.3604 296.642 81.9528 296.377 81.4128L297.616 80.5262C297.768 80.8523 298.013 81.1122 298.349 81.3058C298.686 81.4892 299.052 81.5809 299.45 81.5809C299.766 81.5809 300.025 81.5096 300.229 81.3669C300.443 81.2243 300.55 81.0256 300.55 80.7708C300.55 80.5466 300.464 80.3632 300.29 80.2205C300.127 80.0779 299.822 79.9352 299.373 79.7926L298.701 79.6092C297.346 79.2423 296.678 78.4628 296.698 77.2706C296.698 76.6082 296.958 76.0783 297.478 75.6809C297.998 75.2835 298.65 75.0848 299.434 75.0848C300.617 75.0848 301.478 75.5179 302.018 76.384L300.856 77.2706C300.469 76.7509 299.985 76.491 299.404 76.491C299.129 76.491 298.889 76.5573 298.686 76.6897C298.482 76.812 298.38 76.9852 298.38 77.2094C298.38 77.4132 298.446 77.5864 298.579 77.7291C298.711 77.8718 298.95 77.9991 299.297 78.1112L300.076 78.3405C300.79 78.5545 301.325 78.8449 301.681 79.2117C302.038 79.5684 302.216 80.0524 302.216 80.6638C302.216 81.3873 301.956 81.963 301.437 82.391C300.917 82.819 300.255 83.033 299.45 83.033ZM307.173 82.9566C306.398 82.9566 305.766 82.7426 305.277 82.3146C304.798 81.8764 304.559 81.2446 304.559 80.4193V76.7356H302.969V75.2377H304.559V73.1131H306.24V75.2377H308.426V76.7356H306.24V80.1441C306.24 80.6129 306.342 80.9491 306.546 81.1529C306.75 81.3465 307.076 81.4433 307.524 81.4433C307.891 81.4433 308.192 81.3924 308.426 81.2905V82.7884C308.059 82.9005 307.641 82.9566 307.173 82.9566Z" fill="#24272A"/>
-<mask id="path-8-inside-2_6657_17714" fill="white">
-<path d="M75.018 119.377C75.018 117.267 76.7288 115.556 78.8392 115.556H386.449C388.559 115.556 390.27 117.267 390.27 119.377V150.02C390.27 152.13 388.559 153.841 386.449 153.841H78.8392C76.7288 153.841 75.018 152.13 75.018 150.02V119.377Z"/>
-</mask>
-<path d="M75.018 119.377C75.018 117.267 76.7288 115.556 78.8392 115.556H386.449C388.559 115.556 390.27 117.267 390.27 119.377V150.02C390.27 152.13 388.559 153.841 386.449 153.841H78.8392C76.7288 153.841 75.018 152.13 75.018 150.02V119.377Z" fill="#D73847" fill-opacity="0.1"/>
-<path d="M75.018 115.556H390.27H75.018ZM390.27 153.841H75.018H390.27ZM78.8392 153.841C74.6184 153.841 71.1968 150.419 71.1968 146.199V123.199C71.1968 118.978 74.6184 115.556 78.8392 115.556C78.8392 115.556 78.8392 117.267 78.8392 119.377V150.02C78.8392 152.13 78.8392 153.841 78.8392 153.841ZM390.27 115.556V153.841V115.556Z" fill="#D73847" mask="url(#path-8-inside-2_6657_17714)"/>
-<path d="M105.983 137.303L100.713 127.212C100.004 125.854 99.0243 125.109 97.9454 125.109C96.8666 125.109 95.8866 125.854 95.1783 127.212L89.9076 137.303C89.2405 138.591 89.1664 139.826 89.7017 140.798C90.237 141.771 91.2912 142.305 92.6747 142.305H103.216C104.6 142.305 105.654 141.771 106.189 140.798C106.724 139.826 106.65 138.582 105.983 137.303ZM97.3278 131.241C97.3278 130.882 97.6078 130.584 97.9454 130.584C98.2831 130.584 98.5631 130.882 98.5631 131.241V135.621C98.5631 135.98 98.2831 136.278 97.9454 136.278C97.6078 136.278 97.3278 135.98 97.3278 135.621V131.241ZM98.5302 138.871C98.489 138.906 98.4478 138.941 98.4066 138.976C98.3572 139.011 98.3078 139.038 98.2584 139.055C98.209 139.081 98.1596 139.099 98.1019 139.108C98.0525 139.116 97.9948 139.125 97.9454 139.125C97.896 139.125 97.8384 139.116 97.7807 139.108C97.7313 139.099 97.6819 139.081 97.6325 139.055C97.5831 139.038 97.5337 139.011 97.4842 138.976C97.4431 138.941 97.4019 138.906 97.3607 138.871C97.2125 138.705 97.1219 138.477 97.1219 138.249C97.1219 138.021 97.2125 137.794 97.3607 137.627C97.4019 137.592 97.4431 137.557 97.4842 137.522C97.5337 137.487 97.5831 137.461 97.6325 137.443C97.6819 137.417 97.7313 137.399 97.7807 137.391C97.8878 137.364 98.0031 137.364 98.1019 137.391C98.1596 137.399 98.209 137.417 98.2584 137.443C98.3078 137.461 98.3572 137.487 98.4066 137.522C98.4478 137.557 98.489 137.592 98.5302 137.627C98.6784 137.794 98.769 138.021 98.769 138.249C98.769 138.477 98.6784 138.705 98.5302 138.871Z" fill="#D73847"/>
-<path d="M120.491 140.199V131.058H117.342V129.346H125.443V131.058H122.279V140.199H120.491ZM128.417 140.199H126.736V128.735H128.417V133.596C128.896 132.801 129.67 132.403 130.74 132.403C131.627 132.403 132.335 132.694 132.865 133.275C133.395 133.855 133.66 134.63 133.66 135.598V140.199H131.978V135.873C131.978 135.262 131.836 134.788 131.55 134.452C131.265 134.105 130.878 133.932 130.389 133.932C129.808 133.932 129.334 134.151 128.967 134.589C128.6 135.027 128.417 135.644 128.417 136.439V140.199ZM136.652 130.89C136.346 130.89 136.081 130.783 135.857 130.569C135.633 130.345 135.521 130.075 135.521 129.759C135.521 129.453 135.633 129.194 135.857 128.98C136.081 128.755 136.346 128.643 136.652 128.643C136.968 128.643 137.233 128.755 137.447 128.98C137.661 129.194 137.768 129.453 137.768 129.759C137.768 130.075 137.661 130.345 137.447 130.569C137.233 130.783 136.968 130.89 136.652 130.89ZM135.811 140.199V132.556H137.492V140.199H135.811ZM142.182 140.352C141.479 140.352 140.857 140.219 140.317 139.954C139.777 139.679 139.375 139.271 139.11 138.731L140.348 137.845C140.501 138.171 140.745 138.431 141.082 138.624C141.418 138.808 141.785 138.9 142.182 138.9C142.498 138.9 142.758 138.828 142.962 138.686C143.176 138.543 143.283 138.344 143.283 138.089C143.283 137.865 143.196 137.682 143.023 137.539C142.86 137.396 142.554 137.254 142.106 137.111L141.433 136.928C140.078 136.561 139.41 135.781 139.431 134.589C139.431 133.927 139.691 133.397 140.21 133C140.73 132.602 141.382 132.403 142.167 132.403C143.349 132.403 144.21 132.836 144.75 133.703L143.588 134.589C143.201 134.069 142.717 133.81 142.136 133.81C141.861 133.81 141.622 133.876 141.418 134.008C141.214 134.131 141.112 134.304 141.112 134.528C141.112 134.732 141.178 134.905 141.311 135.048C141.443 135.19 141.683 135.318 142.029 135.43L142.809 135.659C143.522 135.873 144.057 136.164 144.414 136.53C144.77 136.887 144.949 137.371 144.949 137.982C144.949 138.706 144.689 139.282 144.169 139.71C143.649 140.138 142.987 140.352 142.182 140.352ZM151.131 130.89C150.825 130.89 150.56 130.783 150.336 130.569C150.112 130.345 150 130.075 150 129.759C150 129.453 150.112 129.194 150.336 128.98C150.56 128.755 150.825 128.643 151.131 128.643C151.447 128.643 151.712 128.755 151.926 128.98C152.14 129.194 152.247 129.453 152.247 129.759C152.247 130.075 152.14 130.345 151.926 130.569C151.712 130.783 151.447 130.89 151.131 130.89ZM150.29 140.199V132.556H151.971V140.199H150.29ZM156.661 140.352C155.958 140.352 155.336 140.219 154.796 139.954C154.256 139.679 153.854 139.271 153.589 138.731L154.827 137.845C154.98 138.171 155.224 138.431 155.56 138.624C155.897 138.808 156.264 138.9 156.661 138.9C156.977 138.9 157.237 138.828 157.441 138.686C157.655 138.543 157.762 138.344 157.762 138.089C157.762 137.865 157.675 137.682 157.502 137.539C157.339 137.396 157.033 137.254 156.585 137.111L155.912 136.928C154.557 136.561 153.889 135.781 153.91 134.589C153.91 133.927 154.17 133.397 154.689 133C155.209 132.602 155.861 132.403 156.646 132.403C157.828 132.403 158.689 132.836 159.229 133.703L158.067 134.589C157.68 134.069 157.196 133.81 156.615 133.81C156.34 133.81 156.101 133.876 155.897 134.008C155.693 134.131 155.591 134.304 155.591 134.528C155.591 134.732 155.657 134.905 155.79 135.048C155.922 135.19 156.162 135.318 156.508 135.43L157.288 135.659C158.001 135.873 158.536 136.164 158.893 136.53C159.249 136.887 159.428 137.371 159.428 137.982C159.428 138.706 159.168 139.282 158.648 139.71C158.128 140.138 157.466 140.352 156.661 140.352ZM167.902 140.352C166.863 140.352 165.987 139.964 165.273 139.19C164.57 138.415 164.219 137.478 164.219 136.377C164.219 135.277 164.57 134.34 165.273 133.565C165.987 132.791 166.863 132.403 167.902 132.403C168.422 132.403 168.901 132.521 169.339 132.755C169.777 132.979 170.114 133.254 170.348 133.58V132.556H172.029V140.199H170.348V139.175C170.114 139.501 169.777 139.781 169.339 140.015C168.901 140.239 168.422 140.352 167.902 140.352ZM166.573 138.12C167.001 138.589 167.546 138.823 168.208 138.823C168.87 138.823 169.416 138.589 169.844 138.12C170.272 137.651 170.486 137.07 170.486 136.377C170.486 135.685 170.272 135.104 169.844 134.635C169.416 134.166 168.87 133.932 168.208 133.932C167.546 133.932 167.001 134.166 166.573 134.635C166.145 135.104 165.931 135.685 165.931 136.377C165.931 137.07 166.145 137.651 166.573 138.12ZM181.038 140.352C179.998 140.352 179.122 139.964 178.409 139.19C177.706 138.415 177.354 137.478 177.354 136.377C177.354 135.277 177.706 134.34 178.409 133.565C179.122 132.791 179.998 132.403 181.038 132.403C181.558 132.403 182.036 132.521 182.475 132.755C182.913 132.979 183.249 133.254 183.483 133.58V128.735H185.165V140.199H183.483V139.175C183.249 139.501 182.913 139.781 182.475 140.015C182.036 140.239 181.558 140.352 181.038 140.352ZM179.708 138.12C180.136 138.589 180.681 138.823 181.344 138.823C182.006 138.823 182.551 138.589 182.979 138.12C183.407 137.651 183.621 137.07 183.621 136.377C183.621 135.685 183.407 135.104 182.979 134.635C182.551 134.166 182.006 133.932 181.344 133.932C180.681 133.932 180.136 134.166 179.708 134.635C179.28 135.104 179.066 135.685 179.066 136.377C179.066 137.07 179.28 137.651 179.708 138.12ZM190.897 140.352C189.735 140.352 188.777 139.98 188.023 139.236C187.28 138.492 186.908 137.539 186.908 136.377C186.908 135.246 187.285 134.304 188.039 133.55C188.793 132.786 189.746 132.403 190.897 132.403C191.957 132.403 192.833 132.74 193.526 133.412C194.229 134.085 194.581 135.012 194.581 136.194C194.581 136.398 194.576 136.581 194.565 136.744H188.558C188.599 137.366 188.839 137.87 189.277 138.258C189.715 138.635 190.26 138.823 190.912 138.823C191.891 138.823 192.619 138.436 193.098 137.661L194.382 138.579C193.648 139.761 192.487 140.352 190.897 140.352ZM188.635 135.522H192.884C192.792 134.992 192.553 134.579 192.166 134.283C191.789 133.978 191.345 133.825 190.836 133.825C190.306 133.825 189.832 133.973 189.414 134.268C189.007 134.564 188.747 134.981 188.635 135.522ZM199.794 140.352C198.643 140.352 197.68 139.975 196.905 139.22C196.141 138.456 195.759 137.509 195.759 136.377C195.759 135.246 196.141 134.304 196.905 133.55C197.68 132.786 198.643 132.403 199.794 132.403C200.579 132.403 201.282 132.592 201.903 132.969C202.535 133.346 203.019 133.861 203.355 134.513L201.888 135.308C201.694 134.9 201.414 134.574 201.047 134.329C200.681 134.085 200.263 133.962 199.794 133.962C199.121 133.962 198.566 134.197 198.128 134.666C197.69 135.124 197.471 135.695 197.471 136.377C197.471 137.06 197.69 137.636 198.128 138.105C198.566 138.563 199.121 138.793 199.794 138.793C200.263 138.793 200.681 138.67 201.047 138.426C201.414 138.181 201.694 137.855 201.888 137.447L203.355 138.242C203.019 138.894 202.535 139.409 201.903 139.786C201.282 140.163 200.579 140.352 199.794 140.352ZM208.346 140.352C207.185 140.352 206.227 139.98 205.473 139.236C204.729 138.492 204.357 137.539 204.357 136.377C204.357 135.246 204.734 134.304 205.488 133.55C206.242 132.786 207.195 132.403 208.346 132.403C209.406 132.403 210.282 132.74 210.975 133.412C211.678 134.085 212.03 135.012 212.03 136.194C212.03 136.398 212.025 136.581 212.015 136.744H206.008C206.048 137.366 206.288 137.87 206.726 138.258C207.164 138.635 207.709 138.823 208.362 138.823C209.34 138.823 210.068 138.436 210.547 137.661L211.831 138.579C211.098 139.761 209.936 140.352 208.346 140.352ZM206.084 135.522H210.333C210.242 134.992 210.002 134.579 209.615 134.283C209.238 133.978 208.795 133.825 208.285 133.825C207.755 133.825 207.281 133.973 206.864 134.268C206.456 134.564 206.196 134.981 206.084 135.522ZM215.44 143.393H213.758V132.556H215.44V133.58C215.674 133.254 216.01 132.979 216.448 132.755C216.897 132.521 217.381 132.403 217.901 132.403C218.94 132.403 219.811 132.791 220.514 133.565C221.228 134.34 221.584 135.277 221.584 136.377C221.584 137.478 221.228 138.415 220.514 139.19C219.811 139.964 218.94 140.352 217.901 140.352C217.381 140.352 216.897 140.239 216.448 140.015C216.01 139.781 215.674 139.501 215.44 139.175V143.393ZM217.595 138.823C218.257 138.823 218.802 138.589 219.23 138.12C219.658 137.651 219.872 137.07 219.872 136.377C219.872 135.685 219.658 135.104 219.23 134.635C218.802 134.166 218.257 133.932 217.595 133.932C216.922 133.932 216.372 134.166 215.944 134.635C215.516 135.104 215.302 135.685 215.302 136.377C215.302 137.07 215.516 137.651 215.944 138.12C216.372 138.589 216.922 138.823 217.595 138.823ZM226.464 140.275C225.69 140.275 225.058 140.061 224.569 139.633C224.09 139.195 223.85 138.563 223.85 137.738V134.054H222.261V132.556H223.85V130.432H225.532V132.556H227.717V134.054H225.532V137.463C225.532 137.931 225.634 138.268 225.837 138.472C226.041 138.665 226.367 138.762 226.816 138.762C227.182 138.762 227.483 138.711 227.717 138.609V140.107C227.351 140.219 226.933 140.275 226.464 140.275ZM230.153 130.89C229.847 130.89 229.582 130.783 229.358 130.569C229.134 130.345 229.022 130.075 229.022 129.759C229.022 129.453 229.134 129.194 229.358 128.98C229.582 128.755 229.847 128.643 230.153 128.643C230.469 128.643 230.733 128.755 230.947 128.98C231.161 129.194 231.268 129.453 231.268 129.759C231.268 130.075 231.161 130.345 230.947 130.569C230.733 130.783 230.469 130.89 230.153 130.89ZM229.312 140.199V132.556H230.993V140.199H229.312ZM235.637 140.199L232.183 132.556H234.047L236.371 137.921L238.709 132.556H240.589L237.12 140.199H235.637ZM245.021 140.352C243.86 140.352 242.902 139.98 242.148 139.236C241.404 138.492 241.032 137.539 241.032 136.377C241.032 135.246 241.409 134.304 242.163 133.55C242.917 132.786 243.87 132.403 245.021 132.403C246.081 132.403 246.957 132.74 247.65 133.412C248.353 134.085 248.705 135.012 248.705 136.194C248.705 136.398 248.7 136.581 248.69 136.744H242.683C242.723 137.366 242.963 137.87 243.401 138.258C243.839 138.635 244.384 138.823 245.036 138.823C246.015 138.823 246.743 138.436 247.222 137.661L248.506 138.579C247.772 139.761 246.611 140.352 245.021 140.352ZM242.759 135.522H247.008C246.917 134.992 246.677 134.579 246.29 134.283C245.913 133.978 245.47 133.825 244.96 133.825C244.43 133.825 243.956 133.973 243.539 134.268C243.131 134.564 242.871 134.981 242.759 135.522ZM254.031 140.199V132.556H255.712V133.917C255.855 133.489 256.114 133.142 256.491 132.877C256.879 132.612 257.291 132.48 257.73 132.48C257.994 132.48 258.214 132.5 258.387 132.541V134.268C258.142 134.176 257.862 134.131 257.546 134.131C257.037 134.131 256.604 134.34 256.247 134.757C255.89 135.165 255.712 135.736 255.712 136.469V140.199H254.031ZM263.023 140.352C261.861 140.352 260.903 139.98 260.149 139.236C259.405 138.492 259.033 137.539 259.033 136.377C259.033 135.246 259.41 134.304 260.164 133.55C260.919 132.786 261.871 132.403 263.023 132.403C264.083 132.403 264.959 132.74 265.652 133.412C266.355 134.085 266.706 135.012 266.706 136.194C266.706 136.398 266.701 136.581 266.691 136.744H260.684C260.725 137.366 260.964 137.87 261.403 138.258C261.841 138.635 262.386 138.823 263.038 138.823C264.016 138.823 264.745 138.436 265.224 137.661L266.508 138.579C265.774 139.761 264.612 140.352 263.023 140.352ZM260.761 135.522H265.01C264.918 134.992 264.679 134.579 264.291 134.283C263.914 133.978 263.471 133.825 262.962 133.825C262.432 133.825 261.958 133.973 261.54 134.268C261.133 134.564 260.873 134.981 260.761 135.522ZM275.695 143.393H274.014V139.175C273.779 139.501 273.443 139.781 273.005 140.015C272.567 140.239 272.088 140.352 271.568 140.352C270.529 140.352 269.653 139.964 268.939 139.19C268.236 138.415 267.885 137.478 267.885 136.377C267.885 135.277 268.236 134.34 268.939 133.565C269.653 132.791 270.529 132.403 271.568 132.403C272.088 132.403 272.567 132.521 273.005 132.755C273.443 132.979 273.779 133.254 274.014 133.58V132.556H275.695V143.393ZM270.238 138.12C270.666 138.589 271.212 138.823 271.874 138.823C272.536 138.823 273.081 138.589 273.509 138.12C273.937 137.651 274.151 137.07 274.151 136.377C274.151 135.685 273.937 135.104 273.509 134.635C273.081 134.166 272.536 133.932 271.874 133.932C271.212 133.932 270.666 134.166 270.238 134.635C269.81 135.104 269.596 135.685 269.596 136.377C269.596 137.07 269.81 137.651 270.238 138.12ZM280.709 140.352C279.833 140.352 279.14 140.061 278.63 139.48C278.121 138.889 277.866 138.105 277.866 137.126V132.556H279.547V136.851C279.547 137.463 279.68 137.947 279.945 138.303C280.21 138.65 280.587 138.823 281.076 138.823C281.646 138.823 282.1 138.609 282.436 138.181C282.772 137.743 282.941 137.121 282.941 136.316V132.556H284.622V140.199H282.941V139.159C282.492 139.954 281.748 140.352 280.709 140.352ZM290.339 140.352C289.177 140.352 288.219 139.98 287.465 139.236C286.721 138.492 286.349 137.539 286.349 136.377C286.349 135.246 286.726 134.304 287.48 133.55C288.234 132.786 289.187 132.403 290.339 132.403C291.398 132.403 292.275 132.74 292.968 133.412C293.671 134.085 294.022 135.012 294.022 136.194C294.022 136.398 294.017 136.581 294.007 136.744H288C288.041 137.366 288.28 137.87 288.718 138.258C289.157 138.635 289.702 138.823 290.354 138.823C291.332 138.823 292.061 138.436 292.54 137.661L293.824 138.579C293.09 139.761 291.928 140.352 290.339 140.352ZM288.076 135.522H292.326C292.234 134.992 291.994 134.579 291.607 134.283C291.23 133.978 290.787 133.825 290.277 133.825C289.748 133.825 289.274 133.973 288.856 134.268C288.448 134.564 288.189 134.981 288.076 135.522ZM298.181 140.352C297.478 140.352 296.856 140.219 296.316 139.954C295.776 139.679 295.374 139.271 295.109 138.731L296.347 137.845C296.5 138.171 296.744 138.431 297.08 138.624C297.417 138.808 297.784 138.9 298.181 138.9C298.497 138.9 298.757 138.828 298.961 138.686C299.175 138.543 299.282 138.344 299.282 138.089C299.282 137.865 299.195 137.682 299.022 137.539C298.859 137.396 298.553 137.254 298.105 137.111L297.432 136.928C296.077 136.561 295.409 135.781 295.43 134.589C295.43 133.927 295.69 133.397 296.209 133C296.729 132.602 297.381 132.403 298.166 132.403C299.348 132.403 300.209 132.836 300.749 133.703L299.587 134.589C299.2 134.069 298.716 133.81 298.135 133.81C297.86 133.81 297.621 133.876 297.417 134.008C297.213 134.131 297.111 134.304 297.111 134.528C297.111 134.732 297.177 134.905 297.31 135.048C297.442 135.19 297.682 135.318 298.028 135.43L298.808 135.659C299.521 135.873 300.056 136.164 300.413 136.53C300.769 136.887 300.948 137.371 300.948 137.982C300.948 138.706 300.688 139.282 300.168 139.71C299.648 140.138 298.986 140.352 298.181 140.352ZM305.904 140.275C305.13 140.275 304.498 140.061 304.009 139.633C303.53 139.195 303.29 138.563 303.29 137.738V134.054H301.701V132.556H303.29V130.432H304.972V132.556H307.157V134.054H304.972V137.463C304.972 137.931 305.073 138.268 305.277 138.472C305.481 138.665 305.807 138.762 306.255 138.762C306.622 138.762 306.923 138.711 307.157 138.609V140.107C306.79 140.219 306.373 140.275 305.904 140.275Z" fill="#24272A"/>
-<path d="M365.555 103.274C366.968 102.666 367.62 101.027 367.011 99.6142C366.402 98.2015 364.763 97.55 363.351 98.1587C361.938 98.7674 361.287 100.406 361.896 101.819C362.504 103.231 364.143 103.883 365.555 103.274Z" fill="url(#paint1_linear_6657_17714)"/>
-<path d="M364.81 166.224C364.358 166.224 363.913 166.121 363.499 165.915L339.427 153.907C338.326 153.359 337.656 152.175 337.734 150.915C337.81 149.653 338.621 148.57 339.782 148.171L372.931 136.769C374.042 136.387 375.267 136.702 376.072 137.579C376.88 138.457 377.116 139.737 376.679 140.858L367.606 164.268C367.295 165.066 366.676 165.699 365.898 166.007C365.547 166.153 365.178 166.224 364.81 166.224ZM348.706 151.641L363.211 158.879L368.68 144.77L348.706 151.641Z" fill="url(#paint2_linear_6657_17714)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M340.57 0.102619C355.669 0.948163 370.612 7.26858 380.894 18.3595C390.452 28.6714 396.949 43.5765 394.263 57.1695C391.359 75.7068 382.878 93.3409 370.184 107.162C368.679 108.801 366.863 110.502 364.638 110.51C361.133 110.525 359.05 106.13 359.884 102.725C360.6 99.8039 362.652 97.4766 364.664 95.1945C364.997 94.8162 365.33 94.4391 365.655 94.0608C372.169 86.4804 376.418 76.9761 377.724 67.0657C378.091 64.2733 377.287 60.369 374.47 60.4149C372.149 60.4528 371.479 62.9259 370.792 65.4632C370.128 67.9131 369.449 70.4228 367.251 70.8583C365.174 71.271 363.326 69.1282 363.143 67.0199C362.984 65.1524 363.703 63.3546 364.404 61.5999C364.495 61.3736 364.585 61.148 364.673 60.9231C367.463 53.7827 368.113 45.8705 366.744 38.3327C352.318 31.1544 335.908 27.9202 319.853 29.398C312.676 30.0578 305.616 31.607 298.56 33.1554C290.381 34.95 282.208 36.7435 273.863 37.1498C271.911 37.2433 269.723 37.1817 268.538 35.3879C267.542 33.8814 267.729 31.8893 268.857 30.4807C271.176 27.5837 274.81 27.4697 278.184 27.3638L278.295 27.3603C293.676 26.8726 308.982 24.1147 323.564 19.2052C323.65 19.1777 323.737 19.1436 323.824 19.1094C327.179 17.7533 326.099 12.6978 322.479 12.7229C317.253 12.7594 313.72 13.3611 306.867 15.4671C294.531 19.3191 291.695 15.1754 297.33 11.4374C310.304 3.66506 325.469 -0.740727 340.57 0.102619Z" fill="url(#paint3_linear_6657_17714)"/>
-<path d="M259.778 24.639C258.008 24.639 256.219 24.1671 254.6 23.1802C249.916 20.3152 248.435 14.1748 251.3 9.48864C254.165 4.80476 260.305 3.32327 264.991 6.18824C269.675 9.05331 271.157 15.1936 268.292 19.8798C266.415 22.9455 263.136 24.639 259.778 24.639ZM259.808 7.50341C257.388 7.50341 255.022 8.72506 253.67 10.936C251.605 14.3139 252.671 18.7447 256.051 20.8098C259.432 22.8748 263.861 21.8081 265.925 18.4279C267.991 15.0501 266.924 10.6192 263.544 8.55416C262.375 7.84303 261.082 7.50341 259.808 7.50341Z" fill="#FFB0EB"/>
-<path d="M411.468 42.399C413.007 42.399 414.253 41.1519 414.253 39.6137C414.253 38.0754 413.007 36.8284 411.468 36.8284C409.929 36.8284 408.683 38.0754 408.683 39.6137C408.683 41.1519 409.929 42.399 411.468 42.399Z" fill="url(#paint4_linear_6657_17714)"/>
-<path d="M320.04 40.3227C334.654 38.4628 336.711 45.4146 325.209 56.6172C313.708 67.8198 312.828 59.7604 315.351 52.959C317.874 46.1577 314.108 46.0893 308.952 47.3794C303.791 48.6694 304.669 44.2226 320.04 40.3227Z" fill="#75C4FD"/>
-<path d="M59.46 80.6641C60.5816 80.8103 61.7165 80.4779 62.7425 80.0031C64.7371 79.0822 66.471 77.6081 67.7024 75.7911C71.1167 70.7519 65.8854 67.7178 61.9266 71.2993C59.9616 73.0771 53.2152 79.8464 59.46 80.6641Z" fill="url(#paint5_linear_6657_17714)"/>
-<path d="M153.236 194.673C142.583 196.743 129.085 185.096 140.504 171.169C148.634 161.211 148.867 168.049 148.427 176.25C148.621 181.385 149.407 183.527 156.735 184.576C164.063 185.624 163.89 192.604 153.236 194.673Z" fill="url(#paint6_linear_6657_17714)"/>
-<path d="M27.6991 136.29C25.306 134.978 22.1421 136.669 19.9448 137.667C19.6602 137.797 18.4909 138.4 18.0782 138.535C16.5917 139.02 14.3742 140.204 13.246 141.594C12.0562 143.826 15.0239 145.686 19.3411 145.676C21.9615 145.793 24.9363 144.799 27.0648 143.296C28.2751 142.442 29.3948 141.264 29.4425 139.696C29.4836 138.356 28.9114 136.956 27.6991 136.29Z" fill="url(#paint7_linear_6657_17714)"/>
-<path d="M61.1852 177.751C59.9065 177.751 58.6119 177.411 57.4426 176.695C54.0556 174.626 52.9867 170.186 55.0562 166.799C57.1258 163.412 61.5658 162.343 64.9528 164.413C66.5939 165.415 67.745 166.997 68.1962 168.867C68.6475 170.735 68.3421 172.668 67.3392 174.309C65.9831 176.527 63.6126 177.751 61.1852 177.751ZM61.2057 165.366C59.4575 165.366 57.748 166.247 56.7702 167.847C56.0477 169.03 55.8289 170.423 56.1526 171.77C56.4785 173.117 57.3081 174.259 58.4911 174.982C60.9322 176.475 64.1323 175.702 65.6252 173.261C66.3477 172.078 66.5665 170.686 66.2428 169.339C65.917 167.991 65.0873 166.849 63.9043 166.127C63.061 165.612 62.1288 165.366 61.2057 165.366Z" fill="#FFD23D"/>
-<path d="M131.301 168.928C132.839 168.928 134.086 167.68 134.086 166.142C134.086 164.604 132.839 163.358 131.301 163.358C129.762 163.358 128.515 164.604 128.515 166.142C128.515 167.68 129.762 168.928 131.301 168.928Z" fill="url(#paint8_linear_6657_17714)"/>
-<path d="M139.586 222.763L139.586 222.763L139.584 222.761C139.465 222.669 139.328 222.492 139.22 222.265C139.112 222.038 139.057 221.811 139.057 221.644V216.512C139.057 216.264 139.149 215.979 139.317 215.724C139.486 215.469 139.704 215.284 139.913 215.201C139.913 215.201 139.914 215.201 139.914 215.201L143.229 213.897C143.33 213.858 143.493 213.83 143.68 213.83C143.868 213.83 144.031 213.858 144.131 213.897C144.132 213.897 144.132 213.897 144.132 213.897L147.446 215.2C147.446 215.201 147.446 215.201 147.447 215.201C147.653 215.284 147.869 215.468 148.036 215.723C148.203 215.977 148.294 216.261 148.292 216.508L148.292 216.508V216.512V221.644C148.292 221.811 148.237 222.036 148.129 222.262C148.022 222.488 147.884 222.667 147.762 222.764C147.761 222.764 147.761 222.764 147.761 222.764L144.444 225.367L144.443 225.368C144.031 225.693 143.317 225.693 142.906 225.368L142.904 225.367L139.586 222.763ZM142.195 221.356L142.195 221.356L142.197 221.358C142.38 221.551 142.621 221.646 142.863 221.646C143.105 221.646 143.346 221.551 143.529 221.358L146.12 218.637C146.481 218.267 146.479 217.665 146.129 217.298L145.783 217.627L146.129 217.298C145.766 216.916 145.161 216.916 144.798 217.298L142.869 219.323L142.563 219.002C142.2 218.62 141.595 218.62 141.232 219.002C140.882 219.37 140.881 219.963 141.231 220.331C141.231 220.331 141.232 220.332 141.232 220.332L142.195 221.356Z" fill="#0376C9" stroke="#0376C9" stroke-width="0.955308"/>
-<path d="M158.405 223.859C157.064 223.859 155.986 223.228 155.551 222.391L156.411 221.749C156.858 222.437 157.511 222.861 158.428 222.861C159.265 222.861 159.93 222.414 159.93 221.646C159.93 220.993 159.529 220.557 158.761 220.27L157.683 219.858C156.399 219.388 155.837 218.723 155.837 217.611C155.837 216.281 156.926 215.444 158.382 215.444C159.403 215.444 160.251 215.903 160.755 216.556L159.976 217.244C159.563 216.751 159.059 216.441 158.359 216.441C157.557 216.441 156.892 216.889 156.892 217.565C156.892 218.253 157.293 218.562 158.119 218.872L159.105 219.25C160.308 219.709 160.996 220.396 160.996 221.6C160.996 222.976 159.907 223.859 158.405 223.859ZM165.175 223.836C163.387 223.836 162.206 222.54 162.206 220.855C162.206 219.17 163.433 217.874 165.187 217.874C166.677 217.874 167.915 218.918 167.915 220.752C167.915 220.855 167.915 220.924 167.903 221.05H163.203C163.238 222.116 164.052 222.93 165.187 222.93C166.069 222.93 166.619 222.54 166.975 221.933L167.754 222.471C167.239 223.308 166.367 223.836 165.175 223.836ZM163.272 220.247H166.906C166.757 219.307 166.023 218.746 165.152 218.746C164.292 218.746 163.455 219.296 163.272 220.247ZM172.109 223.836C170.367 223.836 169.106 222.517 169.106 220.855C169.106 219.193 170.367 217.874 172.109 217.874C173.302 217.874 174.253 218.493 174.757 219.411L173.898 219.892C173.577 219.239 172.935 218.792 172.109 218.792C170.917 218.792 170.103 219.709 170.103 220.855C170.103 222.001 170.917 222.918 172.109 222.918C172.935 222.918 173.577 222.471 173.898 221.818L174.757 222.299C174.253 223.217 173.302 223.836 172.109 223.836ZM178.303 223.836C177.053 223.836 176.193 222.93 176.193 221.508V217.989H177.179V221.359C177.179 222.322 177.684 222.93 178.475 222.93C179.357 222.93 180.068 222.15 180.068 220.832V217.989H181.054V223.721H180.068V222.838C179.69 223.515 179.036 223.836 178.303 223.836ZM183.151 223.721V217.989H184.137V219.101C184.355 218.367 185.088 217.932 185.742 217.932C185.891 217.932 186.04 217.943 186.189 217.978V218.998C186.006 218.918 185.845 218.906 185.65 218.906C184.928 218.906 184.137 219.537 184.137 220.878V223.721H183.151ZM188.092 216.453C187.691 216.453 187.382 216.155 187.382 215.754C187.382 215.375 187.691 215.054 188.092 215.054C188.494 215.054 188.78 215.375 188.78 215.754C188.78 216.155 188.494 216.453 188.092 216.453ZM187.588 223.721V217.989H188.574V223.721H187.588ZM192.906 223.778C191.897 223.778 191.152 223.217 191.152 222.024V218.895H189.936V217.989H191.152V216.396H192.138V217.989H193.788V218.895H192.138V221.898C192.138 222.632 192.459 222.873 193.089 222.873C193.33 222.873 193.605 222.838 193.788 222.758V223.641C193.548 223.721 193.261 223.778 192.906 223.778ZM196.811 226.117H195.711L196.96 223.423L194.45 217.989H195.539L197.51 222.345L199.471 217.989H200.571L196.811 226.117ZM206.903 223.836C205.298 223.836 204.094 222.494 204.094 220.855C204.094 219.216 205.298 217.874 206.903 217.874C207.774 217.874 208.542 218.322 208.92 218.872V217.989H209.906V223.721H208.92V222.838C208.542 223.388 207.774 223.836 206.903 223.836ZM207.052 222.93C208.198 222.93 209 222.013 209 220.855C209 219.697 208.198 218.78 207.052 218.78C205.894 218.78 205.091 219.697 205.091 220.855C205.091 222.013 205.894 222.93 207.052 222.93ZM214.362 223.836C212.757 223.836 211.554 222.494 211.554 220.855C211.554 219.216 212.757 217.874 214.362 217.874C215.233 217.874 216.002 218.322 216.38 218.872V215.123H217.366V223.721H216.38V222.838C216.002 223.388 215.233 223.836 214.362 223.836ZM214.511 222.93C215.658 222.93 216.46 222.013 216.46 220.855C216.46 219.697 215.658 218.78 214.511 218.78C213.353 218.78 212.551 219.697 212.551 220.855C212.551 222.013 213.353 222.93 214.511 222.93ZM221.249 223.721L218.601 217.989H219.701L221.661 222.334L223.622 217.989H224.722L222.074 223.721H221.249ZM226.462 216.453C226.06 216.453 225.751 216.155 225.751 215.754C225.751 215.375 226.06 215.054 226.462 215.054C226.863 215.054 227.149 215.375 227.149 215.754C227.149 216.155 226.863 216.453 226.462 216.453ZM225.957 223.721V217.989H226.943V223.721H225.957ZM231.607 223.836C229.865 223.836 228.604 222.517 228.604 220.855C228.604 219.193 229.865 217.874 231.607 217.874C232.799 217.874 233.751 218.493 234.255 219.411L233.395 219.892C233.074 219.239 232.432 218.792 231.607 218.792C230.415 218.792 229.601 219.709 229.601 220.855C229.601 222.001 230.415 222.918 231.607 222.918C232.432 222.918 233.074 222.471 233.395 221.818L234.255 222.299C233.751 223.217 232.799 223.836 231.607 223.836ZM238.293 223.836C236.505 223.836 235.324 222.54 235.324 220.855C235.324 219.17 236.551 217.874 238.305 217.874C239.795 217.874 241.033 218.918 241.033 220.752C241.033 220.855 241.033 220.924 241.022 221.05H236.322C236.356 222.116 237.17 222.93 238.305 222.93C239.188 222.93 239.738 222.54 240.093 221.933L240.873 222.471C240.357 223.308 239.486 223.836 238.293 223.836ZM236.39 220.247H240.024C239.875 219.307 239.142 218.746 238.271 218.746C237.411 218.746 236.574 219.296 236.39 220.247ZM248.679 223.836C247.808 223.836 247.039 223.388 246.661 222.838V223.721H245.675V215.123H246.661V218.872C247.039 218.322 247.808 217.874 248.679 217.874C250.284 217.874 251.487 219.216 251.487 220.855C251.487 222.494 250.284 223.836 248.679 223.836ZM248.53 222.93C249.676 222.93 250.479 222.013 250.479 220.855C250.479 219.697 249.676 218.78 248.53 218.78C247.383 218.78 246.581 219.697 246.581 220.855C246.581 222.013 247.383 222.93 248.53 222.93ZM254.548 226.117H253.447L254.697 223.423L252.186 217.989H253.275L255.247 222.345L257.207 217.989H258.308L254.548 226.117Z" fill="#535A61"/>
-<path d="M262.427 223.721V215.582H265.098C266.611 215.582 267.528 216.591 267.528 217.737C267.528 218.551 267.173 219.078 266.657 219.399C267.448 219.686 268.067 220.259 268.067 221.348C268.067 222.701 266.989 223.721 265.338 223.721H262.427ZM263.493 222.758H265.384C266.485 222.758 267.023 222.196 267.023 221.382C267.023 220.591 266.485 219.995 265.396 219.995H263.493V222.758ZM263.493 219.078H265.098C265.969 219.078 266.485 218.551 266.485 217.817C266.485 217.129 265.969 216.545 265.098 216.545H263.493V219.078ZM269.715 223.721V215.123H270.701V223.721H269.715ZM275.353 223.836C273.611 223.836 272.35 222.506 272.35 220.855C272.35 219.204 273.611 217.874 275.353 217.874C277.073 217.874 278.345 219.204 278.345 220.855C278.345 222.506 277.073 223.836 275.353 223.836ZM275.353 222.918C276.545 222.918 277.336 222.001 277.336 220.855C277.336 219.709 276.545 218.792 275.353 218.792C274.161 218.792 273.359 219.709 273.359 220.855C273.359 222.001 274.161 222.918 275.353 222.918ZM282.556 223.836C280.813 223.836 279.552 222.517 279.552 220.855C279.552 219.193 280.813 217.874 282.556 217.874C283.748 217.874 284.699 218.493 285.204 219.411L284.344 219.892C284.023 219.239 283.381 218.792 282.556 218.792C281.363 218.792 280.55 219.709 280.55 220.855C280.55 222.001 281.363 222.918 282.556 222.918C283.381 222.918 284.023 222.471 284.344 221.818L285.204 222.299C284.699 223.217 283.748 223.836 282.556 223.836ZM290.813 223.721L287.706 220.855V223.721H286.72V215.123H287.706V220.225L290.205 217.989H291.512L288.692 220.523L292.142 223.721H290.813ZM295.131 223.836C293.526 223.836 292.322 222.494 292.322 220.855C292.322 219.216 293.526 217.874 295.131 217.874C296.002 217.874 296.77 218.322 297.148 218.872V217.989H298.134V223.721H297.148V222.838C296.77 223.388 296.002 223.836 295.131 223.836ZM295.28 222.93C296.426 222.93 297.228 222.013 297.228 220.855C297.228 219.697 296.426 218.78 295.28 218.78C294.122 218.78 293.319 219.697 293.319 220.855C293.319 222.013 294.122 222.93 295.28 222.93ZM300.733 216.453C300.332 216.453 300.022 216.155 300.022 215.754C300.022 215.375 300.332 215.054 300.733 215.054C301.134 215.054 301.421 215.375 301.421 215.754C301.421 216.155 301.134 216.453 300.733 216.453ZM300.229 223.721V217.989H301.215V223.721H300.229ZM305.684 223.836C304.079 223.836 302.875 222.494 302.875 220.855C302.875 219.216 304.079 217.874 305.684 217.874C306.555 217.874 307.323 218.322 307.701 218.872V215.123H308.687V223.721H307.701V222.838C307.323 223.388 306.555 223.836 305.684 223.836ZM305.833 222.93C306.979 222.93 307.782 222.013 307.782 220.855C307.782 219.697 306.979 218.78 305.833 218.78C304.675 218.78 303.872 219.697 303.872 220.855C303.872 222.013 304.675 222.93 305.833 222.93Z" fill="#0376C9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M75.018 114.104C74.6115 112.59 74.272 111.052 73.9965 109.502L75.018 121.858V114.104ZM77.6159 153.28L78.6349 165.604C81.3001 168.447 84.6175 170.737 88.011 172.578C92.0174 174.749 96.3498 176.637 100.593 178.299C104.833 179.96 109.575 181.482 114.199 180.884C118.224 180.362 122.342 177.64 120.936 173.111C119.695 169.708 116.082 167.047 110.203 163.926C108.876 163.223 108.531 161.471 109.542 160.356C109.548 160.348 109.56 160.337 109.567 160.329C110.454 159.351 112.086 158.937 113.423 158.718C116.804 158.167 120.186 158.472 123.559 158.777C127.263 159.111 130.957 159.445 134.626 158.641C136.457 158.241 138.271 157.745 140.085 157.249C143.186 156.401 146.289 155.553 149.481 155.18C151.14 154.985 153.374 154.739 154.835 155.739C156.37 156.791 156.38 159.151 155.846 160.782C155.658 161.352 155.056 162.836 154.432 164.375C153.695 166.191 152.927 168.084 152.772 168.642C151.822 172.041 152.36 175.975 155.914 177.62C159.723 179.378 163.578 176.841 166.689 174.794C166.749 174.754 166.809 174.715 166.868 174.676C170.709 172.143 174.063 169.025 177.016 165.519C179.049 163.1 180.918 160.567 182.478 157.855L182.143 153.805H79.7946C79.0098 153.805 78.2692 153.615 77.6159 153.28Z" fill="url(#paint9_linear_6657_17714)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M75.018 76.3445C65.7583 86.4885 56.2773 96.5186 45.1358 104.522C43.3943 105.773 41.498 107.016 39.3581 107.152C37.2173 107.289 34.8309 105.887 34.6599 103.749C34.5335 102.154 35.4634 100.92 36.3951 99.6826C37.3434 98.4237 38.2934 97.1625 38.1334 95.5164C37.7761 91.8376 32.4063 88.8589 29.0169 88.6917C22.42 88.3675 14.472 95.0646 8.78563 99.856C7.7699 100.712 6.82633 101.507 5.97552 102.19C3.52535 104.157 0.947449 106.57 0.792498 109.707C0.433932 116.92 4.99538 115.463 9.3637 114.068C13.965 112.598 18.3521 111.197 16.5492 120.069C15.6123 124.677 19.4457 129.274 23.9958 130.469C28.5421 131.663 33.4046 130.164 37.4953 127.85C39.6956 126.607 41.7505 125.133 43.8061 123.658C45.5746 122.39 47.3437 121.121 49.2064 119.998C51.7637 118.455 55.4398 117.349 57.423 119.581C59.8323 122.291 57.0676 126.309 55.0051 129.29C50.9498 135.153 49.6191 142.82 51.4609 149.706C52.0895 152.055 53.1585 154.44 55.4656 155.561C56.6253 156.124 57.9904 156.198 59.133 155.598C61.4735 154.369 61.4487 151.438 60.799 149.111C59.7664 143.064 64.391 143.363 64.5343 146.08C65.1725 157.989 73.8906 166.245 85.5702 169.013L84.3251 153.805H79.7946C77.1566 153.805 75.018 151.666 75.018 149.028V76.3445Z" fill="url(#paint10_linear_6657_17714)"/>
-<defs>
-<linearGradient id="paint0_linear_6657_17714" x1="86.2696" y1="83.1482" x2="12.8486" y2="83.1482" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint1_linear_6657_17714" x1="361.895" y1="101.819" x2="367.01" y2="99.6145" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint2_linear_6657_17714" x1="337.726" y1="151.419" x2="376.895" y2="151.419" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint3_linear_6657_17714" x1="359.937" y1="66.7189" x2="394.873" y2="66.7189" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint4_linear_6657_17714" x1="408.684" y1="39.6134" x2="414.253" y2="39.6134" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint5_linear_6657_17714" x1="109.296" y1="30.6327" x2="32.9913" y2="104.534" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint6_linear_6657_17714" x1="189.992" y1="180.569" x2="155.384" y2="180.569" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint7_linear_6657_17714" x1="29.4454" y1="140.749" x2="12.9824" y2="140.749" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint8_linear_6657_17714" x1="128.516" y1="166.141" x2="134.086" y2="166.141" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint9_linear_6657_17714" x1="77.1067" y1="147.108" x2="180.874" y2="138.528" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint10_linear_6657_17714" x1="72.0621" y1="121.188" x2="-9.64425" y2="121.188" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/app/images/petnames-whatsnew-banner.svg b/app/images/petnames-whatsnew-banner.svg
deleted file mode 100644
index 3341bac312ea..000000000000
--- a/app/images/petnames-whatsnew-banner.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg width="328" height="90" viewBox="0 0 328 90" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect width="328" height="90" fill="#FAFAFA"/>
-<rect x="26" y="30" width="128.583" height="29.3526" rx="14.6763" fill="#FBEBEC"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M50.8681 44.6763C50.8681 50.3051 46.3051 54.8681 40.6763 54.8681C35.0474 54.8681 30.4844 50.3051 30.4844 44.6763C30.4844 39.0474 35.0474 34.4844 40.6763 34.4844C46.3051 34.4844 50.8681 39.0474 50.8681 44.6763ZM40.6763 39.2972C39.0397 39.2972 37.5621 40.5015 37.5621 42.1815C37.5621 42.6506 37.9423 43.0308 38.4114 43.0308C38.8804 43.0308 39.2607 42.6506 39.2607 42.1815C39.2607 41.606 39.8024 40.9959 40.6763 40.9959C41.5502 40.9959 42.0918 41.606 42.0918 42.1815C42.0918 42.501 41.9149 42.7219 41.3781 43.0512L41.3746 43.0535C40.7881 43.4173 39.8269 44.0796 39.8269 45.4057V45.6631C39.8269 46.1321 40.2072 46.5124 40.6763 46.5124C41.1453 46.5124 41.5256 46.1321 41.5256 45.6631V45.4057C41.5256 45.0648 41.7102 44.8444 42.2685 44.4979C42.8507 44.1405 43.7904 43.4788 43.7904 42.1815C43.7904 40.5015 42.3128 39.2972 40.6763 39.2972ZM40.67 47.7437C40.2009 47.7437 39.8207 48.1239 39.8207 48.593C39.8207 49.0622 40.2009 49.4423 40.67 49.4423H40.6823C41.1513 49.4423 41.5316 49.0622 41.5316 48.593C41.5316 48.1239 41.1513 47.7437 40.6823 47.7437H40.67Z" fill="#D73847"/>
-<path d="M63.2913 51.3475C60.7743 51.3475 58.9936 49.4812 58.9936 46.7758V43.3856C58.9936 40.6974 60.7743 38.8139 63.2913 38.8139C65.7911 38.8139 67.6061 40.6974 67.6061 43.3856V46.7758C67.6061 49.4812 65.7911 51.3475 63.2913 51.3475ZM63.2913 49.9092C64.9521 49.9092 66.1336 48.762 66.1336 46.7758V43.3856C66.1336 41.3994 64.9521 40.2522 63.2913 40.2522C61.6475 40.2522 60.4661 41.4165 60.4661 43.3856V46.7758C60.4661 48.7449 61.6475 49.9092 63.2913 49.9092ZM75.7743 51.1763L73.1717 47.9401L70.5691 51.1763H68.737L72.2471 46.8443L69.0281 42.6151H70.8088L73.1717 45.7142L75.5174 42.6151H77.3153L74.0792 46.8443L77.5892 51.1763H75.7743ZM79.3233 51.1763V39.0194H86.4119V40.5262H80.9157V44.2075H85.3846V45.7142H80.9157V49.6695H86.4119V51.1763H79.3233ZM96.3774 54.7548H94.9049V49.8578C94.3399 50.6797 93.1927 51.3475 91.8914 51.3475C89.4942 51.3475 87.6964 49.3442 87.6964 46.8957C87.6964 44.4472 89.4942 42.4439 91.8914 42.4439C93.1927 42.4439 94.3399 43.1116 94.9049 43.9335V42.6151H96.3774V54.7548ZM92.114 49.9948C93.8262 49.9948 95.0248 48.625 95.0248 46.8957C95.0248 45.1663 93.8262 43.7965 92.114 43.7965C90.3846 43.7965 89.186 45.1663 89.186 46.8957C89.186 48.625 90.3846 49.9948 92.114 49.9948ZM102.471 51.2619C100.964 51.2619 99.8513 50.4229 99.8513 48.6422V43.9678H98.0363V42.6151H99.8513V40.2351H101.324V42.6151H103.789V43.9678H101.324V48.4538C101.324 49.5496 101.803 49.9092 102.745 49.9092C103.105 49.9092 103.515 49.8578 103.789 49.738V51.0564C103.43 51.1763 103.002 51.2619 102.471 51.2619ZM106.441 51.3132C105.739 51.3132 105.174 50.7311 105.174 50.0291C105.174 49.3442 105.739 48.7449 106.441 48.7449C107.143 48.7449 107.708 49.3442 107.708 50.0291C107.708 50.7311 107.143 51.3132 106.441 51.3132ZM110.755 51.3132C110.053 51.3132 109.488 50.7311 109.488 50.0291C109.488 49.3442 110.053 48.7449 110.755 48.7449C111.457 48.7449 112.022 49.3442 112.022 50.0291C112.022 50.7311 111.457 51.3132 110.755 51.3132ZM115.069 51.3132C114.367 51.3132 113.802 50.7311 113.802 50.0291C113.802 49.3442 114.367 48.7449 115.069 48.7449C115.771 48.7449 116.336 49.3442 116.336 50.0291C116.336 50.7311 115.771 51.3132 115.069 51.3132ZM118.93 51.1763V43.9678H117.115V42.6151H118.93V40.8857C118.93 39.105 120.043 38.2318 121.55 38.2318C122.081 38.2318 122.492 38.3174 122.886 38.4544V39.7557C122.612 39.6358 122.167 39.5844 121.824 39.5844C120.865 39.5844 120.403 39.944 120.403 41.0398V42.6151H122.886V43.9678H120.403V51.1763H118.93ZM122.545 51.1763L127.922 39.0194H129.24L134.634 51.1763H132.973L131.398 47.6319H125.73L124.189 51.1763H122.545ZM128.555 41.1768L126.364 46.1937H130.764L128.555 41.1768ZM139.784 51.3475C137.387 51.3475 135.453 49.7209 135.453 47.4778H136.942C137.028 48.9504 138.261 49.9092 139.784 49.9092C141.137 49.9092 142.25 49.1387 142.25 47.7176C142.25 46.2108 141.171 45.5259 139.596 45.5259H138.689V44.1732H139.665C140.949 44.1732 141.891 43.3685 141.908 42.2042C141.908 41.057 140.949 40.2522 139.716 40.2522C138.346 40.2522 137.165 41.0741 137.165 42.6493H135.658C135.658 40.2693 137.473 38.8139 139.716 38.8139C141.788 38.8139 143.414 40.0981 143.414 42.1528C143.397 43.3342 142.712 44.3273 141.771 44.8068C143.003 45.3033 143.757 46.382 143.757 47.7689C143.757 49.9092 142.113 51.3475 139.784 51.3475Z" fill="#D73847"/>
-<path d="M172.335 50.483L171.335 49.463L175.823 44.9749H163.889V43.506H175.823L171.335 39.0179L172.335 37.9979L178.577 44.2405L172.335 50.483Z" fill="#24272A"/>
-<rect x="187.583" y="30" width="115.137" height="29.3526" rx="14.6763" fill="#E5F1F9"/>
-<rect x="192.475" y="34.8921" width="19.5684" height="19.5684" fill="url(#pattern0)"/>
-<path d="M224.409 49.875C227.08 49.875 229.101 47.7689 229.101 45.0978C229.101 42.4267 227.08 40.3207 224.409 40.3207C221.755 40.3207 219.735 42.4267 219.735 45.0978C219.735 47.7689 221.755 49.875 224.409 49.875ZM224.409 51.3817C220.916 51.3817 218.125 48.6079 218.125 45.0978C218.125 41.5877 220.916 38.8139 224.409 38.8139C227.919 38.8139 230.693 41.5877 230.693 45.0978C230.693 48.6079 227.919 51.3817 224.409 51.3817ZM234.327 54.7548H232.854V42.6151H234.327V43.9335C234.892 43.1116 236.039 42.4439 237.341 42.4439C239.738 42.4439 241.535 44.4472 241.535 46.8957C241.535 49.3442 239.738 51.3475 237.341 51.3475C236.039 51.3475 234.892 50.6797 234.327 49.8578V54.7548ZM237.118 49.9948C238.83 49.9948 240.029 48.625 240.029 46.8957C240.029 45.1663 238.83 43.7965 237.118 43.7965C235.406 43.7965 234.207 45.1663 234.207 46.8957C234.207 48.625 235.406 49.9948 237.118 49.9948ZM247.423 51.3475C244.752 51.3475 242.988 49.4127 242.988 46.8957C242.988 44.3787 244.821 42.4439 247.44 42.4439C249.666 42.4439 251.515 44.002 251.515 46.7416C251.515 46.8957 251.515 46.9984 251.498 47.1868H244.478C244.53 48.7791 245.745 49.9948 247.44 49.9948C248.759 49.9948 249.581 49.4127 250.111 48.5052L251.276 49.3099C250.505 50.5599 249.204 51.3475 247.423 51.3475ZM244.581 45.9882H250.009C249.786 44.5842 248.69 43.7452 247.389 43.7452C246.105 43.7452 244.855 44.567 244.581 45.9882ZM253.605 51.1763V42.6151H255.078V43.9335C255.677 42.9062 256.687 42.4439 257.8 42.4439C259.718 42.4439 261.036 43.7794 261.036 45.9026V51.1763H259.581V46.1252C259.581 44.6869 258.776 43.7965 257.561 43.7965C256.191 43.7965 255.078 44.9266 255.078 46.9299V51.1763H253.605ZM267.181 51.3817C265.178 51.3817 263.568 50.44 262.918 49.1901L264.202 48.2312C264.87 49.2586 265.845 49.8921 267.215 49.8921C268.465 49.8921 269.458 49.2243 269.458 48.0771C269.458 47.1011 268.859 46.4505 267.712 46.0224L266.102 45.406C264.185 44.704 263.346 43.7109 263.346 42.0501C263.346 40.0639 264.972 38.8139 267.147 38.8139C268.671 38.8139 269.938 39.4988 270.691 40.4748L269.527 41.5021C268.91 40.7659 268.157 40.3036 267.113 40.3036C265.914 40.3036 264.921 40.9713 264.921 41.9816C264.921 43.0089 265.52 43.4712 266.753 43.9335L268.226 44.4986C270.023 45.1834 271.051 46.2108 271.051 48.0086C271.051 50.0633 269.424 51.3817 267.181 51.3817ZM276.936 51.3475C274.265 51.3475 272.501 49.4127 272.501 46.8957C272.501 44.3787 274.333 42.4439 276.953 42.4439C279.179 42.4439 281.028 44.002 281.028 46.7416C281.028 46.8957 281.028 46.9984 281.011 47.1868H273.991C274.042 48.7791 275.258 49.9948 276.953 49.9948C278.271 49.9948 279.093 49.4127 279.624 48.5052L280.788 49.3099C280.018 50.5599 278.717 51.3475 276.936 51.3475ZM274.094 45.9882H279.521C279.299 44.5842 278.203 43.7452 276.902 43.7452C275.617 43.7452 274.367 44.567 274.094 45.9882ZM286.645 51.3475C284.248 51.3475 282.45 49.3442 282.45 46.8957C282.45 44.4472 284.248 42.4439 286.645 42.4439C287.946 42.4439 289.094 43.1116 289.659 43.9335V42.6151H291.131V51.1763H289.659V49.8578C289.094 50.6797 287.946 51.3475 286.645 51.3475ZM286.868 49.9948C288.58 49.9948 289.779 48.625 289.779 46.8957C289.779 45.1663 288.58 43.7965 286.868 43.7965C285.138 43.7965 283.94 45.1663 283.94 46.8957C283.94 48.625 285.138 49.9948 286.868 49.9948Z" fill="#0376C9"/>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_813_29590" transform="translate(-0.00625) scale(0.0125)"/>
-</pattern>
-<image id="image0_813_29590" width="81" height="80" xlink:href="data:image/png;base64,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"/>
-</defs>
-</svg>
diff --git a/app/images/simulations-whatsnew-banner-dark.svg b/app/images/simulations-whatsnew-banner-dark.svg
deleted file mode 100644
index e4d16dc13548..000000000000
--- a/app/images/simulations-whatsnew-banner-dark.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<svg width="328" height="180" viewBox="0 0 328 180" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g clip-path="url(#clip0_583_9786)">
-<rect x="-99" width="526" height="180" fill="#141618"/>
-<path d="M225.967 195.855C226.129 195.809 225.827 195.96 225.967 195.855L253.259 175.651C253.669 175.343 253.712 174.381 253.65 173.872C253.589 173.363 253.153 173.483 252.686 173.31L225.292 162.681C224.873 162.527 224.888 162.628 224.519 162.899C224.149 163.17 223.936 163.435 223.937 163.897L224.039 194.73C224.041 195.251 224.743 195.845 225.194 196.072C225.493 196.221 225.652 195.943 225.967 195.855ZM249.784 174.962L226.559 191.517L227.02 166.365L249.784 174.962Z" fill="url(#paint0_linear_583_9786)"/>
-<path d="M238.219 175.567C237.938 174.773 237.065 174.136 236.287 174.44C233.18 175.657 231.75 177.538 230.867 179.292C230.062 180.891 229.778 182.708 227.768 183.494C225.758 184.281 224.344 183.889 222.742 183.233C220.986 182.513 219.084 181.408 215.977 182.624C212.869 183.841 211.44 185.722 210.556 187.476C209.752 189.075 209.277 190.111 207.265 190.898C205.255 191.685 203.841 191.293 202.239 190.637C200.483 189.917 198.579 188.812 195.474 190.028C192.369 191.245 191.129 193.906 190.246 195.66C189.441 197.259 188.966 198.295 186.954 199.082C186.176 199.387 185.511 200.28 185.791 201.075C186.072 201.87 186.945 202.507 187.723 202.202C190.83 200.985 192.26 199.104 193.143 197.351C193.948 195.751 194.231 193.935 196.242 193.148C198.252 192.362 199.667 192.754 201.268 193.41C203.024 194.13 204.928 195.234 208.033 194.018C211.141 192.801 212.571 190.92 213.454 189.167C214.259 187.567 214.733 186.531 216.745 185.744C218.755 184.958 220.169 185.35 221.771 186.006C223.527 186.726 225.429 187.831 228.536 186.614C231.643 185.397 232.881 182.736 233.764 180.983C234.569 179.383 235.046 178.347 237.056 177.56C237.834 177.258 238.499 176.362 238.219 175.567Z" fill="url(#paint1_linear_583_9786)"/>
-<path d="M302.614 26.3494C302.548 27.6315 300.922 28.3382 299.904 28.7747C297.877 29.6449 295.67 29.7185 293.522 29.7255C290.187 29.7342 286.795 29.3884 283.47 29.2018C280.292 29.0236 276.736 28.5362 273.61 29.458C271.285 30.1444 269.247 31.9876 267.032 32.965C264.709 33.9904 262.537 34.4234 260.069 34.912C249.149 37.0757 237.167 36.0504 226.236 35.2025C225.5 35.1456 226.119 34.2224 226.817 34.2061C226.788 34.0401 226.581 33.6198 226.625 33.4262C226.666 33.254 226.361 32.8112 226.433 32.6462C226.25 32.4233 226.896 32.6527 227.206 32.4299C229.492 30.7828 232.301 30.0154 234.943 30.2665C238.257 30.5808 240.874 31.2656 244.221 31.0066C247.972 30.7164 251.705 30.0129 255.437 29.5377C258.722 29.1172 262.67 29.1662 265.686 27.5052C266.496 27.0591 266.717 26.4872 266.849 25.5126C266.911 25.0537 267.252 24.1944 267.238 23.7363C267.209 22.7546 267.771 23.1114 268.593 22.5237C270.437 21.2061 271.854 20.742 274.008 21.0093C276.422 21.3083 278.844 22.4983 281.159 23.1784C284.341 24.1139 287.908 23.8715 291.211 23.7021C294.097 23.5541 296.721 23.1268 299.524 23.8786C300.593 24.1663 302.684 24.9707 302.614 26.3494Z" fill="url(#paint2_linear_583_9786)"/>
-<path d="M191.698 0.66683C193.893 -0.956023 196.882 -0.87456 199.433 -1.50178C204.081 -2.64759 209.224 -6.32699 214.129 -5.62214C214.879 -5.51513 214.484 -3.7391 213.739 -3.84513C213.767 -3.84133 213.711 -3.84893 213.739 -3.84513C213.669 -3.7561 213.096 -3.66952 212.966 -3.62827C208.58 -2.2596 206.475 2.73369 202.706 5.08519C201.379 5.91343 200.351 6.06049 198.838 6.1695C197.095 6.29453 194.545 5.80295 192.849 5.34729C190.73 4.77866 189.545 2.25946 191.698 0.66683Z" fill="url(#paint3_linear_583_9786)"/>
-<path d="M36.1476 81.3182C27.1771 88.0576 18.1151 95.0613 13.0972 105.317C12.1144 107.325 11.0992 110.244 11.5334 112.429C12.55 117.542 19.3404 118.274 24.2711 117.186C27.0477 116.573 29.9048 114.457 29.5015 111.544C29.1565 109.035 26.7379 108.211 25.6523 105.955C24.3592 103.265 25.9304 100.195 27.7982 97.8453C41.7141 80.3244 63.6541 72.6196 84.6734 66.8321C88.9652 65.6504 94.4768 62.916 94.1612 58.3248C93.9521 55.2971 90.698 52.9082 87.801 52.6081C84.904 52.308 82.0616 53.9988 79.2948 55.0012C71.9959 57.6449 64.7501 59.0244 57.0694 58.752C50.4451 58.5159 44.5566 58.5417 43.1416 66.0064C41.7184 73.5013 43.1097 76.0887 36.1476 81.3182Z" fill="url(#paint4_linear_583_9786)"/>
-<path d="M-7.31426 68.7565C-26.0267 79.6036 -42.672 93.5796 -53.5985 112.641C-56.0885 116.986 -58.4983 121.78 -59.2377 126.738C-59.975 131.696 -58.6607 137.75 -55.6065 141.562C-51.5118 146.672 -44.726 148.141 -38.2388 148.351C-35.6951 148.434 -33.4164 148.292 -31.0882 147.173C-28.7596 146.056 -26.665 143.585 -26.8221 140.968C-27.0895 136.54 -31.8707 134.891 -35.4927 132.566C-43.7632 127.263 -45.924 114.719 -42.1818 105.258C-38.4395 95.796 -30.5971 88.3991 -23.1883 81.564C-19.1908 77.877 -14.9004 73.5974 -9.64287 72.7479C-6.50311 72.2406 -2.94921 72.8146 0.209696 72.4773C7.48059 71.7052 13.2202 66.63 19.168 62.138C28.6277 54.9912 39.6256 49.5086 51.0807 47.319C55.493 46.4743 59.8732 45.7186 63.2619 43.057C64.9499 41.7325 64.3829 38.7929 62.3063 39.1558C52.1226 40.9391 42.2325 46.3606 32.7222 49.9833C19.2069 55.1394 5.29347 61.4486 -7.31426 68.7565Z" fill="url(#paint5_linear_583_9786)"/>
-<path d="M9.9478 32.5462C9.61161 31.8659 8.8715 31.8376 8.20945 32.2003C5.56597 33.6427 5.12529 35.7352 4.52674 37.4037C3.98055 38.9273 2.94483 39.8959 1.23434 40.8297C-0.476145 41.7636 -1.32152 41.5416 -2.82423 41.1352C-4.47171 40.6905 -6.55953 40.6497 -9.20301 42.0921C-11.8465 43.5345 -12.2851 45.6264 -12.8857 47.2955C-13.4319 48.8191 -14.4676 49.7877 -16.1781 50.7215C-17.8886 51.6554 -18.734 51.4333 -20.2367 51.027C-21.8842 50.5822 -24.163 49.7635 -26.807 51.2037C-29.4505 52.6461 -29.8891 54.738 -30.4897 56.4071C-31.0359 57.9307 -31.8801 59.6794 -33.5906 60.6133C-34.2532 60.9738 -34.3192 61.711 -33.9809 62.3907C-33.6447 63.071 -32.9046 63.0992 -32.2425 62.7366C-29.5991 61.2942 -29.1605 59.2023 -28.5598 57.5332C-28.0137 56.0096 -26.9779 55.041 -25.2674 54.1071C-23.557 53.1733 -22.7116 53.3953 -21.2089 53.8017C-19.5614 54.2464 -17.4741 54.285 -14.8301 52.8448C-12.1866 51.4024 -11.748 49.3105 -11.1474 47.6414C-10.6012 46.1178 -9.56546 45.1492 -7.85498 44.2154C-6.14449 43.2815 -5.29912 43.5036 -3.79641 43.9099C-2.14892 44.3547 0.13044 45.1755 2.77392 43.7332C5.4174 42.2908 5.85808 40.1983 6.45663 38.5298C7.00282 37.0062 7.84647 35.2553 9.55748 34.3236C10.218 33.9637 10.284 33.2265 9.9478 32.5462Z" fill="#FBC49D"/>
-<path d="M305.407 79.925C305.62 79.8649 305.97 79.7991 306.18 79.7071C307.45 79.147 308.943 77.655 309.473 76.2765C310.001 74.8986 309.817 73.5462 309.292 72.157C308.21 69.2871 305.357 67.8457 302.735 69.0007C300.111 70.1562 298.542 73.6802 299.623 76.5507C300.618 79.189 302.949 80.6176 305.407 79.925ZM307.746 72.5929C308.109 73.5576 308.1 74.9762 307.736 75.932C307.372 76.8879 306.68 77.7592 305.798 78.1465C303.978 78.9484 301.918 78.1036 301.169 76.1149C300.806 75.1502 300.814 73.7315 301.179 72.7757C301.543 71.8199 302.235 70.9486 303.117 70.5613C304.936 69.7593 306.996 70.602 307.746 72.5929Z" fill="#86E29B"/>
-<path d="M294.086 99.8024C293.019 100.103 292.231 98.9747 291.967 97.8973C291.704 96.8199 292.065 96.2018 293.132 95.9009C294.2 95.6 295.57 95.7303 295.833 96.8077C296.097 97.8851 295.154 99.5015 294.086 99.8024Z" fill="url(#paint6_linear_583_9786)"/>
-<path d="M262.4 162.195C261.333 162.496 259.962 162.365 259.699 161.288C259.435 160.211 260.378 158.594 261.446 158.293C262.513 157.992 263.301 159.121 263.565 160.198C263.828 161.276 263.468 161.894 262.4 162.195Z" fill="url(#paint7_linear_583_9786)"/>
-<path d="M35.0422 16.904C33.9747 17.2049 33.3776 16.8566 33.1142 15.7792C32.8507 14.7018 33.0205 13.3033 34.088 13.0024C35.1555 12.7015 36.7166 13.6122 36.98 14.6896C37.2435 15.7669 36.1097 16.6031 35.0422 16.904Z" fill="url(#paint8_linear_583_9786)"/>
-<path d="M284.329 74.2305C283.262 74.5314 281.892 74.401 281.628 73.3236C281.365 72.2463 282.308 70.6298 283.375 70.3289C284.443 70.028 285.231 71.1566 285.494 72.234C285.758 73.3114 285.397 73.9296 284.329 74.2305Z" fill="url(#paint9_linear_583_9786)"/>
-<path d="M297.791 160.57C296.723 160.871 295.353 160.741 295.09 159.663C294.826 158.586 295.769 156.97 296.837 156.669C297.904 156.368 298.692 157.496 298.956 158.574C299.219 159.651 298.859 160.269 297.791 160.57Z" fill="url(#paint10_linear_583_9786)"/>
-<path d="M307.28 24.0737C303.098 19.6718 328.209 29.5918 327.525 35.8845C326.839 42.1778 314.935 44.3279 317.474 38.7169C319.623 33.9721 313.956 31.102 307.28 24.0737Z" fill="#FBC49D"/>
-<path d="M52.9943 31.1844C53.0146 31.1786 52.9719 31.1907 52.9943 31.1844C55.5427 30.4256 57.016 27.2016 56.2975 24.4147C55.9498 23.0643 55.1062 22.4248 53.9877 21.7293C52.8693 21.0338 51.7508 20.675 50.5134 21.0404C49.2785 21.4075 48.4299 22.2589 47.8023 23.4727C47.1748 24.6865 46.8625 26.4597 47.2102 27.8101C47.5578 29.1605 48.4014 29.8 49.5199 30.4955C50.6197 31.1772 51.7795 31.5268 52.9943 31.1844ZM50.895 22.601C51.8025 22.3452 52.585 22.2191 53.4054 22.7275C54.2412 23.2459 54.4918 23.8439 54.7511 24.8505C55.288 26.93 54.5147 29.0591 52.6126 29.6238C51.6906 29.9003 50.936 30.0162 50.1022 29.4973C49.2664 28.9789 49.0158 28.3809 48.7565 27.3743C48.4973 26.3676 48.2981 24.94 48.7663 24.0351C49.2345 23.1302 49.9745 22.8747 50.895 22.601C50.8787 22.6056 50.9093 22.597 50.895 22.601Z" fill="#75C4FD"/>
-<path d="M222.561 -6.02268C223.632 -6.37022 224.738 -6.06498 225.845 -6.11323C227.235 -6.17394 228.516 -6.25752 229.903 -6.42148C233.077 -6.79502 236.378 -7.28393 239.564 -7.47339C242.889 -7.67204 246.094 -7.91948 249.416 -7.74505C252.389 -7.59034 255.743 -7.43405 258.686 -7.01874C265.709 -6.02772 272.912 -5.7168 279.927 -4.65871C285.832 -3.76654 291.51 -2.64269 297.302 -1.21017C299.505 -0.769175 301.847 0.300828 302.706 0.604647C303.001 0.708796 302.95 1.06016 302.897 1.38491C302.933 1.34003 302.886 1.45257 302.897 1.38491C301.849 2.63945 300.144 2.03785 298.84 1.69316C297.986 1.46643 295.068 1.17488 294.591 1.22115C293.72 1.30694 292.857 1.23948 293.236 2.43682C293.702 3.90783 295.972 4.96292 297.284 5.4673C299.463 6.30578 302.351 6.48159 304.425 7.62697C306.548 8.04641 309.005 8.72568 310.602 9.22409C316.411 11.0358 321.386 14.0932 326.613 17.227C329.083 18.7069 331.409 19.9896 333.554 21.9452C335.227 23.4738 337.351 25.1071 338.175 27.3164C338.693 28.7079 338.031 30.696 336.428 30.3103C333.933 29.7134 333.218 26.8908 331.807 24.9391C328.584 20.476 323.647 17.2926 318.698 15.2851C316.221 14.2811 313.383 13.9544 310.784 13.3431C307.991 12.6867 305.178 12.2697 302.287 12.3991C299.226 12.5351 296.426 12.7789 293.4 13.2333C290.607 13.6519 287.832 13.6695 285.094 13.0695C282.346 12.4676 279.856 11.9807 277.18 11.1276C275.242 10.5103 272.593 9.78374 270.812 8.75018C269.279 7.85937 269.211 6.46357 270.821 5.41145C273.45 3.69107 276.358 5.02756 279.126 5.5752C279.141 5.57814 279.112 5.57226 279.126 5.5752C281.438 6.02946 283.229 5.32341 285.503 4.61384C286.07 4.43827 286.835 4.27363 287.05 4.17843C287.963 3.7687 289.475 3.04817 288.988 1.96481C288.448 0.771166 286.239 0.110015 285.13 -0.285411C283.32 -0.931707 281.633 -1.85306 279.727 -2.10023C279.234 -2.16506 278.69 -1.61398 278.18 -1.66483C276.94 -1.66247 275.349 -1.42657 274.123 -1.35657C271.01 -1.18291 268.163 -1.15179 265.044 -1.30263C262.294 -1.43689 260.012 -1.92036 257.321 -2.46434C254.353 -3.0645 251.1 -3.18666 248.051 -3.19064C244.974 -3.19343 242.18 -3.05314 239.163 -2.35644C236.338 -1.70436 233.337 -1.15475 230.467 -0.741972C228.278 -0.426406 226.047 -0.169184 223.899 -0.560869C222.659 -0.787431 220.574 -1.43513 220.042 -2.81109C219.426 -4.40862 221.316 -5.61892 222.561 -6.02268Z" fill="url(#paint11_linear_583_9786)"/>
-<path d="M155.849 158.176C155.875 158.173 155.824 158.181 155.849 158.176C158.514 157.832 161.11 157.083 163.781 156.8C166.713 156.49 169.586 155.786 172.486 155.208C176.84 154.342 181.606 153.746 185.834 152.323C188.009 151.59 189.647 150.524 191.831 149.818C193.941 149.135 196.638 148.346 198.796 147.878C202.897 146.99 206.629 146.886 210.596 145.424C214.689 143.916 218.668 141.899 222.399 139.635C226.225 137.311 229.862 134.995 234.202 133.846C235.961 133.38 237.5 133.445 239.23 134.112C240.596 134.639 241.319 135.562 240.776 137.016C240.137 138.73 238.24 139.926 236.712 140.649C234.434 141.726 233.11 142.41 230.714 143.153C228.199 143.933 225.468 144.466 222.975 145.309C221.806 146.173 220.75 147.748 219.685 148.726C217.576 150.667 215.246 152.256 212.525 153.222C206.514 155.355 199.935 153.828 193.763 154.281C193.241 154.321 192.742 154.667 192.215 154.713C189.172 155.361 185.78 155.856 182.736 156.52C178.126 157.525 174.036 158.635 169.388 159.405C165.551 160.04 157.395 161.079 157.395 161.079L155.654 160.731C154.156 160.506 154.331 158.377 155.849 158.176Z" fill="url(#paint12_linear_583_9786)"/>
-<path d="M346.565 86.8514C351.793 80.6902 358.689 68.865 356.486 59.8747C355.742 53.2246 347.251 48.1372 338.543 50.7438C333.74 52.1826 330.015 57.3715 333.304 59.7235C334.236 60.3898 335.768 60.8166 336.971 61.194C347.784 64.6008 348.505 77.7635 338.649 84.908C334.667 87.7949 329.927 89.5172 325.495 91.9442C313.731 98.3872 313.467 112.073 301.28 117.938C295.906 120.523 289.341 122.063 283.877 124.501C273.56 129.105 266.135 136.959 255.822 141.567C250.805 143.809 243.846 146.857 237.063 149.345C235.055 150.081 235.579 152.283 237.636 151.686C237.678 151.674 237.597 151.699 237.636 151.686C242.659 150.197 248.017 148.387 252.911 146.555C265.858 141.706 278.86 136.196 291.011 130C315.36 117.592 330.461 105.834 346.565 86.8514Z" fill="url(#paint13_linear_583_9786)"/>
-<path d="M257.224 156.329C261.583 149.369 270.706 147.68 277.923 146.359C281.756 145.657 285.986 145.104 289.717 143.888C294.272 142.401 298.139 139.32 301.908 136.302C303.032 135.402 304.784 133.691 305.973 132.661C306.765 131.974 307.224 131.251 307.91 130.451C309.58 128.5 313.18 125.037 315.267 123.386C316.843 122.14 321.36 119.984 321.839 123.212C322.191 125.585 319.959 128.313 318.541 129.973C315.804 133.179 312.578 136.305 309.055 138.468C305.329 140.756 301.281 142.664 297.254 144.277C295.252 145.079 293.099 145.299 291.066 146.011C289.581 146.532 288.066 147.461 286.617 148.092C284.614 148.964 282.57 149.506 280.621 150.606C278.017 152.075 275.362 154.008 272.688 155.331C269.912 156.703 267.403 157.917 264.371 158.495C262.18 158.913 259.081 158.866 257.416 157.109C257.106 156.78 256.969 156.735 257.224 156.329Z" fill="url(#paint14_linear_583_9786)"/>
-<path d="M103.743 188.445C136.486 184.075 146.22 178.169 127.543 174.283C108.865 170.397 101.08 177.305 102.014 181.425C102.946 185.545 93.9608 186.552 82.8661 187.616C71.7734 188.679 70.7212 191.58 103.743 188.445Z" fill="url(#paint15_linear_583_9786)"/>
-<g filter="url(#filter0_d_583_9786)">
-<rect x="41.0001" y="23" width="245.467" height="134.024" rx="2.9935" fill="#24272A"/>
-<path d="M53.8856 47.4546V40.0157H58.3594V41.1892H55.1114V43.0961H57.7307V44.2695H55.1114V46.2811H58.3594V47.4546H53.8856ZM61.2678 47.5594C60.7858 47.5594 60.3597 47.4686 59.9896 47.287C59.6194 47.0984 59.3435 46.819 59.1619 46.4488L60.0105 45.8411C60.1153 46.0646 60.2829 46.2427 60.5134 46.3754C60.7439 46.5012 60.9954 46.564 61.2678 46.564C61.4843 46.564 61.6624 46.5151 61.8021 46.4173C61.9488 46.3196 62.0221 46.1834 62.0221 46.0087C62.0221 45.8551 61.9628 45.7293 61.844 45.6316C61.7323 45.5338 61.5227 45.436 61.2154 45.3382L60.7544 45.2125C59.8254 44.961 59.3679 44.4267 59.3819 43.6094C59.3819 43.1554 59.56 42.7922 59.9162 42.5198C60.2724 42.2474 60.7195 42.1112 61.2573 42.1112C62.0675 42.1112 62.6578 42.4081 63.028 43.0018L62.2317 43.6094C61.9663 43.2532 61.6345 43.0751 61.2363 43.0751C61.0478 43.0751 60.8836 43.1205 60.7439 43.2113C60.6042 43.2951 60.5344 43.4139 60.5344 43.5675C60.5344 43.7072 60.5798 43.826 60.6706 43.9238C60.7614 44.0215 60.9255 44.1089 61.163 44.1857L61.6973 44.3428C62.1863 44.4895 62.553 44.6886 62.7975 44.9401C63.0419 45.1845 63.1642 45.5163 63.1642 45.9354C63.1642 46.4313 62.986 46.826 62.6298 47.1193C62.2736 47.4127 61.8196 47.5594 61.2678 47.5594ZM66.5616 47.507C66.0307 47.507 65.5977 47.3603 65.2624 47.0669C64.9341 46.7666 64.77 46.3335 64.77 45.7678V43.2427H63.6803V42.216H64.77V40.7596H65.9225V42.216H67.4207V43.2427H65.9225V45.5792C65.9225 45.9005 65.9923 46.131 66.132 46.2707C66.2717 46.4034 66.4952 46.4697 66.8025 46.4697C67.054 46.4697 67.26 46.4348 67.4207 46.365V47.3917C67.1692 47.4686 66.8829 47.507 66.5616 47.507ZM69.0899 41.074C68.8804 41.074 68.6988 41.0006 68.5451 40.8539C68.3915 40.7003 68.3146 40.5152 68.3146 40.2986C68.3146 40.0891 68.3915 39.911 68.5451 39.7643C68.6988 39.6106 68.8804 39.5338 69.0899 39.5338C69.3065 39.5338 69.4881 39.6106 69.6348 39.7643C69.7814 39.911 69.8548 40.0891 69.8548 40.2986C69.8548 40.5152 69.7814 40.7003 69.6348 40.8539C69.4881 41.0006 69.3065 41.074 69.0899 41.074ZM68.5137 47.4546V42.216H69.6662V47.4546H68.5137ZM77.8889 47.4546V44.5105C77.8889 44.0844 77.8085 43.7526 77.6479 43.5151C77.4942 43.2777 77.2637 43.1589 76.9564 43.1589C76.5862 43.1589 76.2893 43.3021 76.0658 43.5885C75.8423 43.8749 75.7236 44.2765 75.7096 44.7934V47.4546H74.5571V44.5105C74.5571 44.0844 74.4768 43.7526 74.3161 43.5151C74.1624 43.2777 73.932 43.1589 73.6246 43.1589C73.2405 43.1589 72.9331 43.3091 72.7026 43.6094C72.4791 43.9098 72.3673 44.3324 72.3673 44.8772V47.4546H71.2149V42.216H72.3673V42.9284C72.6887 42.3836 73.1846 42.1112 73.8551 42.1112C74.6444 42.1112 75.1857 42.4569 75.4791 43.1484C75.6258 42.8202 75.8493 42.5652 76.1496 42.3836C76.457 42.202 76.7922 42.1112 77.1554 42.1112C77.7422 42.1112 78.2032 42.3103 78.5384 42.7084C78.8737 43.1065 79.0414 43.6444 79.0414 44.3219V47.4546H77.8889ZM82.6633 47.5594C81.9508 47.5594 81.3501 47.2939 80.8612 46.7631C80.3792 46.2322 80.1383 45.5896 80.1383 44.8353C80.1383 44.0809 80.3792 43.4383 80.8612 42.9075C81.3501 42.3766 81.9508 42.1112 82.6633 42.1112C83.0195 42.1112 83.3478 42.1915 83.6481 42.3522C83.9485 42.5058 84.179 42.6944 84.3396 42.9179V42.216H85.4921V47.4546H84.3396V46.7526C84.179 46.9761 83.9485 47.1682 83.6481 47.3289C83.3478 47.4825 83.0195 47.5594 82.6633 47.5594ZM81.7518 46.0297C82.0451 46.351 82.4188 46.5116 82.8728 46.5116C83.3268 46.5116 83.7005 46.351 83.9939 46.0297C84.2873 45.7084 84.4339 45.3102 84.4339 44.8353C84.4339 44.3603 84.2873 43.9622 83.9939 43.6409C83.7005 43.3196 83.3268 43.1589 82.8728 43.1589C82.4188 43.1589 82.0451 43.3196 81.7518 43.6409C81.4584 43.9622 81.3117 44.3603 81.3117 44.8353C81.3117 45.3102 81.4584 45.7084 81.7518 46.0297ZM89.3271 47.507C88.7962 47.507 88.3631 47.3603 88.0279 47.0669C87.6996 46.7666 87.5354 46.3335 87.5354 45.7678V43.2427H86.4458V42.216H87.5354V40.7596H88.6879V42.216H90.1862V43.2427H88.6879V45.5792C88.6879 45.9005 88.7578 46.131 88.8975 46.2707C89.0372 46.4034 89.2607 46.4697 89.568 46.4697C89.8195 46.4697 90.0255 46.4348 90.1862 46.365V47.3917C89.9347 47.4686 89.6484 47.507 89.3271 47.507ZM93.5754 47.5594C92.7791 47.5594 92.1226 47.3044 91.6057 46.7945C91.0958 46.2846 90.8408 45.6316 90.8408 44.8353C90.8408 44.06 91.0993 43.4139 91.6162 42.897C92.133 42.3731 92.7861 42.1112 93.5754 42.1112C94.3018 42.1112 94.9025 42.3417 95.3775 42.8027C95.8594 43.2637 96.1004 43.8993 96.1004 44.7096C96.1004 44.8492 96.0969 44.975 96.0899 45.0867H91.9724C92.0003 45.5128 92.1645 45.8586 92.4648 46.124C92.7652 46.3824 93.1389 46.5116 93.5859 46.5116C94.2564 46.5116 94.7558 46.2462 95.0841 45.7154L95.9642 46.344C95.4613 47.1542 94.665 47.5594 93.5754 47.5594ZM92.0248 44.2486H94.9374C94.8746 43.8853 94.7104 43.6025 94.445 43.3999C94.1866 43.1904 93.8827 43.0856 93.5335 43.0856C93.1703 43.0856 92.8455 43.1869 92.5591 43.3894C92.2797 43.592 92.1016 43.8784 92.0248 44.2486ZM99.433 47.5594C98.7206 47.5594 98.1199 47.2939 97.6309 46.7631C97.149 46.2322 96.908 45.5896 96.908 44.8353C96.908 44.0809 97.149 43.4383 97.6309 42.9075C98.1199 42.3766 98.7206 42.1112 99.433 42.1112C99.7892 42.1112 100.118 42.1915 100.418 42.3522C100.718 42.5058 100.949 42.6944 101.109 42.9179V39.5967H102.262V47.4546H101.109V46.7526C100.949 46.9761 100.718 47.1682 100.418 47.3289C100.118 47.4825 99.7892 47.5594 99.433 47.5594ZM98.5215 46.0297C98.8148 46.351 99.1885 46.5116 99.6426 46.5116C100.097 46.5116 100.47 46.351 100.764 46.0297C101.057 45.7084 101.204 45.3102 101.204 44.8353C101.204 44.3603 101.057 43.9622 100.764 43.6409C100.47 43.3196 100.097 43.1589 99.6426 43.1589C99.1885 43.1589 98.8148 43.3196 98.5215 43.6409C98.2281 43.9622 98.0814 44.3603 98.0814 44.8353C98.0814 45.3102 98.2281 45.7084 98.5215 46.0297ZM108.678 47.5594C107.889 47.5594 107.229 47.3009 106.698 46.784C106.174 46.2602 105.912 45.6106 105.912 44.8353C105.912 44.06 106.174 43.4139 106.698 42.897C107.229 42.3731 107.889 42.1112 108.678 42.1112C109.216 42.1112 109.698 42.2404 110.124 42.4989C110.557 42.7573 110.889 43.11 111.119 43.5571L110.113 44.1019C109.981 43.8225 109.788 43.599 109.537 43.4313C109.286 43.2637 108.999 43.1799 108.678 43.1799C108.217 43.1799 107.836 43.3405 107.536 43.6618C107.235 43.9761 107.085 44.3673 107.085 44.8353C107.085 45.3033 107.235 45.6979 107.536 46.0192C107.836 46.3335 108.217 46.4907 108.678 46.4907C108.999 46.4907 109.286 46.4069 109.537 46.2392C109.788 46.0716 109.981 45.8481 110.113 45.5687L111.119 46.1135C110.889 46.5605 110.557 46.9133 110.124 47.1717C109.698 47.4301 109.216 47.5594 108.678 47.5594ZM113.325 47.4546H112.172V39.5967H113.325V42.9284C113.653 42.3836 114.184 42.1112 114.917 42.1112C115.525 42.1112 116.01 42.3103 116.374 42.7084C116.737 43.1065 116.918 43.6374 116.918 44.3009V47.4546H115.766V44.4895C115.766 44.0704 115.668 43.7456 115.473 43.5151C115.277 43.2777 115.012 43.1589 114.676 43.1589C114.278 43.1589 113.953 43.3091 113.702 43.6094C113.45 43.9098 113.325 44.3324 113.325 44.8772V47.4546ZM120.541 47.5594C119.829 47.5594 119.228 47.2939 118.739 46.7631C118.257 46.2322 118.016 45.5896 118.016 44.8353C118.016 44.0809 118.257 43.4383 118.739 42.9075C119.228 42.3766 119.829 42.1112 120.541 42.1112C120.897 42.1112 121.225 42.1915 121.526 42.3522C121.826 42.5058 122.057 42.6944 122.217 42.9179V42.216H123.37V47.4546H122.217V46.7526C122.057 46.9761 121.826 47.1682 121.526 47.3289C121.225 47.4825 120.897 47.5594 120.541 47.5594ZM119.629 46.0297C119.923 46.351 120.296 46.5116 120.751 46.5116C121.205 46.5116 121.578 46.351 121.872 46.0297C122.165 45.7084 122.312 45.3102 122.312 44.8353C122.312 44.3603 122.165 43.9622 121.872 43.6409C121.578 43.3196 121.205 43.1589 120.751 43.1589C120.296 43.1589 119.923 43.3196 119.629 43.6409C119.336 43.9622 119.189 44.3603 119.189 44.8353C119.189 45.3102 119.336 45.7084 119.629 46.0297ZM124.931 47.4546V42.216H126.084V42.9284C126.412 42.3836 126.943 42.1112 127.676 42.1112C128.284 42.1112 128.769 42.3103 129.133 42.7084C129.496 43.1065 129.677 43.6374 129.677 44.3009V47.4546H128.525V44.4895C128.525 44.0704 128.427 43.7456 128.231 43.5151C128.036 43.2777 127.771 43.1589 127.435 43.1589C127.037 43.1589 126.712 43.3091 126.461 43.6094C126.209 43.9098 126.084 44.3324 126.084 44.8772V47.4546H124.931ZM132.399 45.9144C132.699 46.2148 133.069 46.365 133.509 46.365C133.949 46.365 134.32 46.2148 134.62 45.9144C134.92 45.6071 135.071 45.2229 135.071 44.7619C135.071 44.3009 134.92 43.9203 134.62 43.6199C134.32 43.3126 133.949 43.1589 133.509 43.1589C133.069 43.1589 132.699 43.3126 132.399 43.6199C132.098 43.9203 131.948 44.3009 131.948 44.7619C131.948 45.2229 132.098 45.6071 132.399 45.9144ZM133.405 49.7491C132.895 49.7491 132.423 49.6618 131.99 49.4872C131.557 49.3195 131.211 49.0855 130.953 48.7852L131.655 47.9575C132.123 48.4674 132.703 48.7223 133.394 48.7223C133.848 48.7223 134.225 48.5757 134.526 48.2823C134.826 47.9959 134.976 47.5978 134.976 47.0879V46.6059C134.809 46.8434 134.575 47.039 134.274 47.1927C133.974 47.3463 133.649 47.4232 133.3 47.4232C132.594 47.4232 131.997 47.1682 131.508 46.6583C131.026 46.1414 130.785 45.5093 130.785 44.7619C130.785 44.0215 131.026 43.3964 131.508 42.8865C131.997 42.3696 132.594 42.1112 133.3 42.1112C133.649 42.1112 133.974 42.188 134.274 42.3417C134.575 42.4884 134.809 42.6805 134.976 42.9179V42.216H136.129V47.0984C136.129 47.9715 135.877 48.6315 135.374 49.0786C134.878 49.5256 134.222 49.7491 133.405 49.7491ZM140.048 47.5594C139.251 47.5594 138.595 47.3044 138.078 46.7945C137.568 46.2846 137.313 45.6316 137.313 44.8353C137.313 44.06 137.572 43.4139 138.088 42.897C138.605 42.3731 139.258 42.1112 140.048 42.1112C140.774 42.1112 141.375 42.3417 141.85 42.8027C142.332 43.2637 142.573 43.8993 142.573 44.7096C142.573 44.8492 142.569 44.975 142.562 45.0867H138.445C138.473 45.5128 138.637 45.8586 138.937 46.124C139.237 46.3824 139.611 46.5116 140.058 46.5116C140.729 46.5116 141.228 46.2462 141.556 45.7154L142.437 46.344C141.934 47.1542 141.137 47.5594 140.048 47.5594ZM138.497 44.2486H141.41C141.347 43.8853 141.183 43.6025 140.917 43.3999C140.659 43.1904 140.355 43.0856 140.006 43.0856C139.643 43.0856 139.318 43.1869 139.031 43.3894C138.752 43.592 138.574 43.8784 138.497 44.2486ZM145.423 47.5594C144.941 47.5594 144.515 47.4686 144.145 47.287C143.775 47.0984 143.499 46.819 143.317 46.4488L144.166 45.8411C144.271 46.0646 144.438 46.2427 144.669 46.3754C144.899 46.5012 145.151 46.564 145.423 46.564C145.64 46.564 145.818 46.5151 145.958 46.4173C146.104 46.3196 146.178 46.1834 146.178 46.0087C146.178 45.8551 146.118 45.7293 146 45.6316C145.888 45.5338 145.678 45.436 145.371 45.3382L144.91 45.2125C143.981 44.961 143.523 44.4267 143.537 43.6094C143.537 43.1554 143.716 42.7922 144.072 42.5198C144.428 42.2474 144.875 42.1112 145.413 42.1112C146.223 42.1112 146.813 42.4081 147.184 43.0018L146.387 43.6094C146.122 43.2532 145.79 43.0751 145.392 43.0751C145.203 43.0751 145.039 43.1205 144.899 43.2113C144.76 43.2951 144.69 43.4139 144.69 43.5675C144.69 43.7072 144.735 43.826 144.826 43.9238C144.917 44.0215 145.081 44.1089 145.319 44.1857L145.853 44.3428C146.342 44.4895 146.709 44.6886 146.953 44.9401C147.197 45.1845 147.32 45.5163 147.32 45.9354C147.32 46.4313 147.142 46.826 146.785 47.1193C146.429 47.4127 145.975 47.5594 145.423 47.5594Z" fill="#BBC0C5"/>
-<path d="M156.954 38.9658C155.968 38.9658 155.003 39.2584 154.183 39.8066C153.362 40.3549 152.723 41.1341 152.345 42.0457C151.967 42.9574 151.869 43.9605 152.061 44.9283C152.254 45.8961 152.729 46.7851 153.427 47.4829C154.124 48.1806 155.013 48.6558 155.981 48.8483C156.949 49.0408 157.952 48.942 158.864 48.5644C159.775 48.1867 160.555 47.5473 161.103 46.7268C161.651 45.9063 161.944 44.9417 161.944 43.955C161.941 42.6326 161.415 41.365 160.48 40.4299C159.544 39.4948 158.277 38.9684 156.954 38.9658ZM156.859 41.2685C156.972 41.2685 157.084 41.3023 157.178 41.3655C157.273 41.4288 157.347 41.5187 157.39 41.6239C157.434 41.7291 157.445 41.8448 157.423 41.9565C157.401 42.0682 157.346 42.1707 157.266 42.2512C157.185 42.3318 157.083 42.3866 156.971 42.4088C156.859 42.431 156.743 42.4196 156.638 42.376C156.533 42.3325 156.443 42.2587 156.38 42.164C156.317 42.0693 156.283 41.958 156.283 41.8442C156.283 41.6915 156.344 41.5451 156.451 41.4371C156.559 41.3292 156.706 41.2685 156.859 41.2685ZM157.338 46.6415H156.954C156.853 46.6415 156.755 46.601 156.683 46.529C156.611 46.4571 156.571 46.3595 156.571 46.2577V43.955C156.469 43.955 156.371 43.9145 156.299 43.8426C156.227 43.7706 156.187 43.673 156.187 43.5712C156.187 43.4694 156.227 43.3718 156.299 43.2998C156.371 43.2279 156.469 43.1874 156.571 43.1874H156.954C157.056 43.1874 157.154 43.2279 157.226 43.2998C157.298 43.3718 157.338 43.4694 157.338 43.5712V45.8739C157.44 45.8739 157.538 45.9143 157.61 45.9863C157.682 46.0583 157.722 46.1559 157.722 46.2577C157.722 46.3595 157.682 46.4571 157.61 46.529C157.538 46.601 157.44 46.6415 157.338 46.6415Z" fill="#BBC0C5"/>
-<path d="M55.9286 76.6411V73.4979L53.1103 69.2023H54.5456L56.5363 72.2826L58.5375 69.2023H59.9833L57.1545 73.5084V76.6411H55.9286ZM63.9185 75.9601C63.3947 76.484 62.7451 76.7459 61.9698 76.7459C61.1944 76.7459 60.5414 76.484 60.0105 75.9601C59.4866 75.4292 59.2247 74.7831 59.2247 74.0218C59.2247 73.2605 59.4866 72.6179 60.0105 72.094C60.5414 71.5631 61.1944 71.2977 61.9698 71.2977C62.7451 71.2977 63.3947 71.5631 63.9185 72.094C64.4494 72.6179 64.7148 73.2605 64.7148 74.0218C64.7148 74.7831 64.4494 75.4292 63.9185 75.9601ZM61.9698 75.6772C62.4238 75.6772 62.7975 75.52 63.0908 75.2057C63.3912 74.8844 63.5413 74.4898 63.5413 74.0218C63.5413 73.5538 63.3912 73.1627 63.0908 72.8484C62.7975 72.5271 62.4238 72.3664 61.9698 72.3664C61.5088 72.3664 61.1281 72.5271 60.8277 72.8484C60.5344 73.1627 60.3877 73.5538 60.3877 74.0218C60.3877 74.4898 60.5344 74.8844 60.8277 75.2057C61.1281 75.52 61.5088 75.6772 61.9698 75.6772ZM67.7493 76.7459C67.1486 76.7459 66.6737 76.5468 66.3244 76.1487C65.9752 75.7436 65.8006 75.2057 65.8006 74.5352V71.4025H66.9531V74.3466C66.9531 74.7657 67.0439 75.0975 67.2255 75.3419C67.4071 75.5794 67.6655 75.6982 68.0008 75.6982C68.3919 75.6982 68.7028 75.5515 68.9333 75.2581C69.1638 74.9578 69.279 74.5317 69.279 73.9799V71.4025H70.4315V76.6411H69.279V75.9287C68.9717 76.4735 68.4618 76.7459 67.7493 76.7459ZM76.1139 76.7459C75.632 76.7459 75.2059 76.6551 74.8357 76.4735C74.4655 76.2849 74.1896 76.0055 74.008 75.6353L74.8567 75.0276C74.9614 75.2511 75.1291 75.4292 75.3596 75.562C75.5901 75.6877 75.8415 75.7505 76.1139 75.7505C76.3305 75.7505 76.5086 75.7017 76.6483 75.6039C76.795 75.5061 76.8683 75.3699 76.8683 75.1953C76.8683 75.0416 76.8089 74.9159 76.6902 74.8181C76.5784 74.7203 76.3689 74.6225 76.0616 74.5247L75.6006 74.399C74.6716 74.1475 74.2141 73.6132 74.228 72.796C74.228 72.342 74.4062 71.9787 74.7624 71.7063C75.1186 71.4339 75.5656 71.2977 76.1035 71.2977C76.9137 71.2977 77.5039 71.5946 77.8741 72.1883L77.0778 72.796C76.8124 72.4397 76.4806 72.2616 76.0825 72.2616C75.8939 72.2616 75.7298 72.307 75.5901 72.3978C75.4504 72.4816 75.3805 72.6004 75.3805 72.7541C75.3805 72.8938 75.4259 73.0125 75.5167 73.1103C75.6075 73.2081 75.7717 73.2954 76.0092 73.3722L76.5435 73.5294C77.0324 73.6761 77.3992 73.8751 77.6436 74.1266C77.8881 74.371 78.0103 74.7028 78.0103 75.1219C78.0103 75.6178 77.8322 76.0125 77.476 76.3058C77.1198 76.5992 76.6657 76.7459 76.1139 76.7459ZM81.5736 76.7459C80.7774 76.7459 80.1208 76.4909 79.6039 75.981C79.094 75.4712 78.8391 74.8181 78.8391 74.0218C78.8391 73.2465 79.0975 72.6004 79.6144 72.0835C80.1313 71.5597 80.7844 71.2977 81.5736 71.2977C82.3001 71.2977 82.9008 71.5282 83.3757 71.9892C83.8577 72.4502 84.0987 73.0858 84.0987 73.8961C84.0987 74.0358 84.0952 74.1615 84.0882 74.2733H79.9706C79.9986 74.6993 80.1627 75.0451 80.4631 75.3105C80.7634 75.5689 81.1371 75.6982 81.5841 75.6982C82.2547 75.6982 82.7541 75.4327 83.0824 74.9019L83.9625 75.5305C83.4596 76.3408 82.6633 76.7459 81.5736 76.7459ZM80.023 73.4351H82.9357C82.8728 73.0719 82.7087 72.789 82.4433 72.5864C82.1848 72.3769 81.881 72.2721 81.5317 72.2721C81.1685 72.2721 80.8437 72.3734 80.5574 72.5759C80.278 72.7785 80.0999 73.0649 80.023 73.4351ZM85.2834 76.6411V71.4025H86.4359V72.1149C86.7642 71.5701 87.295 71.2977 88.0284 71.2977C88.6361 71.2977 89.1216 71.4968 89.4848 71.8949C89.848 72.2931 90.0296 72.8239 90.0296 73.4875V76.6411H88.8771V73.6761C88.8771 73.257 88.7793 72.9322 88.5837 72.7017C88.3882 72.4642 88.1227 72.3454 87.7875 72.3454C87.3893 72.3454 87.0645 72.4956 86.8131 72.796C86.5616 73.0963 86.4359 73.5189 86.4359 74.0637V76.6411H85.2834ZM93.6521 76.7459C92.9397 76.7459 92.339 76.4805 91.85 75.9496C91.3681 75.4188 91.1271 74.7762 91.1271 74.0218C91.1271 73.2674 91.3681 72.6248 91.85 72.094C92.339 71.5631 92.9397 71.2977 93.6521 71.2977C94.0083 71.2977 94.3366 71.378 94.637 71.5387C94.9373 71.6924 95.1678 71.881 95.3285 72.1045V68.7832H96.481V76.6411H95.3285V75.9391C95.1678 76.1627 94.9373 76.3547 94.637 76.5154C94.3366 76.6691 94.0083 76.7459 93.6521 76.7459ZM92.7406 75.2162C93.034 75.5375 93.4076 75.6982 93.8617 75.6982C94.3157 75.6982 94.6894 75.5375 94.9827 75.2162C95.2761 74.8949 95.4228 74.4968 95.4228 74.0218C95.4228 73.5468 95.2761 73.1487 94.9827 72.8274C94.6894 72.5061 94.3157 72.3454 93.8617 72.3454C93.4076 72.3454 93.034 72.5061 92.7406 72.8274C92.4472 73.1487 92.3005 73.5468 92.3005 74.0218C92.3005 74.4968 92.4472 74.8949 92.7406 75.2162Z" fill="#BBC0C5"/>
-<rect x="173.577" y="64.1606" width="53.974" height="17.961" rx="8.98049" fill="#E06470" fill-opacity="0.15"/>
-<path d="M180.214 74.2733V73.1417H183.032V74.2733H180.214ZM191.351 75.9496C190.848 76.4805 190.202 76.7459 189.413 76.7459C188.623 76.7459 187.977 76.4805 187.474 75.9496C186.971 75.4118 186.72 74.7238 186.72 73.8856V71.9368C186.72 71.0987 186.971 70.4141 187.474 69.8833C187.977 69.3455 188.623 69.0765 189.413 69.0765C190.202 69.0765 190.848 69.3455 191.351 69.8833C191.861 70.4141 192.116 71.0987 192.116 71.9368V73.8856C192.116 74.7238 191.861 75.4118 191.351 75.9496ZM189.413 75.6143C189.88 75.6143 190.254 75.4607 190.534 75.1533C190.82 74.846 190.963 74.4234 190.963 73.8856V71.9368C190.963 71.399 190.82 70.9764 190.534 70.6691C190.254 70.3618 189.88 70.2081 189.413 70.2081C188.952 70.2081 188.578 70.3618 188.291 70.6691C188.012 70.9764 187.872 71.399 187.872 71.9368V73.8856C187.872 74.4234 188.012 74.846 188.291 75.1533C188.578 75.4607 188.952 75.6143 189.413 75.6143ZM193.972 76.7249C193.728 76.7249 193.515 76.6376 193.333 76.463C193.159 76.2814 193.071 76.0649 193.071 75.8134C193.071 75.5689 193.159 75.3559 193.333 75.1743C193.515 74.9927 193.728 74.9019 193.972 74.9019C194.224 74.9019 194.437 74.9927 194.611 75.1743C194.793 75.3559 194.884 75.5689 194.884 75.8134C194.884 76.0649 194.793 76.2814 194.611 76.463C194.437 76.6376 194.224 76.7249 193.972 76.7249ZM200.477 75.9496C199.975 76.4805 199.328 76.7459 198.539 76.7459C197.75 76.7459 197.104 76.4805 196.601 75.9496C196.098 75.4118 195.847 74.7238 195.847 73.8856V71.9368C195.847 71.0987 196.098 70.4141 196.601 69.8833C197.104 69.3455 197.75 69.0765 198.539 69.0765C199.328 69.0765 199.975 69.3455 200.477 69.8833C200.987 70.4141 201.242 71.0987 201.242 71.9368V73.8856C201.242 74.7238 200.987 75.4118 200.477 75.9496ZM198.539 75.6143C199.007 75.6143 199.381 75.4607 199.66 75.1533C199.947 74.846 200.09 74.4234 200.09 73.8856V71.9368C200.09 71.399 199.947 70.9764 199.66 70.6691C199.381 70.3618 199.007 70.2081 198.539 70.2081C198.078 70.2081 197.704 70.3618 197.418 70.6691C197.139 70.9764 196.999 71.399 196.999 71.9368V73.8856C196.999 74.4234 197.139 74.846 197.418 75.1533C197.704 75.4607 198.078 75.6143 198.539 75.6143ZM207.036 75.9496C206.533 76.4805 205.887 76.7459 205.098 76.7459C204.308 76.7459 203.662 76.4805 203.159 75.9496C202.656 75.4118 202.405 74.7238 202.405 73.8856V71.9368C202.405 71.0987 202.656 70.4141 203.159 69.8833C203.662 69.3455 204.308 69.0765 205.098 69.0765C205.887 69.0765 206.533 69.3455 207.036 69.8833C207.546 70.4141 207.801 71.0987 207.801 71.9368V73.8856C207.801 74.7238 207.546 75.4118 207.036 75.9496ZM205.098 75.6143C205.566 75.6143 205.939 75.4607 206.219 75.1533C206.505 74.846 206.648 74.4234 206.648 73.8856V71.9368C206.648 71.399 206.505 70.9764 206.219 70.6691C205.939 70.3618 205.566 70.2081 205.098 70.2081C204.637 70.2081 204.263 70.3618 203.977 70.6691C203.697 70.9764 203.558 71.399 203.558 71.9368V73.8856C203.558 74.4234 203.697 74.846 203.977 75.1533C204.263 75.4607 204.637 75.6143 205.098 75.6143ZM213.594 75.9496C213.092 76.4805 212.445 76.7459 211.656 76.7459C210.867 76.7459 210.221 76.4805 209.718 75.9496C209.215 75.4118 208.964 74.7238 208.964 73.8856V71.9368C208.964 71.0987 209.215 70.4141 209.718 69.8833C210.221 69.3455 210.867 69.0765 211.656 69.0765C212.445 69.0765 213.092 69.3455 213.594 69.8833C214.104 70.4141 214.359 71.0987 214.359 71.9368V73.8856C214.359 74.7238 214.104 75.4118 213.594 75.9496ZM211.656 75.6143C212.124 75.6143 212.498 75.4607 212.777 75.1533C213.064 74.846 213.207 74.4234 213.207 73.8856V71.9368C213.207 71.399 213.064 70.9764 212.777 70.6691C212.498 70.3618 212.124 70.2081 211.656 70.2081C211.195 70.2081 210.821 70.3618 210.535 70.6691C210.256 70.9764 210.116 71.399 210.116 71.9368V73.8856C210.116 74.4234 210.256 74.846 210.535 75.1533C210.821 75.4607 211.195 75.6143 211.656 75.6143ZM218.959 76.6411V74.7762H215.113V73.8437L219.084 69.2023H220.111V73.7075H221.106V74.7762H220.111V76.6411H218.959ZM216.559 73.7075H218.959V70.9205L216.559 73.7075Z" fill="#F1B9BE"/>
-<rect x="230.545" y="64.1606" width="43.948" height="17.961" rx="8.98049" fill="#141618"/>
-<g clip-path="url(#clip1_583_9786)">
-<rect x="233.538" y="67.1543" width="11.974" height="11.974" fill="url(#pattern0)"/>
-</g>
-<path d="M249.607 76.6411V69.2023H253.944V70.1243H250.581V72.3769H253.316V73.2989H250.581V75.7191H253.944V76.6411H249.607ZM256.948 76.6411V70.1243H254.632V69.2023H260.217V70.1243H257.901V76.6411H256.948ZM261.384 76.6411V69.2023H262.358V72.3769H266.434V69.2023H267.408V76.6411H266.434V73.2884H262.358V76.6411H261.384Z" fill="white"/>
-<path d="M247.44 95.4084V94.69C246.507 94.5912 245.743 93.9716 245.716 92.8221H246.489C246.569 93.4956 246.929 93.8369 247.44 93.9356V91.6995L247.135 91.5828C246.174 91.1966 245.752 90.5949 245.752 89.7687C245.752 88.7808 246.498 88.2151 247.44 88.1432V87.4517H247.925V88.1612C248.716 88.2779 249.461 88.8168 249.461 89.7597H248.689C248.617 89.3197 248.348 89.0143 247.925 88.9156V91.017L248.15 91.1068C249.093 91.493 249.605 92.0497 249.605 92.9747C249.605 94.0793 248.877 94.6271 247.925 94.699V95.4084H247.44ZM248.832 93.0286C248.832 92.4539 248.509 92.1485 247.925 91.8971V93.9536C248.428 93.8907 248.832 93.5315 248.832 93.0286ZM246.524 89.7687C246.524 90.2626 246.794 90.55 247.44 90.8284V88.8886C246.866 88.9515 246.524 89.3017 246.524 89.7687ZM253.847 94.6182V89.0054H252.616L253.245 88.242H254.619V94.6182H253.847ZM256.783 94.69C256.415 94.69 256.119 94.3847 256.119 94.0165C256.119 93.6573 256.415 93.3429 256.783 93.3429C257.152 93.3429 257.448 93.6573 257.448 94.0165C257.448 94.3847 257.152 94.69 256.783 94.69ZM262.673 93.8728V94.6182H258.542V94.3128C258.542 92.9478 259.736 92.3192 260.679 91.6187C261.424 91.0709 261.811 90.7386 261.811 89.9932C261.811 89.3197 261.335 88.8886 260.643 88.8886C259.952 88.8886 259.323 89.3197 259.323 90.1459H258.533C258.533 88.9245 259.449 88.1342 260.634 88.1342C261.694 88.1342 262.601 88.7539 262.601 90.0022C262.601 90.9362 262.17 91.475 261.128 92.2294C260.392 92.7772 259.637 93.1274 259.494 93.8728H262.673ZM265.964 94.708C264.706 94.708 263.692 93.8548 263.692 92.6784H264.473C264.518 93.4507 265.164 93.9536 265.964 93.9536C266.673 93.9536 267.257 93.5495 267.257 92.8041C267.257 92.0138 266.691 91.6546 265.865 91.6546H265.389V90.9451H265.901C266.574 90.9451 267.068 90.5231 267.077 89.9124C267.077 89.3107 266.574 88.8886 265.928 88.8886C265.209 88.8886 264.59 89.3197 264.59 90.1459H263.799C263.799 88.8976 264.751 88.1342 265.928 88.1342C267.014 88.1342 267.868 88.8078 267.868 89.8854C267.859 90.5051 267.499 91.026 267.005 91.2774C267.652 91.5379 268.047 92.1036 268.047 92.831C268.047 93.9536 267.185 94.708 265.964 94.708Z" fill="#BBC0C5"/>
-<path d="M55.9286 123.073V119.93L53.1103 115.634H54.5456L56.5363 118.714L58.5375 115.634H59.9833L57.1545 119.94V123.073H55.9286ZM63.9185 122.392C63.3947 122.916 62.7451 123.178 61.9698 123.178C61.1944 123.178 60.5414 122.916 60.0105 122.392C59.4866 121.861 59.2247 121.215 59.2247 120.453C59.2247 119.692 59.4866 119.049 60.0105 118.526C60.5414 117.995 61.1944 117.729 61.9698 117.729C62.7451 117.729 63.3947 117.995 63.9185 118.526C64.4494 119.049 64.7148 119.692 64.7148 120.453C64.7148 121.215 64.4494 121.861 63.9185 122.392ZM61.9698 122.109C62.4238 122.109 62.7975 121.952 63.0908 121.637C63.3912 121.316 63.5413 120.921 63.5413 120.453C63.5413 119.985 63.3912 119.594 63.0908 119.28C62.7975 118.959 62.4238 118.798 61.9698 118.798C61.5088 118.798 61.1281 118.959 60.8277 119.28C60.5344 119.594 60.3877 119.985 60.3877 120.453C60.3877 120.921 60.5344 121.316 60.8277 121.637C61.1281 121.952 61.5088 122.109 61.9698 122.109ZM67.7493 123.178C67.1486 123.178 66.6737 122.978 66.3244 122.58C65.9752 122.175 65.8006 121.637 65.8006 120.967V117.834H66.9531V120.778C66.9531 121.197 67.0439 121.529 67.2255 121.774C67.4071 122.011 67.6655 122.13 68.0008 122.13C68.3919 122.13 68.7028 121.983 68.9333 121.69C69.1638 121.389 69.279 120.963 69.279 120.412V117.834H70.4315V123.073H69.279V122.36C68.9717 122.905 68.4618 123.178 67.7493 123.178ZM74.4481 123.073V117.834H75.6006V118.767C75.6983 118.473 75.8765 118.236 76.1349 118.054C76.4003 117.873 76.6832 117.782 76.9836 117.782C77.1652 117.782 77.3153 117.796 77.4341 117.824V119.008C77.2664 118.945 77.0744 118.913 76.8578 118.913C76.5086 118.913 76.2117 119.056 75.9673 119.343C75.7228 119.622 75.6006 120.013 75.6006 120.516V123.073H74.4481ZM80.6119 123.178C79.8156 123.178 79.159 122.923 78.6422 122.413C78.1323 121.903 77.8773 121.25 77.8773 120.453C77.8773 119.678 78.1358 119.032 78.6526 118.515C79.1695 117.991 79.8226 117.729 80.6119 117.729C81.3383 117.729 81.939 117.96 82.414 118.421C82.8959 118.882 83.1369 119.517 83.1369 120.328C83.1369 120.467 83.1334 120.593 83.1264 120.705H79.0089C79.0368 121.131 79.2009 121.477 79.5013 121.742C79.8016 122.001 80.1753 122.13 80.6223 122.13C81.2929 122.13 81.7923 121.864 82.1206 121.334L83.0007 121.962C82.4978 122.772 81.7015 123.178 80.6119 123.178ZM79.0612 119.867H81.9739C81.9111 119.504 81.7469 119.221 81.4815 119.018C81.223 118.809 80.9192 118.704 80.57 118.704C80.2068 118.704 79.882 118.805 79.5956 119.008C79.3162 119.21 79.1381 119.497 79.0612 119.867ZM86.7104 123.178C85.9212 123.178 85.2611 122.919 84.7302 122.402C84.2064 121.878 83.9445 121.229 83.9445 120.453C83.9445 119.678 84.2064 119.032 84.7302 118.515C85.2611 117.991 85.9212 117.729 86.7104 117.729C87.2483 117.729 87.7302 117.859 88.1563 118.117C88.5894 118.375 88.9211 118.728 89.1516 119.175L88.1458 119.72C88.0131 119.441 87.821 119.217 87.5696 119.049C87.3181 118.882 87.0317 118.798 86.7104 118.798C86.2494 118.798 85.8688 118.959 85.5684 119.28C85.2681 119.594 85.1179 119.985 85.1179 120.453C85.1179 120.921 85.2681 121.316 85.5684 121.637C85.8688 121.952 86.2494 122.109 86.7104 122.109C87.0317 122.109 87.3181 122.025 87.5696 121.857C87.821 121.69 88.0131 121.466 88.1458 121.187L89.1516 121.732C88.9211 122.179 88.5894 122.531 88.1563 122.79C87.7302 123.048 87.2483 123.178 86.7104 123.178ZM92.5727 123.178C91.7764 123.178 91.1199 122.923 90.603 122.413C90.0931 121.903 89.8381 121.25 89.8381 120.453C89.8381 119.678 90.0966 119.032 90.6135 118.515C91.1303 117.991 91.7834 117.729 92.5727 117.729C93.2991 117.729 93.8998 117.96 94.3748 118.421C94.8567 118.882 95.0977 119.517 95.0977 120.328C95.0977 120.467 95.0942 120.593 95.0872 120.705H90.9697C90.9976 121.131 91.1618 121.477 91.4621 121.742C91.7625 122.001 92.1362 122.13 92.5832 122.13C93.2537 122.13 93.7531 121.864 94.0814 121.334L94.9615 121.962C94.4586 122.772 93.6623 123.178 92.5727 123.178ZM91.0221 119.867H93.9347C93.8719 119.504 93.7077 119.221 93.4423 119.018C93.1839 118.809 92.88 118.704 92.5308 118.704C92.1676 118.704 91.8428 118.805 91.5564 119.008C91.277 119.21 91.0989 119.497 91.0221 119.867ZM96.8587 116.692C96.6492 116.692 96.4676 116.619 96.3139 116.472C96.1602 116.318 96.0834 116.133 96.0834 115.917C96.0834 115.707 96.1602 115.529 96.3139 115.382C96.4676 115.229 96.6492 115.152 96.8587 115.152C97.0752 115.152 97.2569 115.229 97.4035 115.382C97.5502 115.529 97.6236 115.707 97.6236 115.917C97.6236 116.133 97.5502 116.318 97.4035 116.472C97.2569 116.619 97.0752 116.692 96.8587 116.692ZM96.2825 123.073V117.834H97.435V123.073H96.2825ZM100.618 123.073L98.2502 117.834H99.5284L101.121 121.512L102.724 117.834H104.013L101.634 123.073H100.618ZM107.051 123.178C106.254 123.178 105.598 122.923 105.081 122.413C104.571 121.903 104.316 121.25 104.316 120.453C104.316 119.678 104.574 119.032 105.091 118.515C105.608 117.991 106.261 117.729 107.051 117.729C107.777 117.729 108.378 117.96 108.853 118.421C109.335 118.882 109.576 119.517 109.576 120.328C109.576 120.467 109.572 120.593 109.565 120.705H105.448C105.475 121.131 105.64 121.477 105.94 121.742C106.24 122.001 106.614 122.13 107.061 122.13C107.732 122.13 108.231 121.864 108.559 121.334L109.439 121.962C108.936 122.772 108.14 123.178 107.051 123.178ZM105.5 119.867H108.413C108.35 119.504 108.186 119.221 107.92 119.018C107.662 118.809 107.358 118.704 107.009 118.704C106.645 118.704 106.321 118.805 106.034 119.008C105.755 119.21 105.577 119.497 105.5 119.867Z" fill="#BBC0C5"/>
-<rect x="190.577" y="110.592" width="38.974" height="17.961" rx="8.98049" fill="#28A745" fill-opacity="0.15"/>
-<path d="M196.952 120.548V119.531H198.649V117.834H199.676V119.531H201.373V120.548H199.676V122.245H198.649V120.548H196.952ZM205.779 123.073V116.776H204.28L205.16 115.634H206.931V123.073H205.779ZM209.233 123.157C208.988 123.157 208.775 123.069 208.594 122.895C208.419 122.713 208.332 122.497 208.332 122.245C208.332 122.001 208.419 121.788 208.594 121.606C208.775 121.424 208.988 121.334 209.233 121.334C209.484 121.334 209.697 121.424 209.872 121.606C210.054 121.788 210.144 122.001 210.144 122.245C210.144 122.497 210.054 122.713 209.872 122.895C209.697 123.069 209.484 123.157 209.233 123.157ZM216.029 121.941V123.073H211.105V122.654C211.105 122.388 211.143 122.137 211.22 121.899C211.304 121.655 211.391 121.452 211.482 121.292C211.573 121.131 211.723 120.953 211.932 120.757C212.142 120.555 212.303 120.412 212.414 120.328C212.526 120.237 212.722 120.09 213.001 119.888C213.287 119.685 213.469 119.556 213.546 119.5C213.986 119.179 214.304 118.896 214.499 118.651C214.695 118.407 214.793 118.114 214.793 117.771C214.793 117.429 214.688 117.157 214.478 116.954C214.269 116.745 213.979 116.64 213.609 116.64C213.225 116.64 212.907 116.755 212.655 116.985C212.404 117.209 212.275 117.516 212.268 117.907H211.105C211.105 117.202 211.342 116.626 211.817 116.179C212.299 115.732 212.9 115.508 213.619 115.508C214.283 115.508 214.838 115.704 215.285 116.095C215.732 116.486 215.956 117.034 215.956 117.74C215.956 118.299 215.826 118.77 215.568 119.154C215.317 119.531 214.897 119.93 214.311 120.349C214.22 120.419 214.052 120.537 213.808 120.705C213.563 120.873 213.382 121.002 213.263 121.093C213.151 121.183 213.029 121.309 212.896 121.47C212.764 121.623 212.673 121.781 212.624 121.941H216.029ZM219.669 123.178C218.922 123.178 218.286 122.954 217.762 122.507C217.245 122.06 216.98 121.47 216.966 120.736H218.118C218.146 121.134 218.304 121.452 218.59 121.69C218.883 121.927 219.243 122.046 219.669 122.046C220.053 122.046 220.368 121.945 220.612 121.742C220.863 121.54 220.993 121.26 221 120.904C221 120.513 220.87 120.219 220.612 120.024C220.361 119.821 220.011 119.72 219.564 119.72H218.978V118.735H219.564C219.935 118.735 220.228 118.637 220.444 118.442C220.668 118.246 220.783 117.991 220.79 117.677C220.79 117.37 220.678 117.122 220.455 116.933C220.231 116.738 219.955 116.64 219.627 116.64C219.236 116.64 218.911 116.755 218.653 116.985C218.394 117.209 218.265 117.516 218.265 117.907H217.102C217.102 117.181 217.347 116.601 217.836 116.168C218.331 115.728 218.929 115.508 219.627 115.508C220.319 115.508 220.877 115.704 221.304 116.095C221.737 116.486 221.953 116.989 221.953 117.604C221.953 117.946 221.866 118.264 221.691 118.557C221.517 118.843 221.3 119.063 221.042 119.217C221.384 119.364 221.656 119.591 221.859 119.898C222.061 120.205 222.163 120.565 222.163 120.977C222.163 121.627 221.929 122.158 221.461 122.57C221 122.975 220.402 123.178 219.669 123.178Z" fill="#28A745"/>
-<rect x="232.545" y="110.592" width="41.948" height="17.961" rx="8.98049" fill="#141618"/>
-<g clip-path="url(#clip2_583_9786)">
-<rect x="235.538" y="113.586" width="11.974" height="11.974" fill="url(#pattern1)"/>
-</g>
-<path d="M251.599 123.073V115.634H253.737C256.021 115.634 257.697 117.226 257.697 119.353C257.697 121.48 256.021 123.073 253.737 123.073H251.599ZM252.574 122.161H253.737C255.528 122.161 256.712 120.977 256.712 119.353C256.712 117.729 255.528 116.545 253.737 116.545H252.574V122.161ZM257.993 123.073L261.283 115.634H262.09L265.39 123.073H264.374L263.41 120.904H259.942L258.999 123.073H257.993ZM261.671 116.954L260.329 120.024H263.022L261.671 116.954ZM266.435 123.073V115.634H267.41V123.073H266.435Z" fill="white"/>
-<path d="M247.44 141.84V141.122C246.507 141.023 245.743 140.403 245.716 139.254H246.489C246.569 139.927 246.929 140.269 247.44 140.367V138.131L247.135 138.014C246.174 137.628 245.752 137.027 245.752 136.2C245.752 135.212 246.498 134.647 247.44 134.575V133.883H247.925V134.593C248.716 134.71 249.461 135.248 249.461 136.191H248.689C248.617 135.751 248.348 135.446 247.925 135.347V137.449L248.15 137.538C249.093 137.925 249.605 138.481 249.605 139.406C249.605 140.511 248.877 141.059 247.925 141.131V141.84H247.44ZM248.832 139.46C248.832 138.886 248.509 138.58 247.925 138.329V140.385C248.428 140.322 248.832 139.963 248.832 139.46ZM246.524 136.2C246.524 136.694 246.794 136.982 247.44 137.26V135.32C246.866 135.383 246.524 135.733 246.524 136.2ZM253.847 141.05V135.437H252.616L253.245 134.674H254.619V141.05H253.847ZM256.783 141.122C256.415 141.122 256.119 140.816 256.119 140.448C256.119 140.089 256.415 139.775 256.783 139.775C257.152 139.775 257.448 140.089 257.448 140.448C257.448 140.816 257.152 141.122 256.783 141.122ZM262.673 140.304V141.05H258.542V140.744C258.542 139.379 259.736 138.751 260.679 138.05C261.424 137.503 261.811 137.17 261.811 136.425C261.811 135.751 261.335 135.32 260.643 135.32C259.952 135.32 259.323 135.751 259.323 136.578H258.533C258.533 135.356 259.449 134.566 260.634 134.566C261.694 134.566 262.601 135.186 262.601 136.434C262.601 137.368 262.17 137.907 261.128 138.661C260.392 139.209 259.637 139.559 259.494 140.304H262.673ZM265.964 141.14C264.706 141.14 263.692 140.286 263.692 139.11H264.473C264.518 139.882 265.164 140.385 265.964 140.385C266.673 140.385 267.257 139.981 267.257 139.236C267.257 138.445 266.691 138.086 265.865 138.086H265.389V137.377H265.901C266.574 137.377 267.068 136.955 267.077 136.344C267.077 135.742 266.574 135.32 265.928 135.32C265.209 135.32 264.59 135.751 264.59 136.578H263.799C263.799 135.329 264.751 134.566 265.928 134.566C267.014 134.566 267.868 135.239 267.868 136.317C267.859 136.937 267.499 137.458 267.005 137.709C267.652 137.969 268.047 138.535 268.047 139.263C268.047 140.385 267.185 141.14 265.964 141.14Z" fill="#BBC0C5"/>
-</g>
-</g>
-<defs>
-<filter id="filter0_d_583_9786" x="25.0001" y="9" width="277.467" height="166.024" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="8"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.4 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_583_9786"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_583_9786" result="shape"/>
-</filter>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_583_9786" transform="scale(0.0123457)"/>
-</pattern>
-<pattern id="pattern1" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image1_583_9786" transform="scale(0.0123457)"/>
-</pattern>
-<linearGradient id="paint0_linear_583_9786" x1="249.571" y1="165.713" x2="217.453" y2="182.026" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint1_linear_583_9786" x1="190.574" y1="218.947" x2="118.834" y2="316.8" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint2_linear_583_9786" x1="184.654" y1="35.1492" x2="466.657" y2="19.7551" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint3_linear_583_9786" x1="177.789" y1="6.31976" x2="271.414" y2="-11.8954" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint4_linear_583_9786" x1="126.04" y1="37.2221" x2="6.192" y2="98.6315" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint5_linear_583_9786" x1="-63.37" y1="119.636" x2="75.4403" y2="78.2284" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint6_linear_583_9786" x1="295.929" y1="97.1969" x2="292.03" y2="98.1505" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint7_linear_583_9786" x1="263.469" y1="159.809" x2="259.57" y2="160.762" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint8_linear_583_9786" x1="36.8852" y1="14.3" x2="32.986" y2="15.2536" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint9_linear_583_9786" x1="285.398" y1="71.843" x2="281.499" y2="72.7966" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint10_linear_583_9786" x1="298.861" y1="158.183" x2="294.962" y2="159.137" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint11_linear_583_9786" x1="213.762" y1="6.54646" x2="393.044" y2="19.2669" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint12_linear_583_9786" x1="277.014" y1="116.458" x2="16.5571" y2="217.495" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint13_linear_583_9786" x1="361.542" y1="80.3845" x2="226.629" y2="113.175" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint14_linear_583_9786" x1="323.791" y1="131.085" x2="254.958" y2="148.013" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint15_linear_583_9786" x1="135.862" y1="174.212" x2="75.8371" y2="188.999" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<clipPath id="clip0_583_9786">
-<rect width="526" height="180" fill="white" transform="translate(-99)"/>
-</clipPath>
-<clipPath id="clip1_583_9786">
-<rect width="11.974" height="11.974" fill="white" transform="translate(233.538 67.1543)"/>
-</clipPath>
-<clipPath id="clip2_583_9786">
-<rect width="11.974" height="11.974" fill="white" transform="translate(235.538 113.586)"/>
-</clipPath>
-<image id="image0_583_9786" width="81" height="81" xlink:href="data:image/png;base64,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"/>
-<image id="image1_583_9786" width="81" height="81" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAAMP2lDQ1BJQ0MgUHJvZmlsZQAASImVVwdYU8kWnluSkJDQQpcSehNEpASQEkILvSOISkgChBJjIKjYy6KCaxcVsKGrIoqdZkERO4ti74sFFWVdLNiVNymg677yvfm+ufPff87858y5M/feAUD9OFcszkM1AMgXFUriQgIYY1JSGaQngAqIQBW4Ahsur0DMiomJALAMtn8v764DRNZecZRp/bP/vxZNvqCABwASA3EGv4CXD/FBAPAqnlhSCABRxltMLhTLMKxAWwIDhHihDGcpcJUMZyjwXrlNQhwb4jYAVKhcriQLALVLkGcU8bKghlofxM4ivlAEgDoDYt/8/Il8iNMhtoU2Yohl+syMH3Sy/qaZMaTJ5WYNYcVc5EUlUFggzuNO/T/T8b9Lfp500Ic1rNRsSWicbM4wbzdzJ4bLMBXiXlFGVDTEWhB/EPLl9hCjlGxpaKLCHjXiFbBhzoAuxM58bmA4xEYQB4vyoiKUfEamMJgDMVwh6BRhIScBYn2IFwoKguKVNpskE+OUvtD6TAmbpeTPciVyvzJf96W5iSyl/utsAUepj6kVZyckQ0yB2LJImBQFsRrETgW58eFKm9HF2eyoQRuJNE4WvyXEcQJRSIBCHyvKlATHKe1L8wsG54ttyhZyopR4f2F2QqgiP1gbjyuPH84FuyQQsRIHdQQFYyIG58IXBAYp5o49E4gS45U6H8SFAXGKsThFnBejtMfNBXkhMt4cYteConjlWDypEC5IhT6eKS6MSVDEiRfncMNiFPHgy0AEYINAwABSWDPARJADhB29Db3wTtETDLhAArKAADgqmcERyfIeEbzGg2LwJ0QCUDA0LkDeKwBFkP86xCqujiBT3lskH5ELnkCcD8JBHryXykeJhrwlgceQEf7DOxdWHow3D1ZZ/7/nB9nvDAsyEUpGOuiRoT5oSQwiBhJDicFEO9wQ98W98Qh49YfVBWfinoPz+G5PeELoJDwkXCN0EW5NEM6V/BRlJOiC+sHKXGT8mAvcGmq64QG4D1SHyrgubggccVfoh4X7Qc9ukGUr45ZlhfGT9t9m8MPTUNqRnckoWY/sT7b9eaSavZrbkIos1z/mRxFrxlC+2UM9P/tn/5B9PmzDf7bEFmIHsDPYCewcdgRrAAysBWvE2rGjMjy0uh7LV9egtzh5PLlQR/gPf4NPVpbJAuda5x7nL4q+QsEU2TsasCeKp0qEWdmFDBb8IggYHBHPaTjDxdnFBQDZ90Xx+noTK/9uILrt37l5fwDg0zIwMHD4OxfWAsA+D7j9m75ztkz46VAF4GwTTyopUnC47EKAbwl1uNMMgAmwALZwPi7AHXgDfxAEwkA0SAApYDyMPhuucwmYDKaDOaAElIFlYDWoABvBFrAD7Ab7QQM4Ak6A0+ACuASugTtw9XSDF6APvAOfEQQhITSEjhggpogV4oC4IEzEFwlCIpA4JAVJR7IQESJFpiPzkDJkBVKBbEZqkH1IE3ICOYd0IreQB0gP8hr5hGIoFdVGjVFrdATKRFloOJqAjkOz0EloMTofXYKuRavRXWg9egK9gF5Du9AXaD8GMFVMFzPDHDEmxsaisVQsE5NgM7FSrByrxuqwZvicr2BdWC/2ESfidJyBO8IVHIon4jx8Ej4TX4xX4DvwerwNv4I/wPvwbwQawYjgQPAicAhjCFmEyYQSQjlhG+EQ4RTcS92Ed0QiUZdoQ/SAezGFmEOcRlxMXE/cQzxO7CQ+IvaTSCQDkgPJhxRN4pIKSSWkdaRdpBbSZVI36YOKqoqpiotKsEqqikhlrkq5yk6VYyqXVZ6qfCZrkK3IXuRoMp88lbyUvJXcTL5I7iZ/pmhSbCg+lARKDmUOZS2ljnKKcpfyRlVV1VzVUzVWVag6W3Wt6l7Vs6oPVD9Staj2VDY1jSqlLqFupx6n3qK+odFo1jR/WiqtkLaEVkM7SbtP+6BGV3NS46jx1WapVarVq11We6lOVrdSZ6mPVy9WL1c/oH5RvVeDrGGtwdbgaszUqNRo0rih0a9J1xypGa2Zr7lYc6fmOc1nWiQta60gLb7WfK0tWie1HtExugWdTefR59G30k/Ru7WJ2jbaHO0c7TLt3dod2n06WjquOkk6U3QqdY7qdOliuta6HN083aW6+3Wv637SM9Zj6Qn0FunV6V3We68/TN9fX6Bfqr9H/5r+JwOGQZBBrsFygwaDe4a4ob1hrOFkww2Gpwx7h2kP8x7GG1Y6bP+w20aokb1RnNE0oy1G7Ub9xibGIcZi43XGJ417TXRN/E1yTFaZHDPpMaWb+poKTVeZtpg+Z+gwWIw8xlpGG6PPzMgs1Exqttmsw+yzuY15ovlc8z3m9ywoFkyLTItVFq0WfZamlpGW0y1rLW9bka2YVtlWa6zOWL23trFOtl5g3WD9zEbfhmNTbFNrc9eWZutnO8m22vaqHdGOaZdrt97ukj1q72afbV9pf9EBdXB3EDqsd+gcThjuOVw0vHr4DUeqI8uxyLHW8YGTrlOE01ynBqeXIyxHpI5YPuLMiG/Obs55zlud74zUGhk2cu7I5pGvXexdeC6VLldH0UYFj5o1qnHUK1cHV4HrBtebbnS3SLcFbq1uX9093CXude49HpYe6R5VHjeY2swY5mLmWU+CZ4DnLM8jnh+93L0KvfZ7/eXt6J3rvdP72Wib0YLRW0c/8jH34fps9unyZfim+27y7fIz8+P6Vfs99Lfw5/tv83/KsmPlsHaxXgY4B0gCDgW8Z3uxZ7CPB2KBIYGlgR1BWkGJQRVB94PNg7OCa4P7QtxCpoUcDyWEhocuD73BMebwODWcvjCPsBlhbeHU8PjwivCHEfYRkojmSDQyLHJl5N0oqyhRVEM0iOZEr4y+F2MTMynmcCwxNia2MvZJ3Mi46XFn4unxE+J3xr9LCEhYmnAn0TZRmtiapJ6UllST9D45MHlFcteYEWNmjLmQYpgiTGlMJaUmpW5L7R8bNHb12O40t7SStOvjbMZNGXduvOH4vPFHJ6hP4E44kE5IT07fmf6FG82t5vZncDKqMvp4bN4a3gu+P38Vv0fgI1gheJrpk7ki81mWT9bKrJ5sv+zy7F4hW1ghfJUTmrMx531udO723IG85Lw9+Sr56flNIi1RrqhtosnEKRM7xQ7iEnHXJK9Jqyf1ScIl2wqQgnEFjYXa8Ee+XWor/UX6oMi3qLLow+SkyQemaE4RTWmfaj910dSnxcHFv03Dp/GmtU43mz5n+oMZrBmbZyIzM2a2zrKYNX9W9+yQ2TvmUObkzvl9rvPcFXPfzkue1zzfeP7s+Y9+CfmltkStRFJyY4H3go0L8YXChR2LRi1at+hbKb/0fJlzWXnZl8W8xed/Hfnr2l8HlmQu6VjqvnTDMuIy0bLry/2W71ihuaJ4xaOVkSvrVzFWla56u3rC6nPlruUb11DWSNd0rY1Y27jOct2ydV8qsiuuVQZU7qkyqlpU9X49f/3lDf4b6jYabyzb+GmTcNPNzSGb66utq8u3ELcUbXmyNWnrmd+Yv9VsM9xWtu3rdtH2rh1xO9pqPGpqdhrtXFqL1kpre3al7bq0O3B3Y51j3eY9unvK9oK90r3P96Xvu74/fH/rAeaBuoNWB6sO0Q+V1iP1U+v7GrIbuhpTGjubwppam72bDx12Orz9iNmRyqM6R5ceoxybf2ygpbil/7j4eO+JrBOPWie03jk55uTVtti2jlPhp86eDj598gzrTMtZn7NHznmdazrPPN9wwf1Cfbtb+6Hf3X4/1OHeUX/R42LjJc9LzZ2jO49d9rt84krgldNXOVcvXIu61nk98frNG2k3um7ybz67lXfr1e2i25/vzL5LuFt6T+Ne+X2j+9V/2P2xp8u96+iDwAftD+Mf3nnEe/TiccHjL93zn9CelD81fVrzzOXZkZ7gnkvPxz7vfiF+8bm35E/NP6te2r48+Jf/X+19Y/q6X0leDbxe/Mbgzfa3rm9b+2P677/Lf/f5fekHgw87PjI/nvmU/Onp58lfSF/WfrX72vwt/NvdgfyBATFXwpX/CmCwopmZALzeDgAtBQA6PJ9RxirOf/KCKM6scgT+E1acEeXFHYA6+P8e2wv/bm4AsHcrPH5BffU0AGJoACR4AnTUqKE6eFaTnytlhQjPAZtivmbkZ4B/UxRnzh/i/rkFMlVX8HP7L63RfIDvyMpLAAAAOGVYSWZNTQAqAAAACAABh2kABAAAAAEAAAAaAAAAAAACoAIABAAAAAEAAABRoAMABAAAAAEAAABRAAAAAKjujIYAAAlFSURBVHgB5V3NbxtFFH9vbbdJ64S0ByrooYuEVDhUdZKCEJc6F6SEQpsrl4YLHNuI3pP8AVXDkV6anDg2pahBFVLcG0IlceGAkCrFSBRUDhCaNEmT7A7vjT3uer27Xq9n/TmX2Z2ZffPez+9jvnaN0GZpZ/k900pYQ8ISQwJs08keglHg+yQkC/3jP8hrvm91wlYysHX/nQzYVhYFnBVCZIQBJl0PheZJQB4NLNgCHgEYuYHxh7nQz2ps2FQQxe3M0FZfMmOAfdlGcakuwMILTUDiYgLsXP94vhD+segtmwLi5vK5LKJ9UYCYigk4TwQQccmycXFw4qclzwaaCmMFUYIH1gzxmtXEb1QyBdLOufT46kJUAkHPxQJiG4Hnlr0QB5haQWSf97zfuAFCTLm5b7P7QgLEmC6faegSbmd59PJWP653AIAssmkBrj9fHmFX03BqWBOl9vWR9lHQaJib1hBoWCsbAnFnOcO/6ArJbrZGfm290lhTTA9O5CNF8cjmvHU/kzlAXOsCAPmXMA3E21HNOxKI7P+EjSvNHPNp07kAQjSOnY0CZN3mzABaYC8E8NLxVQg4e3R8dS6sIHWB+Pze6CWB9u2wxDu5XT1AhgaRgwj7wG4z4cAfWuB0emJ1PrANVYYCsYuicC08qurJT44NjOdzVRWOglCBxRLIJmw6nuuZSzLrW6xEQQLXBFFGK4RMEJEur+Ox8K0gGQPNuWTG60EEeqYuwD8GamJpNtIzOAUKaogZP7NO+j24/d3oFVvYpl992PLE8XOA/a+Hbe7bTuz8KevsZ7+BONj0bRdbBW1blMx6zN2HpznrjMaHz8xB8uRH7n4bumcQGcyDv3NgPc2BArghoiEf9orWnuZsoXGFaJoh6Ta9GSYHgDX88FvX4Mj5b6H//a+1/1B+QlG0nnHXVYEo7V6Iq+6G7XxvDJ4G1ngGVLfWe8id3VzOZJ3lVT7REsYloGlJnMn652Fd5FnzIDUARg3fyr6XwTz05uew8+NnsZl5SRtzSogqn7i1PMxDGlM1aDR3+0T2X9sPLkQmy1pnDJwmcx6FxIksSIA9qLHf3Pt5lvzmikethqKEGE5/kM8zpQpzfkYLDFRmckW7JhlQnnwDL36Zge3vz1M+C3Ypcjt5ZnAPj1yHpPmJs1jbtbDIYkupAkTDEBdVRafkBwToDmn2/uOvPFnm4BOHn0QUHHxlqgCxQzaZFO8V+R6ByG7CSysPvX0N2A1oTTRuVAGmDGLJlLX202xi7G93KaC4gWTT7hu+7us/I/PJQZhSGcRONGUv4RWQ7lkNR27d/pFMWrq/Moi05ZnxYqoTyxjIF6tfVLGeoiCjYwrqIGz+SwcWJIh8AaK7lrt4LHrw5K5DXlqBJrPWHWQOHYGsHGwn6bgbgFXRYb03/AvzVMydsP+1yiIaNCdPflxZFtOd2zdyN6yNYuevqh6tpyuRFjZoqGNKEOnYW4Y0saEk57JnZmvSkOO3EO1qEorYwK//bZ5FRVgdQoSz0pyF3d4D7Ih4NeUxgYIOrXIy4FRTeuzGTmi8KEFEIYa6Ub4myVT0iYB02LxBn8jRkAe67sRjs+Sr2XIxj9+8hh/lBjFcuHngLnjOzUMhlZzXqixsXlwKI5UM+4BfO2bCcjCl2lUNKfY3od6lMEUrap5w/IiKhrVJ2wy0Oq4jFX2iDkptTMM9e2FWDV6j1JR6AkRNWPmS6QkQvVbEvQbivijVqJAr27Sazcu/2RptA6s5eKRoycmdkGYoPMB1Jp0COOn6XYfhgYNi1OAiA4tA3KBhjh8P4cpTgzX3QBQhL81Qdc3KtfGAsFE0Zxt+bxbzXdhPQYKIBhS6ULjmiCRgQ5qzbWPBaHSb1Gf8x6s7btNp5jjRa2XJs3/iP0oSAh9JEFNo5emcSRQa5Wd4a9Jre5K3TI2TL8/isPP2mtmUCWm84JmKG0Te2OLZiq5kJOycNOfS61kFXYTbgQ5bQOpU9Xbp3uObWtkTCEWfyFRtgAdaqbeYGG9Mud0Ia2HUYYyPOAXewC9GZ9kCcz4NO65YuhDXFimDp1sLacNBYlYG0dq1lzoOLRfDxVVr76N8vC+tWQsBDfsOs1AG8dhkfoPuc1zYiYk35/vevem5EcWnI9ybVjpk3Nsu4lVcClMUEe/QKYisuu2EnLUvRafAeAPKKzGArIX6Ey4cm1xjxYMKEPd37IVUPx1i1LC+qJ/plxQZuMSJMdK6C1VDmJetQJ7PiQdA2qUHe1H1VQEim/TmvZFF52Ed1VBbTgsSrDn1JAYNU+niGUU6VueOum5asR+rAyg4XxCqAJGZQUEvPyKWTzy5GWz0ngHhQ5hxJR7G7P16PdIecniexJyzbTmwqML0h/LgYk7dd0rOsyWeCcm9kwj7x3XIWUiP5xec7as0UVYmxDRY8oVwZ9u2umaTLb9B8MfdmDXPKXqlFnKN74SZfOO8Dt/IR0YSx0ecXES+tun4Bx8BsWmTiQFsQSItXHvD3a8viHzIiSL1ertHardAcd7TdyImvb4TUeUTFRNy8G1Xq66q770cF7wAZBx8QeTK9ER+nrIcX/d4os++2BUR2YlHIIjccH9XTFJW4OueTQkxGfQ1p5ogslnT+2yf9iqAJPucel/FD4OaIPKDcnROH9/xI9Kt5fRhzC9J9tla8vlGZ68H6ZWDWa8XBL3adnwZfSU0PbE2HEaOUJqoCPGvwuqt7rs2JwCPvhBjYeWrSxMV0a7WyBKAWFxfVSIH5nVpoqLUrRppg1hkDawHQMYkkiYqMLfuZa7Sis8Ndd/JuQwiE/mrUWRoCETuUOenDqII0OgztOXJ55Cm3Ssz9dCNZM7ODngQSgPyYdpyXXSWd8h1LinovWXX0la9vDesic4Ot5YzU+QhZqjMdJa327XUPloXKE1rG2ZPK4iKm/aO3rjA8+CgaZySI2weC4jcOfvKffoOIfmLy2GZibldjse4cvaluaPYQFR8FgMPZFth5my2QF98T6I9r1PzlGwqjx1E1RHn/Ka6AJwi7TxPtyaX6U7FaAt5HvMN7MJSvWO+KPw0FUQngwwovVxIL2biRRI8E/Xjlgo0PicIaC+ld+mfMeqYbTh5inrdMhDdDBf/IQMydHLcpP9dMXlbwkB4xdmO/jLkPyATpY3zAtVvpBDycZqps++g6/8BJFpZMbVrsYcAAAAASUVORK5CYII="/>
-</defs>
-</svg>
diff --git a/app/images/simulations-whatsnew-banner.svg b/app/images/simulations-whatsnew-banner.svg
deleted file mode 100644
index 5a769ae85533..000000000000
--- a/app/images/simulations-whatsnew-banner.svg
+++ /dev/null
@@ -1,145 +0,0 @@
-<svg width="328" height="180" viewBox="0 0 328 180" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g clip-path="url(#clip0_201_47502)">
-<rect x="-99" width="526" height="180" fill="#F2F4F6"/>
-<path d="M225.967 195.855C226.129 195.809 225.827 195.96 225.967 195.855L253.259 175.651C253.668 175.343 253.712 174.381 253.65 173.872C253.588 173.363 253.153 173.483 252.686 173.31L225.292 162.681C224.873 162.527 224.888 162.628 224.519 162.899C224.149 163.17 223.936 163.435 223.937 163.897L224.039 194.73C224.041 195.251 224.743 195.845 225.194 196.072C225.493 196.221 225.652 195.943 225.967 195.855ZM249.784 174.962L226.559 191.517L227.019 166.365L249.784 174.962Z" fill="url(#paint0_linear_201_47502)"/>
-<path d="M238.219 175.567C237.938 174.773 237.065 174.136 236.287 174.44C233.18 175.657 231.75 177.538 230.867 179.292C230.062 180.891 229.778 182.708 227.768 183.494C225.758 184.281 224.343 183.889 222.742 183.233C220.986 182.513 219.084 181.408 215.977 182.624C212.869 183.841 211.439 185.722 210.556 187.476C209.751 189.075 209.277 190.111 207.265 190.898C205.255 191.685 203.841 191.293 202.239 190.637C200.483 189.917 198.579 188.812 195.474 190.028C192.369 191.245 191.129 193.906 190.246 195.66C189.441 197.259 188.966 198.295 186.954 199.082C186.176 199.387 185.511 200.28 185.791 201.075C186.072 201.87 186.945 202.507 187.723 202.202C190.83 200.985 192.26 199.104 193.143 197.351C193.948 195.751 194.23 193.935 196.242 193.148C198.252 192.362 199.667 192.754 201.268 193.41C203.024 194.13 204.928 195.234 208.033 194.018C211.141 192.801 212.571 190.92 213.454 189.167C214.259 187.567 214.733 186.531 216.745 185.744C218.755 184.958 220.169 185.35 221.771 186.006C223.527 186.726 225.429 187.831 228.536 186.614C231.643 185.397 232.881 182.736 233.764 180.983C234.569 179.383 235.046 178.347 237.056 177.56C237.834 177.258 238.499 176.362 238.219 175.567Z" fill="url(#paint1_linear_201_47502)"/>
-<path d="M302.614 26.3494C302.548 27.6315 300.922 28.3382 299.904 28.7747C297.877 29.6449 295.67 29.7185 293.522 29.7255C290.187 29.7342 286.795 29.3884 283.47 29.2018C280.292 29.0236 276.736 28.5362 273.61 29.458C271.285 30.1444 269.247 31.9876 267.032 32.965C264.709 33.9904 262.537 34.4234 260.069 34.912C249.149 37.0757 237.167 36.0504 226.236 35.2025C225.5 35.1456 226.119 34.2224 226.817 34.2061C226.788 34.0401 226.581 33.6198 226.625 33.4262C226.666 33.254 226.361 32.8112 226.433 32.6462C226.25 32.4233 226.896 32.6527 227.206 32.4299C229.492 30.7828 232.301 30.0154 234.943 30.2665C238.257 30.5808 240.874 31.2656 244.221 31.0066C247.972 30.7164 251.705 30.0129 255.437 29.5377C258.722 29.1172 262.67 29.1662 265.686 27.5052C266.496 27.0591 266.717 26.4872 266.849 25.5126C266.911 25.0537 267.252 24.1944 267.238 23.7363C267.209 22.7546 267.771 23.1114 268.593 22.5237C270.437 21.2061 271.854 20.742 274.008 21.0093C276.422 21.3083 278.844 22.4983 281.159 23.1784C284.341 24.1139 287.908 23.8715 291.211 23.7021C294.097 23.5541 296.721 23.1268 299.524 23.8786C300.593 24.1663 302.684 24.9707 302.614 26.3494Z" fill="url(#paint2_linear_201_47502)"/>
-<path d="M191.698 0.66683C193.893 -0.956023 196.882 -0.87456 199.433 -1.50178C204.081 -2.64759 209.224 -6.32699 214.129 -5.62214C214.879 -5.51513 214.484 -3.7391 213.739 -3.84513C213.767 -3.84133 213.711 -3.84893 213.739 -3.84513C213.669 -3.7561 213.096 -3.66952 212.966 -3.62827C208.58 -2.2596 206.475 2.73369 202.706 5.08519C201.379 5.91343 200.351 6.06049 198.838 6.1695C197.095 6.29453 194.545 5.80295 192.849 5.34729C190.73 4.77866 189.545 2.25946 191.698 0.66683Z" fill="url(#paint3_linear_201_47502)"/>
-<path d="M36.1476 81.3182C27.1771 88.0576 18.1151 95.0613 13.0972 105.317C12.1144 107.325 11.0992 110.244 11.5334 112.429C12.55 117.542 19.3404 118.274 24.2711 117.186C27.0477 116.573 29.9048 114.457 29.5015 111.544C29.1565 109.035 26.7379 108.211 25.6523 105.955C24.3592 103.265 25.9304 100.195 27.7982 97.8453C41.7141 80.3244 63.6541 72.6196 84.6734 66.8321C88.9652 65.6504 94.4768 62.916 94.1612 58.3248C93.9521 55.2971 90.698 52.9082 87.801 52.6081C84.904 52.308 82.0616 53.9988 79.2948 55.0012C71.9959 57.6449 64.7501 59.0244 57.0694 58.752C50.4451 58.5159 44.5566 58.5417 43.1416 66.0064C41.7184 73.5013 43.1097 76.0887 36.1476 81.3182Z" fill="url(#paint4_linear_201_47502)"/>
-<path d="M-7.31426 68.7565C-26.0267 79.6036 -42.672 93.5796 -53.5985 112.641C-56.0885 116.986 -58.4983 121.78 -59.2377 126.738C-59.975 131.696 -58.6607 137.75 -55.6065 141.562C-51.5118 146.672 -44.726 148.141 -38.2388 148.351C-35.6951 148.434 -33.4164 148.292 -31.0882 147.173C-28.7596 146.056 -26.665 143.585 -26.8221 140.968C-27.0895 136.54 -31.8707 134.891 -35.4927 132.566C-43.7632 127.263 -45.924 114.719 -42.1818 105.258C-38.4395 95.796 -30.5971 88.3991 -23.1883 81.564C-19.1908 77.877 -14.9004 73.5974 -9.64287 72.7479C-6.50311 72.2406 -2.94921 72.8146 0.209696 72.4773C7.48059 71.7052 13.2202 66.63 19.168 62.138C28.6277 54.9912 39.6256 49.5086 51.0807 47.319C55.493 46.4743 59.8732 45.7186 63.2619 43.057C64.9499 41.7325 64.3829 38.7929 62.3063 39.1558C52.1226 40.9391 42.2325 46.3606 32.7222 49.9833C19.2069 55.1394 5.29347 61.4486 -7.31426 68.7565Z" fill="url(#paint5_linear_201_47502)"/>
-<path d="M9.94774 32.5462C9.61154 31.8659 8.87144 31.8376 8.20939 32.2003C5.56591 33.6427 5.12523 35.7352 4.52667 37.4037C3.98049 38.9273 2.94476 39.8959 1.23428 40.8297C-0.476206 41.7636 -1.32158 41.5416 -2.82429 41.1352C-4.47177 40.6905 -6.55959 40.6497 -9.20307 42.0921C-11.8466 43.5345 -12.2851 45.6264 -12.8858 47.2955C-13.432 48.8191 -14.4677 49.7877 -16.1782 50.7215C-17.8887 51.6554 -18.734 51.4333 -20.2368 51.027C-21.8842 50.5822 -24.1631 49.7635 -26.8071 51.2037C-29.4506 52.6461 -29.8891 54.738 -30.4898 56.4071C-31.036 57.9307 -31.8802 59.6794 -33.5906 60.6133C-34.2532 60.9738 -34.3193 61.711 -33.981 62.3907C-33.6448 63.071 -32.9047 63.0992 -32.2426 62.7366C-29.5991 61.2942 -29.1606 59.2023 -28.5599 57.5332C-28.0137 56.0096 -26.978 55.041 -25.2675 54.1071C-23.557 53.1733 -22.7116 53.3953 -21.2089 53.8017C-19.5614 54.2464 -17.4742 54.285 -14.8301 52.8448C-12.1867 51.4024 -11.7481 49.3105 -11.1474 47.6414C-10.6012 46.1178 -9.56552 45.1492 -7.85504 44.2154C-6.14455 43.2815 -5.29918 43.5036 -3.79647 43.9099C-2.14898 44.3547 0.130379 45.1755 2.77386 43.7332C5.41734 42.2908 5.85802 40.1983 6.45657 38.5298C7.00276 37.0062 7.8464 35.2553 9.55742 34.3236C10.2179 33.9637 10.2839 33.2265 9.94774 32.5462Z" fill="#FBC49D"/>
-<path d="M305.407 79.925C305.62 79.8649 305.97 79.7991 306.18 79.7071C307.45 79.147 308.943 77.655 309.473 76.2765C310.001 74.8986 309.817 73.5462 309.292 72.157C308.209 69.2871 305.357 67.8457 302.735 69.0007C300.111 70.1562 298.542 73.6802 299.622 76.5507C300.618 79.189 302.949 80.6176 305.407 79.925ZM307.746 72.5929C308.109 73.5576 308.1 74.9762 307.736 75.932C307.372 76.8879 306.68 77.7592 305.798 78.1465C303.978 78.9484 301.918 78.1036 301.169 76.1149C300.806 75.1502 300.814 73.7315 301.179 72.7757C301.543 71.8199 302.235 70.9486 303.117 70.5613C304.936 69.7593 306.996 70.602 307.746 72.5929Z" fill="#86E29B"/>
-<path d="M294.086 99.8024C293.019 100.103 292.231 98.9747 291.967 97.8973C291.704 96.8199 292.065 96.2018 293.132 95.9009C294.2 95.6 295.57 95.7303 295.833 96.8077C296.097 97.8851 295.154 99.5015 294.086 99.8024Z" fill="url(#paint6_linear_201_47502)"/>
-<path d="M262.4 162.195C261.333 162.496 259.962 162.365 259.699 161.288C259.435 160.211 260.378 158.594 261.446 158.293C262.513 157.992 263.301 159.121 263.565 160.198C263.828 161.276 263.468 161.894 262.4 162.195Z" fill="url(#paint7_linear_201_47502)"/>
-<path d="M35.0423 16.904C33.9747 17.2049 33.3777 16.8566 33.1142 15.7792C32.8507 14.7018 33.0205 13.3033 34.0881 13.0024C35.1556 12.7015 36.7166 13.6122 36.9801 14.6896C37.2436 15.7669 36.1098 16.6031 35.0423 16.904Z" fill="url(#paint8_linear_201_47502)"/>
-<path d="M284.329 74.2305C283.262 74.5314 281.892 74.401 281.628 73.3236C281.365 72.2463 282.308 70.6298 283.375 70.3289C284.443 70.028 285.231 71.1566 285.494 72.234C285.758 73.3114 285.397 73.9296 284.329 74.2305Z" fill="url(#paint9_linear_201_47502)"/>
-<path d="M297.791 160.57C296.723 160.871 295.353 160.741 295.09 159.663C294.826 158.586 295.769 156.97 296.837 156.669C297.904 156.368 298.692 157.496 298.956 158.574C299.219 159.651 298.859 160.269 297.791 160.57Z" fill="url(#paint10_linear_201_47502)"/>
-<path d="M307.28 24.0737C303.098 19.6718 328.209 29.5918 327.525 35.8845C326.839 42.1778 314.935 44.3279 317.474 38.7169C319.623 33.9721 313.956 31.102 307.28 24.0737Z" fill="#FBC49D"/>
-<path d="M52.9942 31.1844C53.0145 31.1786 52.9718 31.1907 52.9942 31.1844C55.5427 30.4256 57.016 27.2016 56.2974 24.4147C55.9497 23.0643 55.1061 22.4248 53.9877 21.7293C52.8693 21.0338 51.7507 20.675 50.5133 21.0404C49.2785 21.4075 48.4298 22.2589 47.8023 23.4727C47.1747 24.6865 46.8624 26.4597 47.2101 27.8101C47.5578 29.1605 48.4014 29.8 49.5198 30.4955C50.6196 31.1772 51.7794 31.5268 52.9942 31.1844ZM50.895 22.601C51.8025 22.3452 52.585 22.2191 53.4053 22.7275C54.2412 23.2459 54.4918 23.8439 54.751 24.8505C55.2879 26.93 54.5146 29.0591 52.6125 29.6238C51.6905 29.9003 50.9359 30.0162 50.1021 29.4973C49.2663 28.9789 49.0157 28.3809 48.7564 27.3743C48.4972 26.3676 48.2981 24.94 48.7663 24.0351C49.2345 23.1302 49.9744 22.8747 50.895 22.601C50.8787 22.6056 50.9092 22.597 50.895 22.601Z" fill="#75C4FD"/>
-<path d="M222.561 -6.02268C223.632 -6.37022 224.738 -6.06498 225.845 -6.11323C227.235 -6.17394 228.516 -6.25752 229.903 -6.42148C233.077 -6.79502 236.378 -7.28393 239.564 -7.47339C242.889 -7.67204 246.094 -7.91948 249.416 -7.74505C252.389 -7.59034 255.743 -7.43405 258.686 -7.01874C265.709 -6.02772 272.912 -5.7168 279.927 -4.65871C285.832 -3.76654 291.51 -2.64269 297.302 -1.21017C299.505 -0.769175 301.847 0.300828 302.706 0.604647C303.001 0.708796 302.95 1.06016 302.897 1.38491C302.933 1.34003 302.886 1.45257 302.897 1.38491C301.849 2.63945 300.144 2.03785 298.84 1.69316C297.986 1.46643 295.068 1.17488 294.591 1.22115C293.72 1.30694 292.857 1.23948 293.236 2.43682C293.702 3.90783 295.972 4.96292 297.284 5.4673C299.463 6.30578 302.351 6.48159 304.425 7.62697C306.548 8.04641 309.005 8.72568 310.602 9.22409C316.411 11.0358 321.386 14.0932 326.613 17.227C329.083 18.7069 331.409 19.9896 333.554 21.9452C335.227 23.4738 337.351 25.1071 338.175 27.3164C338.693 28.7079 338.031 30.696 336.428 30.3103C333.933 29.7134 333.218 26.8908 331.807 24.9391C328.584 20.476 323.647 17.2926 318.698 15.2851C316.221 14.2811 313.383 13.9544 310.784 13.3431C307.991 12.6867 305.178 12.2697 302.287 12.3991C299.226 12.5351 296.426 12.7789 293.4 13.2333C290.607 13.6519 287.832 13.6695 285.094 13.0695C282.346 12.4676 279.856 11.9807 277.18 11.1276C275.242 10.5103 272.593 9.78374 270.812 8.75018C269.279 7.85937 269.211 6.46357 270.821 5.41145C273.45 3.69107 276.358 5.02756 279.126 5.5752C279.141 5.57814 279.112 5.57226 279.126 5.5752C281.438 6.02946 283.229 5.32341 285.503 4.61384C286.07 4.43827 286.835 4.27363 287.05 4.17843C287.963 3.7687 289.475 3.04817 288.988 1.96481C288.448 0.771166 286.239 0.110015 285.13 -0.285411C283.32 -0.931707 281.633 -1.85306 279.727 -2.10023C279.234 -2.16506 278.69 -1.61398 278.18 -1.66483C276.94 -1.66247 275.349 -1.42657 274.123 -1.35657C271.01 -1.18291 268.163 -1.15179 265.044 -1.30263C262.294 -1.43689 260.012 -1.92036 257.321 -2.46434C254.353 -3.0645 251.1 -3.18666 248.051 -3.19064C244.974 -3.19343 242.18 -3.05314 239.163 -2.35644C236.338 -1.70436 233.337 -1.15475 230.467 -0.741972C228.278 -0.426406 226.047 -0.169184 223.899 -0.560869C222.659 -0.787431 220.574 -1.43513 220.042 -2.81109C219.426 -4.40862 221.316 -5.61892 222.561 -6.02268Z" fill="url(#paint11_linear_201_47502)"/>
-<path d="M155.849 158.176C155.876 158.173 155.824 158.181 155.849 158.176C158.514 157.832 161.11 157.083 163.781 156.8C166.713 156.49 169.586 155.786 172.486 155.208C176.84 154.342 181.606 153.746 185.834 152.323C188.009 151.59 189.647 150.524 191.832 149.818C193.941 149.135 196.638 148.346 198.796 147.878C202.897 146.99 206.629 146.886 210.596 145.424C214.689 143.916 218.668 141.899 222.399 139.635C226.225 137.311 229.862 134.995 234.202 133.846C235.961 133.38 237.5 133.445 239.23 134.112C240.596 134.639 241.319 135.562 240.776 137.016C240.137 138.73 238.24 139.926 236.712 140.649C234.434 141.726 233.11 142.41 230.714 143.153C228.199 143.933 225.468 144.466 222.975 145.309C221.806 146.173 220.75 147.748 219.685 148.726C217.576 150.667 215.246 152.256 212.525 153.222C206.514 155.355 199.935 153.828 193.763 154.281C193.241 154.321 192.742 154.667 192.215 154.713C189.172 155.361 185.78 155.856 182.736 156.52C178.126 157.525 174.036 158.635 169.388 159.405C165.551 160.04 157.395 161.079 157.395 161.079L155.654 160.731C154.156 160.506 154.331 158.377 155.849 158.176Z" fill="url(#paint12_linear_201_47502)"/>
-<path d="M346.565 86.8514C351.793 80.6902 358.689 68.865 356.486 59.8747C355.742 53.2246 347.251 48.1372 338.543 50.7438C333.74 52.1826 330.015 57.3715 333.304 59.7235C334.236 60.3898 335.768 60.8166 336.971 61.194C347.784 64.6008 348.506 77.7635 338.649 84.908C334.667 87.7949 329.927 89.5172 325.495 91.9442C313.731 98.3872 313.467 112.073 301.28 117.938C295.906 120.523 289.341 122.063 283.877 124.501C273.56 129.105 266.135 136.959 255.822 141.567C250.805 143.809 243.846 146.857 237.063 149.345C235.055 150.081 235.579 152.283 237.636 151.686C237.679 151.674 237.597 151.699 237.636 151.686C242.659 150.197 248.017 148.387 252.911 146.555C265.858 141.706 278.86 136.196 291.011 130C315.36 117.592 330.461 105.834 346.565 86.8514Z" fill="url(#paint13_linear_201_47502)"/>
-<path d="M257.224 156.329C261.583 149.369 270.706 147.68 277.923 146.359C281.756 145.657 285.986 145.104 289.717 143.888C294.272 142.401 298.139 139.32 301.908 136.302C303.032 135.402 304.784 133.691 305.973 132.661C306.765 131.974 307.224 131.251 307.91 130.451C309.58 128.5 313.18 125.037 315.267 123.386C316.843 122.14 321.36 119.984 321.839 123.212C322.191 125.585 319.959 128.313 318.541 129.973C315.804 133.179 312.578 136.305 309.055 138.468C305.329 140.756 301.281 142.664 297.254 144.277C295.252 145.079 293.099 145.299 291.066 146.011C289.581 146.532 288.066 147.461 286.617 148.092C284.614 148.964 282.57 149.506 280.621 150.606C278.017 152.075 275.362 154.008 272.688 155.331C269.912 156.703 267.403 157.917 264.371 158.495C262.18 158.913 259.081 158.866 257.416 157.109C257.106 156.78 256.969 156.735 257.224 156.329Z" fill="url(#paint14_linear_201_47502)"/>
-<path d="M103.743 188.445C136.486 184.075 146.22 178.169 127.543 174.283C108.865 170.397 101.08 177.305 102.014 181.425C102.946 185.545 93.9608 186.552 82.866 187.616C71.7734 188.679 70.7211 191.58 103.743 188.445Z" fill="url(#paint15_linear_201_47502)"/>
-<g filter="url(#filter0_d_201_47502)">
-<rect x="41" y="23" width="245.467" height="134.024" rx="2.9935" fill="white"/>
-<path d="M53.8855 47.4546V40.0157H58.3593V41.1892H55.1114V43.0961H57.7307V44.2695H55.1114V46.2811H58.3593V47.4546H53.8855ZM61.2677 47.5594C60.7858 47.5594 60.3597 47.4686 59.9895 47.287C59.6193 47.0984 59.3434 46.819 59.1618 46.4488L60.0104 45.8411C60.1152 46.0646 60.2829 46.2427 60.5134 46.3754C60.7439 46.5012 60.9953 46.564 61.2677 46.564C61.4842 46.564 61.6624 46.5151 61.8021 46.4173C61.9487 46.3196 62.0221 46.1834 62.0221 46.0087C62.0221 45.8551 61.9627 45.7293 61.844 45.6316C61.7322 45.5338 61.5227 45.436 61.2153 45.3382L60.7543 45.2125C59.8253 44.961 59.3678 44.4267 59.3818 43.6094C59.3818 43.1554 59.5599 42.7922 59.9162 42.5198C60.2724 42.2474 60.7194 42.1112 61.2572 42.1112C62.0675 42.1112 62.6577 42.4081 63.0279 43.0018L62.2316 43.6094C61.9662 43.2532 61.6344 43.0751 61.2363 43.0751C61.0477 43.0751 60.8836 43.1205 60.7439 43.2113C60.6042 43.2951 60.5343 43.4139 60.5343 43.5675C60.5343 43.7072 60.5797 43.826 60.6705 43.9238C60.7613 44.0215 60.9255 44.1089 61.1629 44.1857L61.6973 44.3428C62.1862 44.4895 62.5529 44.6886 62.7974 44.9401C63.0419 45.1845 63.1641 45.5163 63.1641 45.9354C63.1641 46.4313 62.986 46.826 62.6298 47.1193C62.2735 47.4127 61.8195 47.5594 61.2677 47.5594ZM66.5615 47.507C66.0307 47.507 65.5976 47.3603 65.2623 47.0669C64.934 46.7666 64.7699 46.3335 64.7699 45.7678V43.2427H63.6803V42.216H64.7699V40.7596H65.9224V42.216H67.4206V43.2427H65.9224V45.5792C65.9224 45.9005 65.9922 46.131 66.1319 46.2707C66.2716 46.4034 66.4951 46.4697 66.8025 46.4697C67.0539 46.4697 67.26 46.4348 67.4206 46.365V47.3917C67.1692 47.4686 66.8828 47.507 66.5615 47.507ZM69.0899 41.074C68.8803 41.074 68.6987 41.0006 68.5451 40.8539C68.3914 40.7003 68.3146 40.5152 68.3146 40.2986C68.3146 40.0891 68.3914 39.911 68.5451 39.7643C68.6987 39.6106 68.8803 39.5338 69.0899 39.5338C69.3064 39.5338 69.488 39.6106 69.6347 39.7643C69.7814 39.911 69.8547 40.0891 69.8547 40.2986C69.8547 40.5152 69.7814 40.7003 69.6347 40.8539C69.488 41.0006 69.3064 41.074 69.0899 41.074ZM68.5136 47.4546V42.216H69.6661V47.4546H68.5136ZM77.8888 47.4546V44.5105C77.8888 44.0844 77.8085 43.7526 77.6478 43.5151C77.4942 43.2777 77.2637 43.1589 76.9563 43.1589C76.5861 43.1589 76.2893 43.3021 76.0658 43.5885C75.8422 43.8749 75.7235 44.2765 75.7095 44.7934V47.4546H74.557V44.5105C74.557 44.0844 74.4767 43.7526 74.3161 43.5151C74.1624 43.2777 73.9319 43.1589 73.6246 43.1589C73.2404 43.1589 72.9331 43.3091 72.7026 43.6094C72.479 43.9098 72.3673 44.3324 72.3673 44.8772V47.4546H71.2148V42.216H72.3673V42.9284C72.6886 42.3836 73.1845 42.1112 73.8551 42.1112C74.6443 42.1112 75.1857 42.4569 75.479 43.1484C75.6257 42.8202 75.8492 42.5652 76.1496 42.3836C76.4569 42.202 76.7922 42.1112 77.1554 42.1112C77.7421 42.1112 78.2031 42.3103 78.5384 42.7084C78.8737 43.1065 79.0413 43.6444 79.0413 44.3219V47.4546H77.8888ZM82.6632 47.5594C81.9508 47.5594 81.3501 47.2939 80.8611 46.7631C80.3792 46.2322 80.1382 45.5896 80.1382 44.8353C80.1382 44.0809 80.3792 43.4383 80.8611 42.9075C81.3501 42.3766 81.9508 42.1112 82.6632 42.1112C83.0194 42.1112 83.3477 42.1915 83.6481 42.3522C83.9484 42.5058 84.1789 42.6944 84.3396 42.9179V42.216H85.4921V47.4546H84.3396V46.7526C84.1789 46.9761 83.9484 47.1682 83.6481 47.3289C83.3477 47.4825 83.0194 47.5594 82.6632 47.5594ZM81.7517 46.0297C82.0451 46.351 82.4188 46.5116 82.8728 46.5116C83.3268 46.5116 83.7005 46.351 83.9938 46.0297C84.2872 45.7084 84.4339 45.3102 84.4339 44.8353C84.4339 44.3603 84.2872 43.9622 83.9938 43.6409C83.7005 43.3196 83.3268 43.1589 82.8728 43.1589C82.4188 43.1589 82.0451 43.3196 81.7517 43.6409C81.4583 43.9622 81.3117 44.3603 81.3117 44.8353C81.3117 45.3102 81.4583 45.7084 81.7517 46.0297ZM89.327 47.507C88.7961 47.507 88.3631 47.3603 88.0278 47.0669C87.6995 46.7666 87.5354 46.3335 87.5354 45.7678V43.2427H86.4458V42.216H87.5354V40.7596H88.6879V42.216H90.1861V43.2427H88.6879V45.5792C88.6879 45.9005 88.7577 46.131 88.8974 46.2707C89.0371 46.4034 89.2606 46.4697 89.568 46.4697C89.8194 46.4697 90.0255 46.4348 90.1861 46.365V47.3917C89.9347 47.4686 89.6483 47.507 89.327 47.507ZM93.5753 47.5594C92.7791 47.5594 92.1225 47.3044 91.6056 46.7945C91.0957 46.2846 90.8408 45.6316 90.8408 44.8353C90.8408 44.06 91.0992 43.4139 91.6161 42.897C92.133 42.3731 92.7861 42.1112 93.5753 42.1112C94.3018 42.1112 94.9025 42.3417 95.3774 42.8027C95.8594 43.2637 96.1004 43.8993 96.1004 44.7096C96.1004 44.8492 96.0969 44.975 96.0899 45.0867H91.9723C92.0003 45.5128 92.1644 45.8586 92.4648 46.124C92.7651 46.3824 93.1388 46.5116 93.5858 46.5116C94.2564 46.5116 94.7558 46.2462 95.0841 45.7154L95.9642 46.344C95.4612 47.1542 94.665 47.5594 93.5753 47.5594ZM92.0247 44.2486H94.9374C94.8745 43.8853 94.7104 43.6025 94.445 43.3999C94.1865 43.1904 93.8827 43.0856 93.5334 43.0856C93.1702 43.0856 92.8454 43.1869 92.5591 43.3894C92.2797 43.592 92.1015 43.8784 92.0247 44.2486ZM99.4329 47.5594C98.7205 47.5594 98.1198 47.2939 97.6309 46.7631C97.1489 46.2322 96.9079 45.5896 96.9079 44.8353C96.9079 44.0809 97.1489 43.4383 97.6309 42.9075C98.1198 42.3766 98.7205 42.1112 99.4329 42.1112C99.7892 42.1112 100.117 42.1915 100.418 42.3522C100.718 42.5058 100.949 42.6944 101.109 42.9179V39.5967H102.262V47.4546H101.109V46.7526C100.949 46.9761 100.718 47.1682 100.418 47.3289C100.117 47.4825 99.7892 47.5594 99.4329 47.5594ZM98.5214 46.0297C98.8148 46.351 99.1885 46.5116 99.6425 46.5116C100.097 46.5116 100.47 46.351 100.764 46.0297C101.057 45.7084 101.204 45.3102 101.204 44.8353C101.204 44.3603 101.057 43.9622 100.764 43.6409C100.47 43.3196 100.097 43.1589 99.6425 43.1589C99.1885 43.1589 98.8148 43.3196 98.5214 43.6409C98.2281 43.9622 98.0814 44.3603 98.0814 44.8353C98.0814 45.3102 98.2281 45.7084 98.5214 46.0297ZM108.678 47.5594C107.889 47.5594 107.228 47.3009 106.698 46.784C106.174 46.2602 105.912 45.6106 105.912 44.8353C105.912 44.06 106.174 43.4139 106.698 42.897C107.228 42.3731 107.889 42.1112 108.678 42.1112C109.216 42.1112 109.698 42.2404 110.124 42.4989C110.557 42.7573 110.888 43.11 111.119 43.5571L110.113 44.1019C109.98 43.8225 109.788 43.599 109.537 43.4313C109.285 43.2637 108.999 43.1799 108.678 43.1799C108.217 43.1799 107.836 43.3405 107.536 43.6618C107.235 43.9761 107.085 44.3673 107.085 44.8353C107.085 45.3033 107.235 45.6979 107.536 46.0192C107.836 46.3335 108.217 46.4907 108.678 46.4907C108.999 46.4907 109.285 46.4069 109.537 46.2392C109.788 46.0716 109.98 45.8481 110.113 45.5687L111.119 46.1135C110.888 46.5605 110.557 46.9133 110.124 47.1717C109.698 47.4301 109.216 47.5594 108.678 47.5594ZM113.325 47.4546H112.172V39.5967H113.325V42.9284C113.653 42.3836 114.184 42.1112 114.917 42.1112C115.525 42.1112 116.01 42.3103 116.374 42.7084C116.737 43.1065 116.918 43.6374 116.918 44.3009V47.4546H115.766V44.4895C115.766 44.0704 115.668 43.7456 115.473 43.5151C115.277 43.2777 115.012 43.1589 114.676 43.1589C114.278 43.1589 113.953 43.3091 113.702 43.6094C113.45 43.9098 113.325 44.3324 113.325 44.8772V47.4546ZM120.541 47.5594C119.828 47.5594 119.228 47.2939 118.739 46.7631C118.257 46.2322 118.016 45.5896 118.016 44.8353C118.016 44.0809 118.257 43.4383 118.739 42.9075C119.228 42.3766 119.828 42.1112 120.541 42.1112C120.897 42.1112 121.225 42.1915 121.526 42.3522C121.826 42.5058 122.057 42.6944 122.217 42.9179V42.216H123.37V47.4546H122.217V46.7526C122.057 46.9761 121.826 47.1682 121.526 47.3289C121.225 47.4825 120.897 47.5594 120.541 47.5594ZM119.629 46.0297C119.923 46.351 120.296 46.5116 120.75 46.5116C121.204 46.5116 121.578 46.351 121.872 46.0297C122.165 45.7084 122.312 45.3102 122.312 44.8353C122.312 44.3603 122.165 43.9622 121.872 43.6409C121.578 43.3196 121.204 43.1589 120.75 43.1589C120.296 43.1589 119.923 43.3196 119.629 43.6409C119.336 43.9622 119.189 44.3603 119.189 44.8353C119.189 45.3102 119.336 45.7084 119.629 46.0297ZM124.931 47.4546V42.216H126.084V42.9284C126.412 42.3836 126.943 42.1112 127.676 42.1112C128.284 42.1112 128.769 42.3103 129.132 42.7084C129.496 43.1065 129.677 43.6374 129.677 44.3009V47.4546H128.525V44.4895C128.525 44.0704 128.427 43.7456 128.231 43.5151C128.036 43.2777 127.77 43.1589 127.435 43.1589C127.037 43.1589 126.712 43.3091 126.461 43.6094C126.209 43.9098 126.084 44.3324 126.084 44.8772V47.4546H124.931ZM132.399 45.9144C132.699 46.2148 133.069 46.365 133.509 46.365C133.949 46.365 134.32 46.2148 134.62 45.9144C134.92 45.6071 135.07 45.2229 135.07 44.7619C135.07 44.3009 134.92 43.9203 134.62 43.6199C134.32 43.3126 133.949 43.1589 133.509 43.1589C133.069 43.1589 132.699 43.3126 132.399 43.6199C132.098 43.9203 131.948 44.3009 131.948 44.7619C131.948 45.2229 132.098 45.6071 132.399 45.9144ZM133.405 49.7491C132.895 49.7491 132.423 49.6618 131.99 49.4872C131.557 49.3195 131.211 49.0855 130.953 48.7852L131.655 47.9575C132.123 48.4674 132.703 48.7223 133.394 48.7223C133.848 48.7223 134.225 48.5757 134.526 48.2823C134.826 47.9959 134.976 47.5978 134.976 47.0879V46.6059C134.809 46.8434 134.575 47.039 134.274 47.1927C133.974 47.3463 133.649 47.4232 133.3 47.4232C132.594 47.4232 131.997 47.1682 131.508 46.6583C131.026 46.1414 130.785 45.5093 130.785 44.7619C130.785 44.0215 131.026 43.3964 131.508 42.8865C131.997 42.3696 132.594 42.1112 133.3 42.1112C133.649 42.1112 133.974 42.188 134.274 42.3417C134.575 42.4884 134.809 42.6805 134.976 42.9179V42.216H136.129V47.0984C136.129 47.9715 135.877 48.6315 135.374 49.0786C134.878 49.5256 134.222 49.7491 133.405 49.7491ZM140.048 47.5594C139.251 47.5594 138.595 47.3044 138.078 46.7945C137.568 46.2846 137.313 45.6316 137.313 44.8353C137.313 44.06 137.572 43.4139 138.088 42.897C138.605 42.3731 139.258 42.1112 140.048 42.1112C140.774 42.1112 141.375 42.3417 141.85 42.8027C142.332 43.2637 142.573 43.8993 142.573 44.7096C142.573 44.8492 142.569 44.975 142.562 45.0867H138.445C138.473 45.5128 138.637 45.8586 138.937 46.124C139.237 46.3824 139.611 46.5116 140.058 46.5116C140.729 46.5116 141.228 46.2462 141.556 45.7154L142.436 46.344C141.934 47.1542 141.137 47.5594 140.048 47.5594ZM138.497 44.2486H141.41C141.347 43.8853 141.183 43.6025 140.917 43.3999C140.659 43.1904 140.355 43.0856 140.006 43.0856C139.643 43.0856 139.318 43.1869 139.031 43.3894C138.752 43.592 138.574 43.8784 138.497 44.2486ZM145.423 47.5594C144.941 47.5594 144.515 47.4686 144.145 47.287C143.775 47.0984 143.499 46.819 143.317 46.4488L144.166 45.8411C144.271 46.0646 144.438 46.2427 144.669 46.3754C144.899 46.5012 145.151 46.564 145.423 46.564C145.64 46.564 145.818 46.5151 145.958 46.4173C146.104 46.3196 146.178 46.1834 146.178 46.0087C146.178 45.8551 146.118 45.7293 146 45.6316C145.888 45.5338 145.678 45.436 145.371 45.3382L144.91 45.2125C143.981 44.961 143.523 44.4267 143.537 43.6094C143.537 43.1554 143.715 42.7922 144.072 42.5198C144.428 42.2474 144.875 42.1112 145.413 42.1112C146.223 42.1112 146.813 42.4081 147.183 43.0018L146.387 43.6094C146.122 43.2532 145.79 43.0751 145.392 43.0751C145.203 43.0751 145.039 43.1205 144.899 43.2113C144.76 43.2951 144.69 43.4139 144.69 43.5675C144.69 43.7072 144.735 43.826 144.826 43.9238C144.917 44.0215 145.081 44.1089 145.319 44.1857L145.853 44.3428C146.342 44.4895 146.708 44.6886 146.953 44.9401C147.197 45.1845 147.32 45.5163 147.32 45.9354C147.32 46.4313 147.142 46.826 146.785 47.1193C146.429 47.4127 145.975 47.5594 145.423 47.5594Z" fill="#535A61"/>
-<path d="M156.955 38.9658C155.968 38.9658 155.003 39.2584 154.183 39.8066C153.362 40.3549 152.723 41.1341 152.345 42.0457C151.968 42.9574 151.869 43.9605 152.061 44.9283C152.254 45.8961 152.729 46.7851 153.427 47.4829C154.124 48.1806 155.013 48.6558 155.981 48.8483C156.949 49.0408 157.952 48.942 158.864 48.5644C159.776 48.1867 160.555 47.5473 161.103 46.7268C161.651 45.9063 161.944 44.9417 161.944 43.955C161.941 42.6326 161.415 41.365 160.48 40.4299C159.545 39.4948 158.277 38.9684 156.955 38.9658ZM156.859 41.2685C156.973 41.2685 157.084 41.3023 157.178 41.3655C157.273 41.4288 157.347 41.5187 157.391 41.6239C157.434 41.7291 157.445 41.8448 157.423 41.9565C157.401 42.0682 157.346 42.1707 157.266 42.2512C157.185 42.3318 157.083 42.3866 156.971 42.4088C156.859 42.431 156.744 42.4196 156.638 42.376C156.533 42.3325 156.443 42.2587 156.38 42.164C156.317 42.0693 156.283 41.958 156.283 41.8442C156.283 41.6915 156.344 41.5451 156.452 41.4371C156.56 41.3292 156.706 41.2685 156.859 41.2685ZM157.338 46.6415H156.955C156.853 46.6415 156.755 46.601 156.683 46.529C156.611 46.4571 156.571 46.3595 156.571 46.2577V43.955C156.469 43.955 156.371 43.9145 156.299 43.8426C156.227 43.7706 156.187 43.673 156.187 43.5712C156.187 43.4694 156.227 43.3718 156.299 43.2998C156.371 43.2279 156.469 43.1874 156.571 43.1874H156.955C157.056 43.1874 157.154 43.2279 157.226 43.2998C157.298 43.3718 157.338 43.4694 157.338 43.5712V45.8739C157.44 45.8739 157.538 45.9143 157.61 45.9863C157.682 46.0583 157.722 46.1559 157.722 46.2577C157.722 46.3595 157.682 46.4571 157.61 46.529C157.538 46.601 157.44 46.6415 157.338 46.6415Z" fill="#BBC0C5"/>
-<path d="M55.9286 76.6411V73.4979L53.1102 69.2023H54.5456L56.5363 72.2826L58.5374 69.2023H59.9833L57.1544 73.5084V76.6411H55.9286ZM63.9185 75.9601C63.3946 76.484 62.745 76.7459 61.9697 76.7459C61.1944 76.7459 60.5413 76.484 60.0104 75.9601C59.4866 75.4292 59.2247 74.7831 59.2247 74.0218C59.2247 73.2605 59.4866 72.6179 60.0104 72.094C60.5413 71.5631 61.1944 71.2977 61.9697 71.2977C62.745 71.2977 63.3946 71.5631 63.9185 72.094C64.4493 72.6179 64.7147 73.2605 64.7147 74.0218C64.7147 74.7831 64.4493 75.4292 63.9185 75.9601ZM61.9697 75.6772C62.4237 75.6772 62.7974 75.52 63.0908 75.2057C63.3911 74.8844 63.5413 74.4898 63.5413 74.0218C63.5413 73.5538 63.3911 73.1627 63.0908 72.8484C62.7974 72.5271 62.4237 72.3664 61.9697 72.3664C61.5087 72.3664 61.128 72.5271 60.8277 72.8484C60.5343 73.1627 60.3876 73.5538 60.3876 74.0218C60.3876 74.4898 60.5343 74.8844 60.8277 75.2057C61.128 75.52 61.5087 75.6772 61.9697 75.6772ZM67.7493 76.7459C67.1486 76.7459 66.6736 76.5468 66.3244 76.1487C65.9751 75.7436 65.8005 75.2057 65.8005 74.5352V71.4025H66.953V74.3466C66.953 74.7657 67.0438 75.0975 67.2254 75.3419C67.407 75.5794 67.6655 75.6982 68.0007 75.6982C68.3919 75.6982 68.7027 75.5515 68.9332 75.2581C69.1637 74.9578 69.279 74.5317 69.279 73.9799V71.4025H70.4315V76.6411H69.279V75.9287C68.9716 76.4735 68.4617 76.7459 67.7493 76.7459ZM76.1139 76.7459C75.6319 76.7459 75.2059 76.6551 74.8357 76.4735C74.4655 76.2849 74.1896 76.0055 74.008 75.6353L74.8566 75.0276C74.9614 75.2511 75.129 75.4292 75.3595 75.562C75.59 75.6877 75.8415 75.7505 76.1139 75.7505C76.3304 75.7505 76.5085 75.7017 76.6482 75.6039C76.7949 75.5061 76.8682 75.3699 76.8682 75.1953C76.8682 75.0416 76.8089 74.9159 76.6901 74.8181C76.5784 74.7203 76.3688 74.6225 76.0615 74.5247L75.6005 74.399C74.6715 74.1475 74.214 73.6132 74.228 72.796C74.228 72.342 74.4061 71.9787 74.7623 71.7063C75.1185 71.4339 75.5656 71.2977 76.1034 71.2977C76.9136 71.2977 77.5039 71.5946 77.8741 72.1883L77.0778 72.796C76.8124 72.4397 76.4806 72.2616 76.0825 72.2616C75.8939 72.2616 75.7297 72.307 75.59 72.3978C75.4503 72.4816 75.3805 72.6004 75.3805 72.7541C75.3805 72.8938 75.4259 73.0125 75.5167 73.1103C75.6075 73.2081 75.7716 73.2954 76.0091 73.3722L76.5434 73.5294C77.0324 73.6761 77.3991 73.8751 77.6436 74.1266C77.888 74.371 78.0103 74.7028 78.0103 75.1219C78.0103 75.6178 77.8322 76.0125 77.4759 76.3058C77.1197 76.5992 76.6657 76.7459 76.1139 76.7459ZM81.5736 76.7459C80.7773 76.7459 80.1207 76.4909 79.6039 75.981C79.094 75.4712 78.839 74.8181 78.839 74.0218C78.839 73.2465 79.0975 72.6004 79.6143 72.0835C80.1312 71.5597 80.7843 71.2977 81.5736 71.2977C82.3 71.2977 82.9007 71.5282 83.3757 71.9892C83.8576 72.4502 84.0986 73.0858 84.0986 73.8961C84.0986 74.0358 84.0951 74.1615 84.0881 74.2733H79.9706C79.9985 74.6993 80.1627 75.0451 80.463 75.3105C80.7633 75.5689 81.137 75.6982 81.5841 75.6982C82.2546 75.6982 82.754 75.4327 83.0823 74.9019L83.9624 75.5305C83.4595 76.3408 82.6632 76.7459 81.5736 76.7459ZM80.023 73.4351H82.9356C82.8728 73.0719 82.7086 72.789 82.4432 72.5864C82.1848 72.3769 81.8809 72.2721 81.5317 72.2721C81.1685 72.2721 80.8437 72.3734 80.5573 72.5759C80.2779 72.7785 80.0998 73.0649 80.023 73.4351ZM85.2833 76.6411V71.4025H86.4358V72.1149C86.7641 71.5701 87.295 71.2977 88.0284 71.2977C88.6361 71.2977 89.1215 71.4968 89.4847 71.8949C89.8479 72.2931 90.0295 72.8239 90.0295 73.4875V76.6411H88.877V73.6761C88.877 73.257 88.7793 72.9322 88.5837 72.7017C88.3881 72.4642 88.1227 72.3454 87.7874 72.3454C87.3893 72.3454 87.0645 72.4956 86.813 72.796C86.5616 73.0963 86.4358 73.5189 86.4358 74.0637V76.6411H85.2833ZM93.652 76.7459C92.9396 76.7459 92.3389 76.4805 91.85 75.9496C91.368 75.4188 91.127 74.7762 91.127 74.0218C91.127 73.2674 91.368 72.6248 91.85 72.094C92.3389 71.5631 92.9396 71.2977 93.652 71.2977C94.0083 71.2977 94.3366 71.378 94.6369 71.5387C94.9373 71.6924 95.1678 71.881 95.3284 72.1045V68.7832H96.4809V76.6411H95.3284V75.9391C95.1678 76.1627 94.9373 76.3547 94.6369 76.5154C94.3366 76.6691 94.0083 76.7459 93.652 76.7459ZM92.7405 75.2162C93.0339 75.5375 93.4076 75.6982 93.8616 75.6982C94.3156 75.6982 94.6893 75.5375 94.9827 75.2162C95.276 74.8949 95.4227 74.4968 95.4227 74.0218C95.4227 73.5468 95.276 73.1487 94.9827 72.8274C94.6893 72.5061 94.3156 72.3454 93.8616 72.3454C93.4076 72.3454 93.0339 72.5061 92.7405 72.8274C92.4472 73.1487 92.3005 73.5468 92.3005 74.0218C92.3005 74.4968 92.4472 74.8949 92.7405 75.2162Z" fill="#535A61"/>
-<rect x="173.577" y="64.1606" width="53.974" height="17.961" rx="8.98049" fill="#D73847" fill-opacity="0.1"/>
-<path d="M180.214 74.2733V73.1417H183.032V74.2733H180.214ZM191.351 75.9496C190.848 76.4805 190.202 76.7459 189.412 76.7459C188.623 76.7459 187.977 76.4805 187.474 75.9496C186.971 75.4118 186.72 74.7238 186.72 73.8856V71.9368C186.72 71.0987 186.971 70.4141 187.474 69.8833C187.977 69.3455 188.623 69.0765 189.412 69.0765C190.202 69.0765 190.848 69.3455 191.351 69.8833C191.861 70.4141 192.116 71.0987 192.116 71.9368V73.8856C192.116 74.7238 191.861 75.4118 191.351 75.9496ZM189.412 75.6143C189.88 75.6143 190.254 75.4607 190.534 75.1533C190.82 74.846 190.963 74.4234 190.963 73.8856V71.9368C190.963 71.399 190.82 70.9764 190.534 70.6691C190.254 70.3618 189.88 70.2081 189.412 70.2081C188.951 70.2081 188.578 70.3618 188.291 70.6691C188.012 70.9764 187.872 71.399 187.872 71.9368V73.8856C187.872 74.4234 188.012 74.846 188.291 75.1533C188.578 75.4607 188.951 75.6143 189.412 75.6143ZM193.972 76.7249C193.728 76.7249 193.515 76.6376 193.333 76.463C193.159 76.2814 193.071 76.0649 193.071 75.8134C193.071 75.5689 193.159 75.3559 193.333 75.1743C193.515 74.9927 193.728 74.9019 193.972 74.9019C194.224 74.9019 194.437 74.9927 194.611 75.1743C194.793 75.3559 194.884 75.5689 194.884 75.8134C194.884 76.0649 194.793 76.2814 194.611 76.463C194.437 76.6376 194.224 76.7249 193.972 76.7249ZM200.477 75.9496C199.974 76.4805 199.328 76.7459 198.539 76.7459C197.75 76.7459 197.104 76.4805 196.601 75.9496C196.098 75.4118 195.846 74.7238 195.846 73.8856V71.9368C195.846 71.0987 196.098 70.4141 196.601 69.8833C197.104 69.3455 197.75 69.0765 198.539 69.0765C199.328 69.0765 199.974 69.3455 200.477 69.8833C200.987 70.4141 201.242 71.0987 201.242 71.9368V73.8856C201.242 74.7238 200.987 75.4118 200.477 75.9496ZM198.539 75.6143C199.007 75.6143 199.381 75.4607 199.66 75.1533C199.947 74.846 200.09 74.4234 200.09 73.8856V71.9368C200.09 71.399 199.947 70.9764 199.66 70.6691C199.381 70.3618 199.007 70.2081 198.539 70.2081C198.078 70.2081 197.704 70.3618 197.418 70.6691C197.139 70.9764 196.999 71.399 196.999 71.9368V73.8856C196.999 74.4234 197.139 74.846 197.418 75.1533C197.704 75.4607 198.078 75.6143 198.539 75.6143ZM207.036 75.9496C206.533 76.4805 205.887 76.7459 205.098 76.7459C204.308 76.7459 203.662 76.4805 203.159 75.9496C202.656 75.4118 202.405 74.7238 202.405 73.8856V71.9368C202.405 71.0987 202.656 70.4141 203.159 69.8833C203.662 69.3455 204.308 69.0765 205.098 69.0765C205.887 69.0765 206.533 69.3455 207.036 69.8833C207.546 70.4141 207.801 71.0987 207.801 71.9368V73.8856C207.801 74.7238 207.546 75.4118 207.036 75.9496ZM205.098 75.6143C205.566 75.6143 205.939 75.4607 206.219 75.1533C206.505 74.846 206.648 74.4234 206.648 73.8856V71.9368C206.648 71.399 206.505 70.9764 206.219 70.6691C205.939 70.3618 205.566 70.2081 205.098 70.2081C204.637 70.2081 204.263 70.3618 203.977 70.6691C203.697 70.9764 203.557 71.399 203.557 71.9368V73.8856C203.557 74.4234 203.697 74.846 203.977 75.1533C204.263 75.4607 204.637 75.6143 205.098 75.6143ZM213.594 75.9496C213.091 76.4805 212.445 76.7459 211.656 76.7459C210.867 76.7459 210.221 76.4805 209.718 75.9496C209.215 75.4118 208.963 74.7238 208.963 73.8856V71.9368C208.963 71.0987 209.215 70.4141 209.718 69.8833C210.221 69.3455 210.867 69.0765 211.656 69.0765C212.445 69.0765 213.091 69.3455 213.594 69.8833C214.104 70.4141 214.359 71.0987 214.359 71.9368V73.8856C214.359 74.7238 214.104 75.4118 213.594 75.9496ZM211.656 75.6143C212.124 75.6143 212.498 75.4607 212.777 75.1533C213.064 74.846 213.207 74.4234 213.207 73.8856V71.9368C213.207 71.399 213.064 70.9764 212.777 70.6691C212.498 70.3618 212.124 70.2081 211.656 70.2081C211.195 70.2081 210.821 70.3618 210.535 70.6691C210.256 70.9764 210.116 71.399 210.116 71.9368V73.8856C210.116 74.4234 210.256 74.846 210.535 75.1533C210.821 75.4607 211.195 75.6143 211.656 75.6143ZM218.959 76.6411V74.7762H215.113V73.8437L219.084 69.2023H220.111V73.7075H221.106V74.7762H220.111V76.6411H218.959ZM216.559 73.7075H218.959V70.9205L216.559 73.7075Z" fill="#8E1D28"/>
-<rect x="230.545" y="64.1606" width="43.948" height="17.961" rx="8.98049" fill="#F2F4F6"/>
-<g clip-path="url(#clip1_201_47502)">
-<rect x="233.538" y="67.1543" width="11.974" height="11.974" fill="url(#pattern0)"/>
-</g>
-<path d="M249.607 76.6411V69.2023H253.944V70.1243H250.581V72.3769H253.316V73.2989H250.581V75.7191H253.944V76.6411H249.607ZM256.948 76.6411V70.1243H254.632V69.2023H260.216V70.1243H257.901V76.6411H256.948ZM261.383 76.6411V69.2023H262.358V72.3769H266.433V69.2023H267.408V76.6411H266.433V73.2884H262.358V76.6411H261.383Z" fill="#24272A"/>
-<path d="M247.44 95.4084V94.69C246.506 94.5912 245.743 93.9716 245.716 92.8221H246.488C246.569 93.4956 246.928 93.8369 247.44 93.9356V91.6995L247.135 91.5828C246.174 91.1966 245.752 90.5949 245.752 89.7687C245.752 88.7808 246.497 88.2151 247.44 88.1432V87.4517H247.925V88.1612C248.716 88.2779 249.461 88.8168 249.461 89.7597H248.689C248.617 89.3197 248.347 89.0143 247.925 88.9156V91.017L248.15 91.1068C249.093 91.493 249.605 92.0497 249.605 92.9747C249.605 94.0793 248.877 94.6271 247.925 94.699V95.4084H247.44ZM248.832 93.0286C248.832 92.4539 248.509 92.1485 247.925 91.8971V93.9536C248.428 93.8907 248.832 93.5315 248.832 93.0286ZM246.524 89.7687C246.524 90.2626 246.794 90.55 247.44 90.8284V88.8886C246.866 88.9515 246.524 89.3017 246.524 89.7687ZM253.846 94.6182V89.0054H252.616L253.245 88.242H254.619V94.6182H253.846ZM256.783 94.69C256.415 94.69 256.119 94.3847 256.119 94.0165C256.119 93.6573 256.415 93.3429 256.783 93.3429C257.152 93.3429 257.448 93.6573 257.448 94.0165C257.448 94.3847 257.152 94.69 256.783 94.69ZM262.673 93.8728V94.6182H258.542V94.3128C258.542 92.9478 259.736 92.3192 260.679 91.6187C261.424 91.0709 261.811 90.7386 261.811 89.9932C261.811 89.3197 261.335 88.8886 260.643 88.8886C259.952 88.8886 259.323 89.3197 259.323 90.1459H258.533C258.533 88.9245 259.449 88.1342 260.634 88.1342C261.694 88.1342 262.601 88.7539 262.601 90.0022C262.601 90.9362 262.17 91.475 261.128 92.2294C260.392 92.7772 259.637 93.1274 259.494 93.8728H262.673ZM265.964 94.708C264.706 94.708 263.691 93.8548 263.691 92.6784H264.473C264.518 93.4507 265.164 93.9536 265.964 93.9536C266.673 93.9536 267.257 93.5495 267.257 92.8041C267.257 92.0138 266.691 91.6546 265.865 91.6546H265.389V90.9451H265.901C266.574 90.9451 267.068 90.5231 267.077 89.9124C267.077 89.3107 266.574 88.8886 265.928 88.8886C265.209 88.8886 264.59 89.3197 264.59 90.1459H263.799C263.799 88.8976 264.751 88.1342 265.928 88.1342C267.014 88.1342 267.867 88.8078 267.867 89.8854C267.858 90.5051 267.499 91.026 267.005 91.2774C267.652 91.5379 268.047 92.1036 268.047 92.831C268.047 93.9536 267.185 94.708 265.964 94.708Z" fill="#6A737D"/>
-<path d="M55.9286 123.073V119.93L53.1102 115.634H54.5456L56.5363 118.714L58.5374 115.634H59.9833L57.1544 119.94V123.073H55.9286ZM63.9185 122.392C63.3946 122.916 62.745 123.178 61.9697 123.178C61.1944 123.178 60.5413 122.916 60.0104 122.392C59.4866 121.861 59.2247 121.215 59.2247 120.453C59.2247 119.692 59.4866 119.049 60.0104 118.526C60.5413 117.995 61.1944 117.729 61.9697 117.729C62.745 117.729 63.3946 117.995 63.9185 118.526C64.4493 119.049 64.7147 119.692 64.7147 120.453C64.7147 121.215 64.4493 121.861 63.9185 122.392ZM61.9697 122.109C62.4237 122.109 62.7974 121.952 63.0908 121.637C63.3911 121.316 63.5413 120.921 63.5413 120.453C63.5413 119.985 63.3911 119.594 63.0908 119.28C62.7974 118.959 62.4237 118.798 61.9697 118.798C61.5087 118.798 61.128 118.959 60.8277 119.28C60.5343 119.594 60.3876 119.985 60.3876 120.453C60.3876 120.921 60.5343 121.316 60.8277 121.637C61.128 121.952 61.5087 122.109 61.9697 122.109ZM67.7493 123.178C67.1486 123.178 66.6736 122.978 66.3244 122.58C65.9751 122.175 65.8005 121.637 65.8005 120.967V117.834H66.953V120.778C66.953 121.197 67.0438 121.529 67.2254 121.774C67.407 122.011 67.6655 122.13 68.0007 122.13C68.3919 122.13 68.7027 121.983 68.9332 121.69C69.1637 121.389 69.279 120.963 69.279 120.412V117.834H70.4315V123.073H69.279V122.36C68.9716 122.905 68.4617 123.178 67.7493 123.178ZM74.448 123.073V117.834H75.6005V118.767C75.6983 118.473 75.8764 118.236 76.1348 118.054C76.4003 117.873 76.6831 117.782 76.9835 117.782C77.1651 117.782 77.3153 117.796 77.434 117.824V119.008C77.2664 118.945 77.0743 118.913 76.8578 118.913C76.5085 118.913 76.2117 119.056 75.9672 119.343C75.7227 119.622 75.6005 120.013 75.6005 120.516V123.073H74.448ZM80.6118 123.178C79.8155 123.178 79.159 122.923 78.6421 122.413C78.1322 121.903 77.8773 121.25 77.8773 120.453C77.8773 119.678 78.1357 119.032 78.6526 118.515C79.1694 117.991 79.8225 117.729 80.6118 117.729C81.3382 117.729 81.9389 117.96 82.4139 118.421C82.8958 118.882 83.1368 119.517 83.1368 120.328C83.1368 120.467 83.1333 120.593 83.1263 120.705H79.0088C79.0367 121.131 79.2009 121.477 79.5012 121.742C79.8016 122.001 80.1753 122.13 80.6223 122.13C81.2928 122.13 81.7922 121.864 82.1205 121.334L83.0006 121.962C82.4977 122.772 81.7014 123.178 80.6118 123.178ZM79.0612 119.867H81.9739C81.911 119.504 81.7468 119.221 81.4814 119.018C81.223 118.809 80.9191 118.704 80.5699 118.704C80.2067 118.704 79.8819 118.805 79.5955 119.008C79.3161 119.21 79.138 119.497 79.0612 119.867ZM86.7104 123.178C85.9211 123.178 85.261 122.919 84.7302 122.402C84.2063 121.878 83.9444 121.229 83.9444 120.453C83.9444 119.678 84.2063 119.032 84.7302 118.515C85.261 117.991 85.9211 117.729 86.7104 117.729C87.2482 117.729 87.7302 117.859 88.1562 118.117C88.5893 118.375 88.9211 118.728 89.1516 119.175L88.1458 119.72C88.0131 119.441 87.821 119.217 87.5695 119.049C87.3181 118.882 87.0317 118.798 86.7104 118.798C86.2494 118.798 85.8687 118.959 85.5684 119.28C85.268 119.594 85.1178 119.985 85.1178 120.453C85.1178 120.921 85.268 121.316 85.5684 121.637C85.8687 121.952 86.2494 122.109 86.7104 122.109C87.0317 122.109 87.3181 122.025 87.5695 121.857C87.821 121.69 88.0131 121.466 88.1458 121.187L89.1516 121.732C88.9211 122.179 88.5893 122.531 88.1562 122.79C87.7302 123.048 87.2482 123.178 86.7104 123.178ZM92.5726 123.178C91.7764 123.178 91.1198 122.923 90.6029 122.413C90.093 121.903 89.8381 121.25 89.8381 120.453C89.8381 119.678 90.0965 119.032 90.6134 118.515C91.1303 117.991 91.7834 117.729 92.5726 117.729C93.2991 117.729 93.8998 117.96 94.3747 118.421C94.8567 118.882 95.0977 119.517 95.0977 120.328C95.0977 120.467 95.0942 120.593 95.0872 120.705H90.9696C90.9976 121.131 91.1617 121.477 91.4621 121.742C91.7624 122.001 92.1361 122.13 92.5831 122.13C93.2537 122.13 93.7531 121.864 94.0814 121.334L94.9615 121.962C94.4585 122.772 93.6623 123.178 92.5726 123.178ZM91.022 119.867H93.9347C93.8718 119.504 93.7077 119.221 93.4423 119.018C93.1838 118.809 92.88 118.704 92.5307 118.704C92.1675 118.704 91.8427 118.805 91.5564 119.008C91.277 119.21 91.0988 119.497 91.022 119.867ZM96.8587 116.692C96.6491 116.692 96.4675 116.619 96.3138 116.472C96.1602 116.318 96.0833 116.133 96.0833 115.917C96.0833 115.707 96.1602 115.529 96.3138 115.382C96.4675 115.229 96.6491 115.152 96.8587 115.152C97.0752 115.152 97.2568 115.229 97.4035 115.382C97.5502 115.529 97.6235 115.707 97.6235 115.917C97.6235 116.133 97.5502 116.318 97.4035 116.472C97.2568 116.619 97.0752 116.692 96.8587 116.692ZM96.2824 123.073V117.834H97.4349V123.073H96.2824ZM100.618 123.073L98.2502 117.834H99.5284L101.121 121.512L102.724 117.834H104.013L101.634 123.073H100.618ZM107.05 123.178C106.254 123.178 105.598 122.923 105.081 122.413C104.571 121.903 104.316 121.25 104.316 120.453C104.316 119.678 104.574 119.032 105.091 118.515C105.608 117.991 106.261 117.729 107.05 117.729C107.777 117.729 108.378 117.96 108.853 118.421C109.335 118.882 109.575 119.517 109.575 120.328C109.575 120.467 109.572 120.593 109.565 120.705H105.447C105.475 121.131 105.64 121.477 105.94 121.742C106.24 122.001 106.614 122.13 107.061 122.13C107.731 122.13 108.231 121.864 108.559 121.334L109.439 121.962C108.936 122.772 108.14 123.178 107.05 123.178ZM105.5 119.867H108.413C108.35 119.504 108.186 119.221 107.92 119.018C107.662 118.809 107.358 118.704 107.009 118.704C106.645 118.704 106.321 118.805 106.034 119.008C105.755 119.21 105.577 119.497 105.5 119.867Z" fill="#535A61"/>
-<rect x="190.577" y="110.592" width="38.974" height="17.961" rx="8.98049" fill="#1C8234" fill-opacity="0.1"/>
-<path d="M196.952 120.548V119.531H198.649V117.834H199.676V119.531H201.374V120.548H199.676V122.245H198.649V120.548H196.952ZM205.779 123.073V116.776H204.28L205.16 115.634H206.931V123.073H205.779ZM209.233 123.157C208.989 123.157 208.775 123.069 208.594 122.895C208.419 122.713 208.332 122.497 208.332 122.245C208.332 122.001 208.419 121.788 208.594 121.606C208.775 121.424 208.989 121.334 209.233 121.334C209.484 121.334 209.697 121.424 209.872 121.606C210.054 121.788 210.145 122.001 210.145 122.245C210.145 122.497 210.054 122.713 209.872 122.895C209.697 123.069 209.484 123.157 209.233 123.157ZM216.029 121.941V123.073H211.105V122.654C211.105 122.388 211.143 122.137 211.22 121.899C211.304 121.655 211.391 121.452 211.482 121.292C211.573 121.131 211.723 120.953 211.932 120.757C212.142 120.555 212.303 120.412 212.414 120.328C212.526 120.237 212.722 120.09 213.001 119.888C213.287 119.685 213.469 119.556 213.546 119.5C213.986 119.179 214.304 118.896 214.499 118.651C214.695 118.407 214.793 118.114 214.793 117.771C214.793 117.429 214.688 117.157 214.478 116.954C214.269 116.745 213.979 116.64 213.609 116.64C213.225 116.64 212.907 116.755 212.655 116.985C212.404 117.209 212.275 117.516 212.268 117.907H211.105C211.105 117.202 211.342 116.626 211.817 116.179C212.299 115.732 212.9 115.508 213.619 115.508C214.283 115.508 214.838 115.704 215.285 116.095C215.732 116.486 215.956 117.034 215.956 117.74C215.956 118.299 215.826 118.77 215.568 119.154C215.317 119.531 214.897 119.93 214.311 120.349C214.22 120.419 214.052 120.537 213.808 120.705C213.563 120.873 213.382 121.002 213.263 121.093C213.151 121.183 213.029 121.309 212.896 121.47C212.764 121.623 212.673 121.781 212.624 121.941H216.029ZM219.669 123.178C218.922 123.178 218.286 122.954 217.762 122.507C217.245 122.06 216.98 121.47 216.966 120.736H218.119C218.146 121.134 218.304 121.452 218.59 121.69C218.883 121.927 219.243 122.046 219.669 122.046C220.053 122.046 220.368 121.945 220.612 121.742C220.864 121.54 220.993 121.26 221 120.904C221 120.513 220.871 120.219 220.612 120.024C220.361 119.821 220.011 119.72 219.564 119.72H218.978V118.735H219.564C219.935 118.735 220.228 118.637 220.444 118.442C220.668 118.246 220.783 117.991 220.79 117.677C220.79 117.37 220.678 117.122 220.455 116.933C220.231 116.738 219.956 116.64 219.627 116.64C219.236 116.64 218.911 116.755 218.653 116.985C218.394 117.209 218.265 117.516 218.265 117.907H217.102C217.102 117.181 217.347 116.601 217.836 116.168C218.332 115.728 218.929 115.508 219.627 115.508C220.319 115.508 220.878 115.704 221.304 116.095C221.737 116.486 221.953 116.989 221.953 117.604C221.953 117.946 221.866 118.264 221.691 118.557C221.517 118.843 221.3 119.063 221.042 119.217C221.384 119.364 221.656 119.591 221.859 119.898C222.061 120.205 222.163 120.565 222.163 120.977C222.163 121.627 221.929 122.158 221.461 122.57C221 122.975 220.403 123.178 219.669 123.178Z" fill="#1C8234"/>
-<rect x="232.545" y="110.592" width="41.948" height="17.961" rx="8.98049" fill="#F2F4F6"/>
-<g clip-path="url(#clip2_201_47502)">
-<rect x="235.538" y="113.586" width="11.974" height="11.974" fill="url(#pattern1)"/>
-</g>
-<path d="M251.599 123.073V115.634H253.737C256.021 115.634 257.697 117.226 257.697 119.353C257.697 121.48 256.021 123.073 253.737 123.073H251.599ZM252.574 122.161H253.737C255.528 122.161 256.712 120.977 256.712 119.353C256.712 117.729 255.528 116.545 253.737 116.545H252.574V122.161ZM257.993 123.073L261.283 115.634H262.09L265.39 123.073H264.374L263.41 120.904H259.942L258.999 123.073H257.993ZM261.671 116.954L260.329 120.024H263.022L261.671 116.954ZM266.435 123.073V115.634H267.41V123.073H266.435Z" fill="#24272A"/>
-<path d="M247.44 141.84V141.122C246.507 141.023 245.743 140.403 245.716 139.254H246.489C246.569 139.927 246.929 140.269 247.44 140.367V138.131L247.135 138.014C246.174 137.628 245.752 137.027 245.752 136.2C245.752 135.212 246.498 134.647 247.44 134.575V133.883H247.925V134.593C248.716 134.71 249.461 135.248 249.461 136.191H248.689C248.617 135.751 248.348 135.446 247.925 135.347V137.449L248.15 137.538C249.093 137.925 249.605 138.481 249.605 139.406C249.605 140.511 248.877 141.059 247.925 141.131V141.84H247.44ZM248.832 139.46C248.832 138.886 248.509 138.58 247.925 138.329V140.385C248.428 140.322 248.832 139.963 248.832 139.46ZM246.524 136.2C246.524 136.694 246.794 136.982 247.44 137.26V135.32C246.866 135.383 246.524 135.733 246.524 136.2ZM253.847 141.05V135.437H252.616L253.245 134.674H254.619V141.05H253.847ZM256.783 141.122C256.415 141.122 256.119 140.816 256.119 140.448C256.119 140.089 256.415 139.775 256.783 139.775C257.152 139.775 257.448 140.089 257.448 140.448C257.448 140.816 257.152 141.122 256.783 141.122ZM262.673 140.304V141.05H258.542V140.744C258.542 139.379 259.736 138.751 260.679 138.05C261.424 137.503 261.811 137.17 261.811 136.425C261.811 135.751 261.335 135.32 260.643 135.32C259.952 135.32 259.323 135.751 259.323 136.578H258.533C258.533 135.356 259.449 134.566 260.634 134.566C261.694 134.566 262.601 135.186 262.601 136.434C262.601 137.368 262.17 137.907 261.128 138.661C260.392 139.209 259.637 139.559 259.494 140.304H262.673ZM265.964 141.14C264.706 141.14 263.692 140.286 263.692 139.11H264.473C264.518 139.882 265.164 140.385 265.964 140.385C266.673 140.385 267.257 139.981 267.257 139.236C267.257 138.445 266.691 138.086 265.865 138.086H265.389V137.377H265.901C266.574 137.377 267.068 136.955 267.077 136.344C267.077 135.742 266.574 135.32 265.928 135.32C265.209 135.32 264.59 135.751 264.59 136.578H263.799C263.799 135.329 264.751 134.566 265.928 134.566C267.014 134.566 267.868 135.239 267.868 136.317C267.859 136.937 267.499 137.458 267.005 137.709C267.652 137.969 268.047 138.535 268.047 139.263C268.047 140.385 267.185 141.14 265.964 141.14Z" fill="#6A737D"/>
-</g>
-</g>
-<defs>
-<filter id="filter0_d_201_47502" x="25" y="9" width="277.467" height="166.024" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="8"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_201_47502"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_201_47502" result="shape"/>
-</filter>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_201_47502" transform="scale(0.0123457)"/>
-</pattern>
-<pattern id="pattern1" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image1_201_47502" transform="scale(0.0123457)"/>
-</pattern>
-<linearGradient id="paint0_linear_201_47502" x1="249.571" y1="165.713" x2="217.453" y2="182.026" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint1_linear_201_47502" x1="190.573" y1="218.947" x2="118.834" y2="316.8" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint2_linear_201_47502" x1="184.654" y1="35.1492" x2="466.657" y2="19.7551" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint3_linear_201_47502" x1="177.789" y1="6.31976" x2="271.414" y2="-11.8954" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint4_linear_201_47502" x1="126.04" y1="37.2221" x2="6.192" y2="98.6315" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint5_linear_201_47502" x1="-63.37" y1="119.636" x2="75.4403" y2="78.2284" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint6_linear_201_47502" x1="295.929" y1="97.1969" x2="292.03" y2="98.1505" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint7_linear_201_47502" x1="263.469" y1="159.809" x2="259.57" y2="160.762" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint8_linear_201_47502" x1="36.8853" y1="14.3" x2="32.9861" y2="15.2536" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint9_linear_201_47502" x1="285.398" y1="71.843" x2="281.499" y2="72.7966" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint10_linear_201_47502" x1="298.861" y1="158.183" x2="294.962" y2="159.137" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="1" stop-color="#75C3FC"/>
-</linearGradient>
-<linearGradient id="paint11_linear_201_47502" x1="213.762" y1="6.54646" x2="393.044" y2="19.2669" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint12_linear_201_47502" x1="277.015" y1="116.458" x2="16.5571" y2="217.495" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<linearGradient id="paint13_linear_201_47502" x1="361.542" y1="80.3845" x2="226.629" y2="113.175" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint14_linear_201_47502" x1="323.791" y1="131.085" x2="254.958" y2="148.013" gradientUnits="userSpaceOnUse">
-<stop stop-color="#75C3FC"/>
-<stop offset="0.0929" stop-color="#81C2F6"/>
-<stop offset="1" stop-color="#F0B8BD"/>
-</linearGradient>
-<linearGradient id="paint15_linear_201_47502" x1="135.862" y1="174.212" x2="75.8371" y2="188.999" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFE466"/>
-<stop offset="1" stop-color="#FFAFEA"/>
-</linearGradient>
-<clipPath id="clip0_201_47502">
-<rect width="526" height="180" fill="white" transform="translate(-99)"/>
-</clipPath>
-<clipPath id="clip1_201_47502">
-<rect width="11.974" height="11.974" fill="white" transform="translate(233.538 67.1543)"/>
-</clipPath>
-<clipPath id="clip2_201_47502">
-<rect width="11.974" height="11.974" fill="white" transform="translate(235.538 113.586)"/>
-</clipPath>
-<image id="image0_201_47502" width="81" height="81" xlink:href="data:image/png;base64,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"/>
-<image id="image1_201_47502" width="81" height="81" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFEAAABRCAYAAACqj0o2AAAMP2lDQ1BJQ0MgUHJvZmlsZQAASImVVwdYU8kWnluSkJDQQpcSehNEpASQEkILvSOISkgChBJjIKjYy6KCaxcVsKGrIoqdZkERO4ti74sFFWVdLNiVNymg677yvfm+ufPff87858y5M/feAUD9OFcszkM1AMgXFUriQgIYY1JSGaQngAqIQBW4Ahsur0DMiomJALAMtn8v764DRNZecZRp/bP/vxZNvqCABwASA3EGv4CXD/FBAPAqnlhSCABRxltMLhTLMKxAWwIDhHihDGcpcJUMZyjwXrlNQhwb4jYAVKhcriQLALVLkGcU8bKghlofxM4ivlAEgDoDYt/8/Il8iNMhtoU2Yohl+syMH3Sy/qaZMaTJ5WYNYcVc5EUlUFggzuNO/T/T8b9Lfp500Ic1rNRsSWicbM4wbzdzJ4bLMBXiXlFGVDTEWhB/EPLl9hCjlGxpaKLCHjXiFbBhzoAuxM58bmA4xEYQB4vyoiKUfEamMJgDMVwh6BRhIScBYn2IFwoKguKVNpskE+OUvtD6TAmbpeTPciVyvzJf96W5iSyl/utsAUepj6kVZyckQ0yB2LJImBQFsRrETgW58eFKm9HF2eyoQRuJNE4WvyXEcQJRSIBCHyvKlATHKe1L8wsG54ttyhZyopR4f2F2QqgiP1gbjyuPH84FuyQQsRIHdQQFYyIG58IXBAYp5o49E4gS45U6H8SFAXGKsThFnBejtMfNBXkhMt4cYteConjlWDypEC5IhT6eKS6MSVDEiRfncMNiFPHgy0AEYINAwABSWDPARJADhB29Db3wTtETDLhAArKAADgqmcERyfIeEbzGg2LwJ0QCUDA0LkDeKwBFkP86xCqujiBT3lskH5ELnkCcD8JBHryXykeJhrwlgceQEf7DOxdWHow3D1ZZ/7/nB9nvDAsyEUpGOuiRoT5oSQwiBhJDicFEO9wQ98W98Qh49YfVBWfinoPz+G5PeELoJDwkXCN0EW5NEM6V/BRlJOiC+sHKXGT8mAvcGmq64QG4D1SHyrgubggccVfoh4X7Qc9ukGUr45ZlhfGT9t9m8MPTUNqRnckoWY/sT7b9eaSavZrbkIos1z/mRxFrxlC+2UM9P/tn/5B9PmzDf7bEFmIHsDPYCewcdgRrAAysBWvE2rGjMjy0uh7LV9egtzh5PLlQR/gPf4NPVpbJAuda5x7nL4q+QsEU2TsasCeKp0qEWdmFDBb8IggYHBHPaTjDxdnFBQDZ90Xx+noTK/9uILrt37l5fwDg0zIwMHD4OxfWAsA+D7j9m75ztkz46VAF4GwTTyopUnC47EKAbwl1uNMMgAmwALZwPi7AHXgDfxAEwkA0SAApYDyMPhuucwmYDKaDOaAElIFlYDWoABvBFrAD7Ab7QQM4Ak6A0+ACuASugTtw9XSDF6APvAOfEQQhITSEjhggpogV4oC4IEzEFwlCIpA4JAVJR7IQESJFpiPzkDJkBVKBbEZqkH1IE3ICOYd0IreQB0gP8hr5hGIoFdVGjVFrdATKRFloOJqAjkOz0EloMTofXYKuRavRXWg9egK9gF5Du9AXaD8GMFVMFzPDHDEmxsaisVQsE5NgM7FSrByrxuqwZvicr2BdWC/2ESfidJyBO8IVHIon4jx8Ej4TX4xX4DvwerwNv4I/wPvwbwQawYjgQPAicAhjCFmEyYQSQjlhG+EQ4RTcS92Ed0QiUZdoQ/SAezGFmEOcRlxMXE/cQzxO7CQ+IvaTSCQDkgPJhxRN4pIKSSWkdaRdpBbSZVI36YOKqoqpiotKsEqqikhlrkq5yk6VYyqXVZ6qfCZrkK3IXuRoMp88lbyUvJXcTL5I7iZ/pmhSbCg+lARKDmUOZS2ljnKKcpfyRlVV1VzVUzVWVag6W3Wt6l7Vs6oPVD9Staj2VDY1jSqlLqFupx6n3qK+odFo1jR/WiqtkLaEVkM7SbtP+6BGV3NS46jx1WapVarVq11We6lOVrdSZ6mPVy9WL1c/oH5RvVeDrGGtwdbgaszUqNRo0rih0a9J1xypGa2Zr7lYc6fmOc1nWiQta60gLb7WfK0tWie1HtExugWdTefR59G30k/Ru7WJ2jbaHO0c7TLt3dod2n06WjquOkk6U3QqdY7qdOliuta6HN083aW6+3Wv637SM9Zj6Qn0FunV6V3We68/TN9fX6Bfqr9H/5r+JwOGQZBBrsFygwaDe4a4ob1hrOFkww2Gpwx7h2kP8x7GG1Y6bP+w20aokb1RnNE0oy1G7Ub9xibGIcZi43XGJ417TXRN/E1yTFaZHDPpMaWb+poKTVeZtpg+Z+gwWIw8xlpGG6PPzMgs1Exqttmsw+yzuY15ovlc8z3m9ywoFkyLTItVFq0WfZamlpGW0y1rLW9bka2YVtlWa6zOWL23trFOtl5g3WD9zEbfhmNTbFNrc9eWZutnO8m22vaqHdGOaZdrt97ukj1q72afbV9pf9EBdXB3EDqsd+gcThjuOVw0vHr4DUeqI8uxyLHW8YGTrlOE01ynBqeXIyxHpI5YPuLMiG/Obs55zlud74zUGhk2cu7I5pGvXexdeC6VLldH0UYFj5o1qnHUK1cHV4HrBtebbnS3SLcFbq1uX9093CXude49HpYe6R5VHjeY2swY5mLmWU+CZ4DnLM8jnh+93L0KvfZ7/eXt6J3rvdP72Wib0YLRW0c/8jH34fps9unyZfim+27y7fIz8+P6Vfs99Lfw5/tv83/KsmPlsHaxXgY4B0gCDgW8Z3uxZ7CPB2KBIYGlgR1BWkGJQRVB94PNg7OCa4P7QtxCpoUcDyWEhocuD73BMebwODWcvjCPsBlhbeHU8PjwivCHEfYRkojmSDQyLHJl5N0oqyhRVEM0iOZEr4y+F2MTMynmcCwxNia2MvZJ3Mi46XFn4unxE+J3xr9LCEhYmnAn0TZRmtiapJ6UllST9D45MHlFcteYEWNmjLmQYpgiTGlMJaUmpW5L7R8bNHb12O40t7SStOvjbMZNGXduvOH4vPFHJ6hP4E44kE5IT07fmf6FG82t5vZncDKqMvp4bN4a3gu+P38Vv0fgI1gheJrpk7ki81mWT9bKrJ5sv+zy7F4hW1ghfJUTmrMx531udO723IG85Lw9+Sr56flNIi1RrqhtosnEKRM7xQ7iEnHXJK9Jqyf1ScIl2wqQgnEFjYXa8Ee+XWor/UX6oMi3qLLow+SkyQemaE4RTWmfaj910dSnxcHFv03Dp/GmtU43mz5n+oMZrBmbZyIzM2a2zrKYNX9W9+yQ2TvmUObkzvl9rvPcFXPfzkue1zzfeP7s+Y9+CfmltkStRFJyY4H3go0L8YXChR2LRi1at+hbKb/0fJlzWXnZl8W8xed/Hfnr2l8HlmQu6VjqvnTDMuIy0bLry/2W71ihuaJ4xaOVkSvrVzFWla56u3rC6nPlruUb11DWSNd0rY1Y27jOct2ydV8qsiuuVQZU7qkyqlpU9X49f/3lDf4b6jYabyzb+GmTcNPNzSGb66utq8u3ELcUbXmyNWnrmd+Yv9VsM9xWtu3rdtH2rh1xO9pqPGpqdhrtXFqL1kpre3al7bq0O3B3Y51j3eY9unvK9oK90r3P96Xvu74/fH/rAeaBuoNWB6sO0Q+V1iP1U+v7GrIbuhpTGjubwppam72bDx12Orz9iNmRyqM6R5ceoxybf2ygpbil/7j4eO+JrBOPWie03jk55uTVtti2jlPhp86eDj598gzrTMtZn7NHznmdazrPPN9wwf1Cfbtb+6Hf3X4/1OHeUX/R42LjJc9LzZ2jO49d9rt84krgldNXOVcvXIu61nk98frNG2k3um7ybz67lXfr1e2i25/vzL5LuFt6T+Ne+X2j+9V/2P2xp8u96+iDwAftD+Mf3nnEe/TiccHjL93zn9CelD81fVrzzOXZkZ7gnkvPxz7vfiF+8bm35E/NP6te2r48+Jf/X+19Y/q6X0leDbxe/Mbgzfa3rm9b+2P677/Lf/f5fekHgw87PjI/nvmU/Onp58lfSF/WfrX72vwt/NvdgfyBATFXwpX/CmCwopmZALzeDgAtBQA6PJ9RxirOf/KCKM6scgT+E1acEeXFHYA6+P8e2wv/bm4AsHcrPH5BffU0AGJoACR4AnTUqKE6eFaTnytlhQjPAZtivmbkZ4B/UxRnzh/i/rkFMlVX8HP7L63RfIDvyMpLAAAAOGVYSWZNTQAqAAAACAABh2kABAAAAAEAAAAaAAAAAAACoAIABAAAAAEAAABRoAMABAAAAAEAAABRAAAAAKjujIYAAAlFSURBVHgB5V3NbxtFFH9vbbdJ64S0ByrooYuEVDhUdZKCEJc6F6SEQpsrl4YLHNuI3pP8AVXDkV6anDg2pahBFVLcG0IlceGAkCrFSBRUDhCaNEmT7A7vjT3uer27Xq9n/TmX2Z2ZffPez+9jvnaN0GZpZ/k900pYQ8ISQwJs08keglHg+yQkC/3jP8hrvm91wlYysHX/nQzYVhYFnBVCZIQBJl0PheZJQB4NLNgCHgEYuYHxh7nQz2ps2FQQxe3M0FZfMmOAfdlGcakuwMILTUDiYgLsXP94vhD+segtmwLi5vK5LKJ9UYCYigk4TwQQccmycXFw4qclzwaaCmMFUYIH1gzxmtXEb1QyBdLOufT46kJUAkHPxQJiG4Hnlr0QB5haQWSf97zfuAFCTLm5b7P7QgLEmC6faegSbmd59PJWP653AIAssmkBrj9fHmFX03BqWBOl9vWR9lHQaJib1hBoWCsbAnFnOcO/6ArJbrZGfm290lhTTA9O5CNF8cjmvHU/kzlAXOsCAPmXMA3E21HNOxKI7P+EjSvNHPNp07kAQjSOnY0CZN3mzABaYC8E8NLxVQg4e3R8dS6sIHWB+Pze6CWB9u2wxDu5XT1AhgaRgwj7wG4z4cAfWuB0emJ1PrANVYYCsYuicC08qurJT44NjOdzVRWOglCBxRLIJmw6nuuZSzLrW6xEQQLXBFFGK4RMEJEur+Ox8K0gGQPNuWTG60EEeqYuwD8GamJpNtIzOAUKaogZP7NO+j24/d3oFVvYpl992PLE8XOA/a+Hbe7bTuz8KevsZ7+BONj0bRdbBW1blMx6zN2HpznrjMaHz8xB8uRH7n4bumcQGcyDv3NgPc2BArghoiEf9orWnuZsoXGFaJoh6Ta9GSYHgDX88FvX4Mj5b6H//a+1/1B+QlG0nnHXVYEo7V6Iq+6G7XxvDJ4G1ngGVLfWe8id3VzOZJ3lVT7REsYloGlJnMn652Fd5FnzIDUARg3fyr6XwTz05uew8+NnsZl5SRtzSogqn7i1PMxDGlM1aDR3+0T2X9sPLkQmy1pnDJwmcx6FxIksSIA9qLHf3Pt5lvzmikethqKEGE5/kM8zpQpzfkYLDFRmckW7JhlQnnwDL36Zge3vz1M+C3Ypcjt5ZnAPj1yHpPmJs1jbtbDIYkupAkTDEBdVRafkBwToDmn2/uOvPFnm4BOHn0QUHHxlqgCxQzaZFO8V+R6ByG7CSysPvX0N2A1oTTRuVAGmDGLJlLX202xi7G93KaC4gWTT7hu+7us/I/PJQZhSGcRONGUv4RWQ7lkNR27d/pFMWrq/Moi05ZnxYqoTyxjIF6tfVLGeoiCjYwrqIGz+SwcWJIh8AaK7lrt4LHrw5K5DXlqBJrPWHWQOHYGsHGwn6bgbgFXRYb03/AvzVMydsP+1yiIaNCdPflxZFtOd2zdyN6yNYuevqh6tpyuRFjZoqGNKEOnYW4Y0saEk57JnZmvSkOO3EO1qEorYwK//bZ5FRVgdQoSz0pyF3d4D7Ih4NeUxgYIOrXIy4FRTeuzGTmi8KEFEIYa6Ub4myVT0iYB02LxBn8jRkAe67sRjs+Sr2XIxj9+8hh/lBjFcuHngLnjOzUMhlZzXqixsXlwKI5UM+4BfO2bCcjCl2lUNKfY3od6lMEUrap5w/IiKhrVJ2wy0Oq4jFX2iDkptTMM9e2FWDV6j1JR6AkRNWPmS6QkQvVbEvQbivijVqJAr27Sazcu/2RptA6s5eKRoycmdkGYoPMB1Jp0COOn6XYfhgYNi1OAiA4tA3KBhjh8P4cpTgzX3QBQhL81Qdc3KtfGAsFE0Zxt+bxbzXdhPQYKIBhS6ULjmiCRgQ5qzbWPBaHSb1Gf8x6s7btNp5jjRa2XJs3/iP0oSAh9JEFNo5emcSRQa5Wd4a9Jre5K3TI2TL8/isPP2mtmUCWm84JmKG0Te2OLZiq5kJOycNOfS61kFXYTbgQ5bQOpU9Xbp3uObWtkTCEWfyFRtgAdaqbeYGG9Mud0Ia2HUYYyPOAXewC9GZ9kCcz4NO65YuhDXFimDp1sLacNBYlYG0dq1lzoOLRfDxVVr76N8vC+tWQsBDfsOs1AG8dhkfoPuc1zYiYk35/vevem5EcWnI9ybVjpk3Nsu4lVcClMUEe/QKYisuu2EnLUvRafAeAPKKzGArIX6Ey4cm1xjxYMKEPd37IVUPx1i1LC+qJ/plxQZuMSJMdK6C1VDmJetQJ7PiQdA2qUHe1H1VQEim/TmvZFF52Ed1VBbTgsSrDn1JAYNU+niGUU6VueOum5asR+rAyg4XxCqAJGZQUEvPyKWTzy5GWz0ngHhQ5hxJR7G7P16PdIecniexJyzbTmwqML0h/LgYk7dd0rOsyWeCcm9kwj7x3XIWUiP5xec7as0UVYmxDRY8oVwZ9u2umaTLb9B8MfdmDXPKXqlFnKN74SZfOO8Dt/IR0YSx0ecXES+tun4Bx8BsWmTiQFsQSItXHvD3a8viHzIiSL1ertHardAcd7TdyImvb4TUeUTFRNy8G1Xq66q770cF7wAZBx8QeTK9ER+nrIcX/d4os++2BUR2YlHIIjccH9XTFJW4OueTQkxGfQ1p5ogslnT+2yf9iqAJPucel/FD4OaIPKDcnROH9/xI9Kt5fRhzC9J9tla8vlGZ68H6ZWDWa8XBL3adnwZfSU0PbE2HEaOUJqoCPGvwuqt7rs2JwCPvhBjYeWrSxMV0a7WyBKAWFxfVSIH5nVpoqLUrRppg1hkDawHQMYkkiYqMLfuZa7Sis8Ndd/JuQwiE/mrUWRoCETuUOenDqII0OgztOXJ55Cm3Ssz9dCNZM7ODngQSgPyYdpyXXSWd8h1LinovWXX0la9vDesic4Ot5YzU+QhZqjMdJa327XUPloXKE1rG2ZPK4iKm/aO3rjA8+CgaZySI2weC4jcOfvKffoOIfmLy2GZibldjse4cvaluaPYQFR8FgMPZFth5my2QF98T6I9r1PzlGwqjx1E1RHn/Ka6AJwi7TxPtyaX6U7FaAt5HvMN7MJSvWO+KPw0FUQngwwovVxIL2biRRI8E/Xjlgo0PicIaC+ld+mfMeqYbTh5inrdMhDdDBf/IQMydHLcpP9dMXlbwkB4xdmO/jLkPyATpY3zAtVvpBDycZqps++g6/8BJFpZMbVrsYcAAAAASUVORK5CYII="/>
-</defs>
-</svg>
diff --git a/shared/notifications/index.ts b/shared/notifications/index.ts
index ae0431734935..8a90a5c1ea5c 100644
--- a/shared/notifications/index.ts
+++ b/shared/notifications/index.ts
@@ -5,10 +5,6 @@
  * into numbers in only one place. This should make merge conflicts easier.
  */
 export const NOTIFICATION_DROP_LEDGER_FIREFOX = 25;
-export const NOTIFICATION_U2F_LEDGER_LIVE = 28;
-export const NOTIFICATION_BLOCKAID_DEFAULT = 29;
-export const NOTIFICATION_PETNAMES = 31;
-export const NOTIFICATION_SIMULATIONS = 33;
 
 type NotificationImage = {
   src: string;
@@ -27,45 +23,11 @@ type UINotifications = {
 };
 
 export const UI_NOTIFICATIONS: UINotifications = {
-  8: {
-    id: 8,
-    date: '2021-11-01',
-  },
-  20: {
-    id: 20,
-    date: null,
-  },
-  24: {
-    id: 24,
-    date: null,
-  },
   // This syntax is unusual, but very helpful here.  It's equivalent to `UI_NOTIFICATIONS[NOTIFICATION_DROP_LEDGER_FIREFOX] =`
   [NOTIFICATION_DROP_LEDGER_FIREFOX]: {
     id: Number(NOTIFICATION_DROP_LEDGER_FIREFOX),
     date: null,
   },
-  [NOTIFICATION_U2F_LEDGER_LIVE]: {
-    id: Number(NOTIFICATION_U2F_LEDGER_LIVE),
-    date: null,
-  },
-  ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-  [NOTIFICATION_BLOCKAID_DEFAULT]: {
-    id: Number(NOTIFICATION_BLOCKAID_DEFAULT),
-    date: null,
-  },
-  ///: END:ONLY_INCLUDE_IF
-  [NOTIFICATION_PETNAMES]: {
-    id: Number(NOTIFICATION_PETNAMES),
-    date: null,
-    image: {
-      src: 'images/petnames-whatsnew-banner.svg',
-      width: '100%',
-    },
-  },
-  [NOTIFICATION_SIMULATIONS]: {
-    id: Number(NOTIFICATION_SIMULATIONS),
-    date: '2024-04-09',
-  },
 };
 
 type TranslationFunction = (key: string) => string;
@@ -105,42 +67,11 @@ const formatDate = (
 export const getTranslatedUINotifications = (
   t: TranslationFunction,
   locale: string,
-  ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-  theme: string,
-  ///: END:ONLY_INCLUDE_IF
 ): TranslatedUINotifications => {
   // Added return type here
   const formattedLocale = locale?.replace('_', '-');
 
   return {
-    8: {
-      ...UI_NOTIFICATIONS[8],
-      title: t('notifications8Title'),
-      description: [
-        t('notifications8DescriptionOne'),
-        t('notifications8DescriptionTwo'),
-      ],
-      date: formatDate(UI_NOTIFICATIONS[8].date, formattedLocale),
-      actionText: t('notifications8ActionText'),
-    },
-    20: {
-      ...UI_NOTIFICATIONS[20],
-      title: t('notifications20Title'),
-      description: [t('notifications20Description')],
-      actionText: t('notifications20ActionText'),
-      date: UI_NOTIFICATIONS[20].date
-        ? formatDate(UI_NOTIFICATIONS[20].date, formattedLocale)
-        : '',
-    },
-    24: {
-      ...UI_NOTIFICATIONS[24],
-      title: t('notifications24Title'),
-      description: t('notifications24Description'),
-      actionText: t('notifications24ActionText'),
-      date: UI_NOTIFICATIONS[24].date
-        ? formatDate(UI_NOTIFICATIONS[24].date, formattedLocale)
-        : '',
-    },
     // This syntax is unusual, but very helpful here.  It's equivalent to `unnamedObject[NOTIFICATION_DROP_LEDGER_FIREFOX] =`
     [NOTIFICATION_DROP_LEDGER_FIREFOX]: {
       ...UI_NOTIFICATIONS[NOTIFICATION_DROP_LEDGER_FIREFOX],
@@ -153,73 +84,5 @@ export const getTranslatedUINotifications = (
           )
         : '',
     },
-    [NOTIFICATION_U2F_LEDGER_LIVE]: {
-      ...UI_NOTIFICATIONS[NOTIFICATION_U2F_LEDGER_LIVE],
-      title: t('notificationsU2FLedgerLiveTitle'),
-      description: [t('notificationsU2FLedgerLiveDescription')],
-      date: UI_NOTIFICATIONS[NOTIFICATION_U2F_LEDGER_LIVE].date
-        ? formatDate(
-            UI_NOTIFICATIONS[NOTIFICATION_U2F_LEDGER_LIVE].date,
-            formattedLocale,
-          )
-        : '',
-    },
-    ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-    [NOTIFICATION_BLOCKAID_DEFAULT]: {
-      ...UI_NOTIFICATIONS[NOTIFICATION_BLOCKAID_DEFAULT],
-      title: t('notificationsBlockaidDefaultTitle'),
-      description: [
-        t('notificationsBlockaidDefaultDescriptionOne'),
-        t('notificationsBlockaidDefaultDescriptionTwo'),
-      ],
-      actionText: t('notificationsBlockaidDefaultDescriptionActionText'),
-      date: UI_NOTIFICATIONS[NOTIFICATION_BLOCKAID_DEFAULT].date
-        ? formatDate(
-            UI_NOTIFICATIONS[NOTIFICATION_BLOCKAID_DEFAULT].date,
-            formattedLocale,
-          )
-        : '',
-      image:
-        theme === 'dark'
-          ? {
-              src: 'images/blockaid-whats-new-theme-dark.svg',
-              width: '100%',
-            }
-          : {
-              src: 'images/blockaid-whats-new.svg',
-              width: '100%',
-            },
-    },
-    ///: END:ONLY_INCLUDE_IF
-    [NOTIFICATION_PETNAMES]: {
-      ...UI_NOTIFICATIONS[NOTIFICATION_PETNAMES],
-      title: t('notificationsPetnamesTitle'),
-      description: [
-        t('notificationsPetnamesDescriptionOne'),
-        t('notificationsPetnamesDescriptionTwo'),
-      ],
-      actionText: t('notificationsPetnamesActionText'),
-      date: '',
-    },
-    [NOTIFICATION_SIMULATIONS]: {
-      ...UI_NOTIFICATIONS[NOTIFICATION_SIMULATIONS],
-      title: t('simulationsSettingSubHeader'),
-      description: [
-        t('notificationsSimulationsDescriptionOne'),
-        t('notificationsSimulationsDescriptionTwo'),
-      ],
-      actionText: t('gotIt'),
-      date: '',
-      image:
-        theme === 'dark'
-          ? {
-              src: 'images/simulations-whatsnew-banner-dark.svg',
-              width: '100%',
-            }
-          : {
-              src: 'images/simulations-whatsnew-banner.svg',
-              width: '100%',
-            },
-    },
   };
 };
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 5e3817d7d869..a56ad75fe7fd 100644
--- a/ui/components/app/whats-new-popup/whats-new-popup.js
+++ b/ui/components/app/whats-new-popup/whats-new-popup.js
@@ -9,21 +9,13 @@ import {
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
 import {
-  ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-  NOTIFICATION_BLOCKAID_DEFAULT,
-  ///: END:ONLY_INCLUDE_IF
   NOTIFICATION_DROP_LEDGER_FIREFOX,
-  NOTIFICATION_PETNAMES,
-  NOTIFICATION_U2F_LEDGER_LIVE,
   getTranslatedUINotifications,
-  NOTIFICATION_SIMULATIONS,
 } from '../../../../shared/notifications';
 import { I18nContext } from '../../../contexts/i18n';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { getCurrentLocale } from '../../../ducks/locale/locale';
 import { TextVariant } from '../../../helpers/constants/design-system';
-import { ADVANCED_ROUTE } from '../../../helpers/constants/routes';
-import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
 import { useEqualityCheck } from '../../../hooks/useEqualityCheck';
 ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
 import { useTheme } from '../../../hooks/useTheme';
@@ -33,38 +25,11 @@ import { updateViewedNotifications } from '../../../store/actions';
 import { ButtonPrimary, Text } from '../../component-library';
 import Popover from '../../ui/popover';
 
-function getActionFunctionById(id, history) {
+function getActionFunctionById(id) {
   const actionFunctions = {
-    8: () => {
-      updateViewedNotifications({ 8: true });
-      history.push(ADVANCED_ROUTE);
-    },
-    20: () => {
-      updateViewedNotifications({ 20: true });
-      global.platform.openTab({
-        url: ZENDESK_URLS.LEDGER_FIREFOX_U2F_GUIDE,
-      });
-    },
-    24: () => {
-      updateViewedNotifications({ 24: true });
-    },
     [NOTIFICATION_DROP_LEDGER_FIREFOX]: () => {
       updateViewedNotifications({ [NOTIFICATION_DROP_LEDGER_FIREFOX]: true });
     },
-    [NOTIFICATION_U2F_LEDGER_LIVE]: () => {
-      updateViewedNotifications({ [NOTIFICATION_U2F_LEDGER_LIVE]: true });
-    },
-    ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-    [NOTIFICATION_BLOCKAID_DEFAULT]: () => {
-      updateViewedNotifications({ [NOTIFICATION_BLOCKAID_DEFAULT]: true });
-    },
-    ///: END:ONLY_INCLUDE_IF
-    [NOTIFICATION_PETNAMES]: () => {
-      updateViewedNotifications({ [NOTIFICATION_PETNAMES]: true });
-    },
-    [NOTIFICATION_SIMULATIONS]: () => {
-      updateViewedNotifications({ [NOTIFICATION_SIMULATIONS]: true });
-    },
   };
 
   return actionFunctions[id];
@@ -97,12 +62,11 @@ const renderDescription = (description) => {
 const renderFirstNotification = ({
   notification,
   idRefMap,
-  history,
   isLast,
   trackEvent,
 }) => {
   const { id, date, title, description, image, actionText } = notification;
-  const actionFunction = getActionFunctionById(id, history);
+  const actionFunction = getActionFunctionById(id);
 
   const imageComponent = image && (
     <img
@@ -280,15 +244,8 @@ export default function WhatsNewPopup({ onClose }) {
 
   // Display notifications with full image
   const notificationRenderers = {
-    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_U2F_LEDGER_LIVE]: renderFirstNotification,
-    ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-    [NOTIFICATION_BLOCKAID_DEFAULT]: renderFirstNotification,
-    ///: END:ONLY_INCLUDE_IF
-    [NOTIFICATION_PETNAMES]: renderFirstNotification,
-    [NOTIFICATION_SIMULATIONS]: renderFirstNotification,
   };
 
   return (
diff --git a/ui/components/app/whats-new-popup/whats-new-popup.test.js b/ui/components/app/whats-new-popup/whats-new-popup.test.js
index 3fad3149127d..2476aea3c01e 100644
--- a/ui/components/app/whats-new-popup/whats-new-popup.test.js
+++ b/ui/components/app/whats-new-popup/whats-new-popup.test.js
@@ -129,13 +129,4 @@ describe('WhatsNewPopup', () => {
     render();
     expect(screen.getByTestId('popover-close')).toBeInTheDocument();
   });
-  it('renders WhatsNewPopup component and shows blockaid messages', () => {
-    render();
-    expect(
-      screen.getByTestId('whats-new-description-item-0'),
-    ).toBeInTheDocument();
-    expect(
-      screen.getByTestId('whats-new-description-item-1'),
-    ).toBeInTheDocument();
-  });
 });
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 63f03504d57d..f5aaa584a4b5 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -150,6 +150,11 @@ const mapStateToProps = (state) => {
     ///: END:ONLY_INCLUDE_IF
   ]);
 
+  const TEMPORARY_DISABLE_WHATS_NEW = true;
+  const showWhatsNewPopup = TEMPORARY_DISABLE_WHATS_NEW
+    ? false
+    : getShowWhatsNewPopup(state);
+
   return {
     useExternalServices: getUseExternalServices(state),
     isBasicConfigurationModalOpen: appState.showBasicFunctionalityModal,
@@ -178,7 +183,7 @@ const mapStateToProps = (state) => {
     pendingConfirmations,
     infuraBlocked: getInfuraBlocked(state),
     announcementsToShow: getSortedAnnouncementsToShow(state).length > 0,
-    showWhatsNewPopup: getShowWhatsNewPopup(state),
+    showWhatsNewPopup,
     showRecoveryPhraseReminder: getShowRecoveryPhraseReminder(state),
     showTermsOfUsePopup: getShowTermsOfUse(state),
     showOutdatedBrowserWarning:
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 181c84297e79..7172331202d8 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -98,15 +98,7 @@ import {
   hexToDecimal,
 } from '../../shared/modules/conversion.utils';
 import { BackgroundColor } from '../helpers/constants/design-system';
-import {
-  ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-  NOTIFICATION_BLOCKAID_DEFAULT,
-  ///: END:ONLY_INCLUDE_IF
-  NOTIFICATION_DROP_LEDGER_FIREFOX,
-  NOTIFICATION_PETNAMES,
-  NOTIFICATION_U2F_LEDGER_LIVE,
-  NOTIFICATION_SIMULATIONS,
-} from '../../shared/notifications';
+import { NOTIFICATION_DROP_LEDGER_FIREFOX } from '../../shared/notifications';
 import {
   SURVEY_DATE,
   SURVEY_END_TIME,
@@ -1723,23 +1715,10 @@ export const getUnreadNotificationsCount = createSelector(
 function getAllowedAnnouncementIds(state) {
   const currentKeyring = getCurrentKeyring(state);
   const currentKeyringIsLedger = currentKeyring?.type === KeyringType.ledger;
-  const supportsWebHid = window.navigator.hid !== undefined;
-  const currentlyUsingLedgerLive =
-    getLedgerTransportType(state) === LedgerTransportTypes.live;
   const isFirefox = window.navigator.userAgent.includes('Firefox');
 
   return {
-    8: supportsWebHid && currentKeyringIsLedger && currentlyUsingLedgerLive,
-    20: currentKeyringIsLedger && isFirefox,
-    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_U2F_LEDGER_LIVE]: currentKeyringIsLedger && !isFirefox,
-    ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
-    [NOTIFICATION_BLOCKAID_DEFAULT]: true,
-    ///: END:ONLY_INCLUDE_IF
-    [NOTIFICATION_PETNAMES]: true,
-    [NOTIFICATION_SIMULATIONS]: true,
   };
 }
 

From ba5c428c1f51b62eeb3d1d57ffc6e0ce65e8018c Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 12 Jun 2024 19:09:25 -0230
Subject: [PATCH 028/236] fix: Cherry pick #25199 to v12 (#25255)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Cherry picks #25199 (4fe3c3e) to v112

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25255?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Brian Bergeron <brian.e.bergeron@gmail.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e8b22139bd37..9c1e7619adc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3646,12 +3646,12 @@ __metadata:
   linkType: hard
 
 "@grpc/grpc-js@npm:~1.9.0":
-  version: 1.9.14
-  resolution: "@grpc/grpc-js@npm:1.9.14"
+  version: 1.9.15
+  resolution: "@grpc/grpc-js@npm:1.9.15"
   dependencies:
     "@grpc/proto-loader": "npm:^0.7.8"
     "@types/node": "npm:>=12.12.47"
-  checksum: 10/417f8ce1b0a529b05f18f1432ccbe257ad4b305ad04b548dcc502adcffde48dfaa4f392e71cb782bfebc1fa23c1f32baed83da368d8c05296da0a243020a60d2
+  checksum: 10/edd45c5970046ebb1bb54856f22a41186742c77dfb7e5182ca615f690f1a320af3abeef553d8924812d56911157a04882c7d264c2de64f326f8df7d473c47b2a
   languageName: node
   linkType: hard
 

From 54e080d1f45d904aa6d75cf32dd949c946dbbd97 Mon Sep 17 00:00:00 2001
From: HJetpoluru <harika.jetpoluru@consensys.net>
Date: Thu, 13 Jun 2024 10:03:11 -0400
Subject: [PATCH 029/236] Version-v11.16.11

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bded30067fe0..6a5a2c7e8f15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.11]
+
 ## [11.16.10]
 ### Fixed
 - Capture Segment errors during initialization ([#25253](https://github.com/MetaMask/metamask-extension/pull/25253))
diff --git a/package.json b/package.json
index e196574c55e9..ef2909e5a7ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.10",
+  "version": "11.16.11",
   "private": true,
   "repository": {
     "type": "git",

From 9d6eaa1d512719cc0a575529794ea9776290db2d Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 13 Jun 2024 22:18:45 +0530
Subject: [PATCH 030/236] feat: PPOM version update (#25298)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

update @blockaid/ppom_release to version 1.4.7

## **Related issues**
NA

## **Manual testing steps**
NA

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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
- [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.
---
 package.json                                         |  2 +-
 .../__snapshots__/blockaid-banner-alert.test.js.snap | 12 ++++++------
 yarn.lock                                            | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index ef2909e5a7ed..003771d18197 100644
--- a/package.json
+++ b/package.json
@@ -256,7 +256,7 @@
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
-    "@blockaid/ppom_release": "^1.4.6",
+    "@blockaid/ppom_release": "^1.4.7",
     "@contentful/rich-text-html-renderer": "^16.3.5",
     "@ensdomains/content-hash": "^2.5.7",
     "@ethereumjs/tx": "^4.1.1",
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 9adae93219af..37e59a751325 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
@@ -54,7 +54,7 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
                 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.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.7%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"
                 >
@@ -151,7 +151,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.6%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.7%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
                   rel="noopener noreferrer"
                   target="_blank"
                 >
@@ -248,7 +248,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.7%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"
                 >
@@ -346,7 +346,7 @@ exports[`Blockaid Banner Alert should render details section even when features
                   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.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.7%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"
                   >
@@ -457,7 +457,7 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
                   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.6%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"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.7%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"
                   >
@@ -556,7 +556,7 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
                   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.6%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.7%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"
                   >
diff --git a/yarn.lock b/yarn.lock
index 8d31e99ab6b6..9a62dd32ce74 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1729,10 +1729,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@blockaid/ppom_release@npm:^1.4.6":
-  version: 1.4.6
-  resolution: "@blockaid/ppom_release@npm:1.4.6"
-  checksum: 53b9774f97ba24d98dee4a66653c83223afd2db8598d8b631ee4851731b1f68a99d05a8a2b68584d7b9a8e71370a09e79aba024d171af8a823c1053371009756
+"@blockaid/ppom_release@npm:^1.4.7":
+  version: 1.4.7
+  resolution: "@blockaid/ppom_release@npm:1.4.7"
+  checksum: 2d376796afe4dc4e008418120977f22202b52d32ab2d036e8ab511a7673afeffff8b36e9b194cceeb4ffceb3808dcc6a276e1e55fd39e37833b3e7c288fec295
   languageName: node
   linkType: hard
 
@@ -25125,7 +25125,7 @@ __metadata:
     "@babel/preset-typescript": "npm:^7.23.2"
     "@babel/register": "npm:^7.22.15"
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch"
-    "@blockaid/ppom_release": "npm:^1.4.6"
+    "@blockaid/ppom_release": "npm:^1.4.7"
     "@contentful/rich-text-html-renderer": "npm:^16.3.5"
     "@ensdomains/content-hash": "npm:^2.5.7"
     "@ethereumjs/tx": "npm:^4.1.1"

From 3464aea966b76557a6f9b6fabf2221c2d1b68c31 Mon Sep 17 00:00:00 2001
From: Jony Bursztyn <jony.bursztyn@consensys.net>
Date: Thu, 13 Jun 2024 18:56:22 +0100
Subject: [PATCH 031/236] fix (cherry-pick) : hide privacy policy toast during
 onboarding, and for onboarded users (#25303)
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 two bugs:
- Privacy policy toast should not be seen during onboarding
- Users who onboarded after the privacy policy date should not see the
new privacy policy toast.

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

## **Related issues**

Fixes:

## **Manual testing steps**

New user onbaording after the date:
1. Set the privacy policy date to a date in the future from today
2. Onboard (create a new user)
3. User should not see the privacy policy toast at any moment

New user onboarding before the date:
1. Set the privacy policy date to a date in the past from today.
2. Onboard (create a new user)
3. User should not see the privacy policy toast at any moment
4. Set the privacy policy date to a date in the future from today
5. User should not see the privacy policy toast on the home screen

Old user after the privacy policy date:
1. Have a user already onboarded
2. Make sure the `onboardingDate` is `null` in the redux state (this
simulates a user who has registered before this PR has been in
production)
3. Set the privacy policy date to a date in the future from today
4. User should not see the new privacy policy toast

Old user before the privacy policy date:
1. Have a user onboarded
2. Make sure the `onboardingDate` is `null` in the redux state (this
simulates a user who has registered before this PR has been in
production)
3. Set the privacy policy date to a date in the past before today
4. User should see the new privacy policy toast

TL;DR: If the privacy policy date is in the future, the user should
never see it -BUT- if the privacy policy is in the past, the user should
see it, as long as the user onboarded before the privacy policy date.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: David Walsh <davidwalsh83@gmail.com>
Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
Co-authored-by: NidhiKJha <menidhikjha@gmail.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
---
 app/scripts/controllers/app-state.js          |  7 +++
 app/scripts/lib/setupSentry.js                |  1 +
 app/scripts/metamask-controller.js            |  2 +
 ...rs-after-init-opt-in-background-state.json |  1 +
 .../errors-after-init-opt-in-ui-state.json    |  1 +
 ui/pages/onboarding-flow/onboarding-flow.js   |  5 ++
 .../onboarding-flow/onboarding-flow.test.js   |  1 +
 ui/pages/routes/routes.component.js           |  8 ++-
 ui/pages/routes/routes.component.test.js      | 35 +++++++++++-
 ui/selectors/selectors.js                     | 14 ++++-
 ui/selectors/selectors.test.js                | 55 +++++++++++++++++--
 ui/store/actions.ts                           |  6 ++
 12 files changed, 124 insertions(+), 12 deletions(-)

diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index 731a9d0d25e4..256dfba38438 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -52,6 +52,7 @@ export default class AppStateController extends EventEmitter {
       showAccountBanner: true,
       trezorModel: null,
       currentPopupId: undefined,
+      onboardingDate: null,
       newPrivacyPolicyToastClickedOrClosed: null,
       newPrivacyPolicyToastShownDate: null,
       // This key is only used for checking if the user had set advancedGasFee
@@ -186,6 +187,12 @@ export default class AppStateController extends EventEmitter {
     });
   }
 
+  setOnboardingDate() {
+    this.store.updateState({
+      onboardingDate: Date.now(),
+    });
+  }
+
   setNewPrivacyPolicyToastClickedOrClosed() {
     this.store.updateState({
       newPrivacyPolicyToastClickedOrClosed: true,
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 68289d0fffaf..acefee2d2825 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,
+    onboardingDate: false,
     currentExtensionPopupId: false,
     defaultHomeActiveTabName: true,
     fullScreenGasPollTokens: true,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d25c0e15e589..b283e96dca30 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3184,6 +3184,8 @@ export default class MetamaskController extends EventEmitter {
         appStateController.setSurveyLinkLastClickedOrClosed.bind(
           appStateController,
         ),
+      setOnboardingDate:
+        appStateController.setOnboardingDate.bind(appStateController),
       setNewPrivacyPolicyToastClickedOrClosed:
         appStateController.setNewPrivacyPolicyToastClickedOrClosed.bind(
           appStateController,
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index f1f60ae568ed..cd57263d9184 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -37,6 +37,7 @@
     "showNetworkBanner": true,
     "showAccountBanner": true,
     "trezorModel": null,
+    "onboardingDate": "object",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index be4d78846a6b..d64cfbaad9bb 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -72,6 +72,7 @@
     "showNetworkBanner": true,
     "showAccountBanner": true,
     "trezorModel": null,
+    "onboardingDate": "object",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
diff --git a/ui/pages/onboarding-flow/onboarding-flow.js b/ui/pages/onboarding-flow/onboarding-flow.js
index 180d6cd68c70..01ea177eb851 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.js
@@ -28,6 +28,7 @@ import {
   createNewVaultAndGetSeedPhrase,
   unlockAndGetSeedPhrase,
   createNewVaultAndRestore,
+  setOnboardingDate,
 } from '../../store/actions';
 import { getFirstTimeFlowTypeRouteAfterUnlock } from '../../selectors';
 import { MetaMetricsContext } from '../../contexts/metametrics';
@@ -70,6 +71,10 @@ export default function OnboardingFlow() {
   const isFromReminder = new URLSearchParams(search).get('isFromReminder');
   const trackEvent = useContext(MetaMetricsContext);
 
+  useEffect(() => {
+    dispatch(setOnboardingDate());
+  }, [dispatch]);
+
   useEffect(() => {
     if (completedOnboarding && !isFromReminder) {
       history.push(DEFAULT_ROUTE);
diff --git a/ui/pages/onboarding-flow/onboarding-flow.test.js b/ui/pages/onboarding-flow/onboarding-flow.test.js
index 460d4bf4c9ce..cc471f5febd5 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.test.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.test.js
@@ -30,6 +30,7 @@ jest.mock('../../store/actions', () => ({
   createNewVaultAndGetSeedPhrase: jest.fn().mockResolvedValue(null),
   unlockAndGetSeedPhrase: jest.fn().mockResolvedValue(null),
   createNewVaultAndRestore: jest.fn(),
+  setOnboardingDate: jest.fn(() => ({ type: 'TEST_DISPATCH' })),
 }));
 
 describe('Onboarding Flow', () => {
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 71364c46c92e..ad1e99946c15 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -658,11 +658,13 @@ export default class Routes extends Component {
     const isPrivacyToastRecent = this.getIsPrivacyToastRecent();
     const isPrivacyToastNotShown = !newPrivacyPolicyToastShownDate;
 
+    if (!this.onHomeScreen()) {
+      return null;
+    }
+
     return (
       <ToastContainer>
-        {showConnectAccountToast &&
-        this.onHomeScreen() &&
-        !this.state.hideConnectAccountToast ? (
+        {showConnectAccountToast && !this.state.hideConnectAccountToast ? (
           <Toast
             key="connect-account-toast"
             startAdornment={
diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js
index e684fedc32cb..c1d238bd1000 100644
--- a/ui/pages/routes/routes.component.test.js
+++ b/ui/pages/routes/routes.component.test.js
@@ -3,13 +3,18 @@ import configureMockStore from 'redux-mock-store';
 import { act, fireEvent } from '@testing-library/react';
 
 import { SEND_STAGES } from '../../ducks/send';
-import { renderWithProvider } from '../../../test/jest';
-import mockSendState from '../../../test/data/mock-send-state.json';
+import {
+  CONFIRMATION_V_NEXT_ROUTE,
+  DEFAULT_ROUTE,
+} from '../../helpers/constants/routes';
 import {
   CHAIN_IDS,
   GOERLI_DISPLAY_NAME,
   NETWORK_TYPES,
 } from '../../../shared/constants/network';
+import { renderWithProvider } from '../../../test/jest';
+import mockSendState from '../../../test/data/mock-send-state.json';
+import mockState from '../../../test/data/mock-state.json';
 import { useIsOriginalNativeTokenSymbol } from '../../hooks/useIsOriginalNativeTokenSymbol';
 import Routes from '.';
 
@@ -182,3 +187,29 @@ describe('Routes Component', () => {
     });
   });
 });
+
+describe('toast display', () => {
+  const testState = {
+    ...mockState,
+    metamask: {
+      ...mockState.metamask,
+      announcements: {},
+      approvalFlows: [],
+      completedOnboarding: true,
+      usedNetworks: [],
+      swapsState: { swapsFeatureIsLive: true },
+    },
+  };
+
+  it('renders toastContainer on default route', async () => {
+    await render([DEFAULT_ROUTE], testState);
+    const toastContainer = document.querySelector('.toasts-container');
+    expect(toastContainer).toBeInTheDocument();
+  });
+
+  it('does not render toastContainer on confirmation route', async () => {
+    await render([CONFIRMATION_V_NEXT_ROUTE], testState);
+    const toastContainer = document.querySelector('.toasts-container');
+    expect(toastContainer).not.toBeInTheDocument();
+  });
+});
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 2d2ebdc1d6c3..ec17e426757c 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1878,11 +1878,17 @@ export function getShowSurveyToast(state) {
  * @returns {boolean} True if the current date is on or after the new privacy policy date and the privacy policy toast was not clicked or closed. False otherwise.
  */
 export function getShowPrivacyPolicyToast(state) {
-  const { newPrivacyPolicyToastClickedOrClosed } = state.metamask;
+  const { newPrivacyPolicyToastClickedOrClosed, onboardingDate } =
+    state.metamask;
   const newPrivacyPolicyDate = new Date(PRIVACY_POLICY_DATE);
   const currentDate = new Date(Date.now());
   return (
-    !newPrivacyPolicyToastClickedOrClosed && currentDate >= newPrivacyPolicyDate
+    !newPrivacyPolicyToastClickedOrClosed &&
+    currentDate >= newPrivacyPolicyDate &&
+    // users who onboarded before the privacy policy date should see the notice
+    // and
+    // old users who don't have onboardingDate set should see the notice
+    (onboardingDate < newPrivacyPolicyDate || !onboardingDate)
   );
 }
 
@@ -1899,6 +1905,10 @@ export function getNewPrivacyPolicyToastShownDate(state) {
   return state.metamask.newPrivacyPolicyToastShownDate;
 }
 
+export function getOnboardingDate(state) {
+  return state.metamask.onboardingDate;
+}
+
 export function getShowBetaHeader(state) {
   return state.metamask.showBetaHeader;
 }
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index 2cb63385a27f..f272c064f538 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -1259,30 +1259,46 @@ describe('Selectors', () => {
 
         dateNowSpy = jest
           .spyOn(Date, 'now')
-          .mockReturnValue(dayAfterPolicyDate);
+          .mockReturnValue(dayAfterPolicyDate.getTime());
       });
 
       afterEach(() => {
         dateNowSpy.mockRestore();
       });
 
-      it('shows the privacy policy toast when not yet seen and on or after the policy date', () => {
+      it('shows the privacy policy toast when not yet seen, on or after the policy date, and onboardingDate is before the policy date', () => {
         const result = selectors.getShowPrivacyPolicyToast({
           metamask: {
             newPrivacyPolicyToastClickedOrClosed: null,
+            onboardingDate: new Date(PRIVACY_POLICY_DATE).setDate(
+              new Date(PRIVACY_POLICY_DATE).getDate() - 2,
+            ),
           },
         });
         expect(result).toBe(true);
       });
 
-      it('does not show the privacy policy toast when seen and on or after the policy date', () => {
+      it('does not show the privacy policy toast when seen, even if on or after the policy date and onboardingDate is before the policy date', () => {
         const result = selectors.getShowPrivacyPolicyToast({
           metamask: {
             newPrivacyPolicyToastClickedOrClosed: true,
+            onboardingDate: new Date(PRIVACY_POLICY_DATE).setDate(
+              new Date(PRIVACY_POLICY_DATE).getDate() - 2,
+            ),
           },
         });
         expect(result).toBe(false);
       });
+
+      it('shows the privacy policy toast when not yet seen, on or after the policy date, and onboardingDate is not set', () => {
+        const result = selectors.getShowPrivacyPolicyToast({
+          metamask: {
+            newPrivacyPolicyToastClickedOrClosed: null,
+            onboardingDate: null,
+          },
+        });
+        expect(result).toBe(true);
+      });
     });
 
     describe('mock same day', () => {
@@ -1296,23 +1312,39 @@ describe('Selectors', () => {
         dateNowSpy.mockRestore();
       });
 
-      it('shows the privacy policy toast when not yet seen and on or after the policy date', () => {
+      it('shows the privacy policy toast when not yet seen, on or after the policy date, and onboardingDate is before the policy date', () => {
         const result = selectors.getShowPrivacyPolicyToast({
           metamask: {
             newPrivacyPolicyToastClickedOrClosed: null,
+            onboardingDate: new Date(PRIVACY_POLICY_DATE).setDate(
+              new Date(PRIVACY_POLICY_DATE).getDate() - 2,
+            ),
           },
         });
         expect(result).toBe(true);
       });
 
-      it('does not show the privacy policy toast when seen and on or after the policy date', () => {
+      it('does not show the privacy policy toast when seen, even if on or after the policy date and onboardingDate is before the policy date', () => {
         const result = selectors.getShowPrivacyPolicyToast({
           metamask: {
             newPrivacyPolicyToastClickedOrClosed: true,
+            onboardingDate: new Date(PRIVACY_POLICY_DATE).setDate(
+              new Date(PRIVACY_POLICY_DATE).getDate() - 2,
+            ),
           },
         });
         expect(result).toBe(false);
       });
+
+      it('shows the privacy policy toast when not yet seen, on or after the policy date, and onboardingDate is not set', () => {
+        const result = selectors.getShowPrivacyPolicyToast({
+          metamask: {
+            newPrivacyPolicyToastClickedOrClosed: null,
+            onboardingDate: null,
+          },
+        });
+        expect(result).toBe(true);
+      });
     });
 
     describe('mock day before', () => {
@@ -1333,6 +1365,19 @@ describe('Selectors', () => {
         const result = selectors.getShowPrivacyPolicyToast({
           metamask: {
             newPrivacyPolicyToastClickedOrClosed: null,
+            onboardingDate: new Date(PRIVACY_POLICY_DATE).setDate(
+              new Date(PRIVACY_POLICY_DATE).getDate() - 2,
+            ),
+          },
+        });
+        expect(result).toBe(false);
+      });
+
+      it('does not show the privacy policy toast before the policy date even if onboardingDate is not set', () => {
+        const result = selectors.getShowPrivacyPolicyToast({
+          metamask: {
+            newPrivacyPolicyToastClickedOrClosed: null,
+            onboardingDate: null,
           },
         });
         expect(result).toBe(false);
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 90ad6bcddce6..08ad588b8b30 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -4231,6 +4231,12 @@ export function setNewPrivacyPolicyToastClickedOrClosed() {
   };
 }
 
+export function setOnboardingDate() {
+  return async () => {
+    await submitRequestToBackground('setOnboardingDate');
+  };
+}
+
 export function setNewPrivacyPolicyToastShownDate(time: number) {
   return async () => {
     await submitRequestToBackground('setNewPrivacyPolicyToastShownDate', [

From 18ec6994497d6bf550c9289c4f9f25967e522f2f Mon Sep 17 00:00:00 2001
From: legobeat <109787230+legobeat@users.noreply.github.com>
Date: Thu, 6 Jun 2024 00:44:05 +0900
Subject: [PATCH 032/236] fix:
 @metamask/smart-transactions-controller@^10.0.1->^10.1.1 (#25030)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This effectively relates to two separate fixes for issues with polling
behavior.

-
https://github.com/MetaMask/smart-transactions-controller/releases/tag/v10.1.1

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

- Follow-up to and aligns with #24861
- #24913

-
https://github.com/MetaMask/smart-transactions-controller/compare/v10.0.1...v10.1.1
- https://github.com/MetaMask/smart-transactions-controller/pull/347
- https://github.com/MetaMask/smart-transactions-controller/pull/339
- https://github.com/MetaMask/smart-transactions-controller/pull/342

- [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.

- [ ] 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.
---
 lavamoat/browserify/beta/policy.json    | 211 ++++++++++++++++++-----
 lavamoat/browserify/desktop/policy.json | 204 +++++++++++++++++-----
 lavamoat/browserify/flask/policy.json   | 204 +++++++++++++++++-----
 lavamoat/browserify/main/policy.json    | 204 +++++++++++++++++-----
 lavamoat/browserify/mmi/policy.json     | 204 +++++++++++++++++-----
 package.json                            |   2 +-
 yarn.lock                               | 219 ++++++++++++++++++++----
 7 files changed, 1010 insertions(+), 238 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 73e9ebc27689..61aa709c1c9f 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -983,8 +983,8 @@
       },
       "packages": {
         "@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
+        "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
         "@metamask/name-controller>async-mutex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
         "pify": true
       }
@@ -995,6 +995,13 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -1004,17 +1011,24 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "pify": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -1672,9 +1686,9 @@
         "@metamask/network-controller>@metamask/base-controller": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1693,26 +1707,32 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+      }
+    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1748,9 +1768,9 @@
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -1764,13 +1784,6 @@
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1860,13 +1873,6 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/rpc-errors": {
       "packages": {
         "@metamask/utils": true,
@@ -1877,8 +1883,8 @@
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
-        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -1890,13 +1896,6 @@
         "immer": true
       }
     },
-    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1989,11 +1988,11 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": 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/polling-controller": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
@@ -2050,11 +2049,99 @@
         "immer": true
       }
     },
+    "@metamask/smart-transactions-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/controller-utils>@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/controller-utils>@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/controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/network-controller": {
+      "globals": {
+        "URL": true,
+        "btoa": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-middleware": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": true,
+        "@metamask/eth-query": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/utils": true,
+        "browserify>assert": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
       "globals": {
         "clearTimeout": true,
@@ -2067,18 +2154,18 @@
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
-        "@metamask/controller-utils": 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/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": 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/gas-fee-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
-        "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
@@ -2111,6 +2198,37 @@
         "webpack>events": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
+      "globals": {
+        "clearInterval": true,
+        "console.error": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
+        "browserify>assert": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": 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,
@@ -2174,6 +2292,13 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/snaps-controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2518,6 +2643,10 @@
       }
     },
     "@segment/loosely-validate-event": {
+      "globals": {
+        "console.log": true,
+        "uffer.byteLength": true
+      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 2c7ff7a2a4fb..44b0f0857ea2 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1068,8 +1068,8 @@
       },
       "packages": {
         "@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
+        "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
         "@metamask/name-controller>async-mutex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
         "pify": true
       }
@@ -1080,6 +1080,13 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -1089,17 +1096,24 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "pify": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -1765,9 +1779,9 @@
         "@metamask/network-controller>@metamask/base-controller": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1786,26 +1800,32 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+      }
+    },
     "@metamask/notification-controller": {
       "packages": {
         "@metamask/notification-controller>@metamask/base-controller": true,
@@ -1868,9 +1888,9 @@
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -1884,13 +1904,6 @@
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1980,13 +1993,6 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -2017,8 +2023,8 @@
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
-        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2030,13 +2036,6 @@
         "immer": true
       }
     },
-    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
@@ -2146,11 +2145,11 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": 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/polling-controller": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
@@ -2207,11 +2206,99 @@
         "immer": true
       }
     },
+    "@metamask/smart-transactions-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/controller-utils>@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/controller-utils>@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/controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/network-controller": {
+      "globals": {
+        "URL": true,
+        "btoa": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-middleware": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": true,
+        "@metamask/eth-query": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/utils": true,
+        "browserify>assert": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
       "globals": {
         "clearTimeout": true,
@@ -2224,18 +2311,18 @@
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
-        "@metamask/controller-utils": 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/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": 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/gas-fee-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
-        "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
@@ -2268,6 +2355,37 @@
         "webpack>events": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
+      "globals": {
+        "clearInterval": true,
+        "console.error": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
+        "browserify>assert": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": 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,
@@ -2816,6 +2934,10 @@
       }
     },
     "@segment/loosely-validate-event": {
+      "globals": {
+        "console.log": true,
+        "uffer.byteLength": true
+      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 591b07aec78c..9d2d512062b6 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1068,8 +1068,8 @@
       },
       "packages": {
         "@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
+        "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
         "@metamask/name-controller>async-mutex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
         "pify": true
       }
@@ -1080,6 +1080,13 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -1089,17 +1096,24 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "pify": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -1765,9 +1779,9 @@
         "@metamask/network-controller>@metamask/base-controller": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1786,26 +1800,32 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+      }
+    },
     "@metamask/notification-controller": {
       "packages": {
         "@metamask/notification-controller>@metamask/base-controller": true,
@@ -1868,9 +1888,9 @@
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -1884,13 +1904,6 @@
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2032,13 +2045,6 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -2069,8 +2075,8 @@
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
-        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2082,13 +2088,6 @@
         "immer": true
       }
     },
-    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
@@ -2198,11 +2197,11 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": 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/polling-controller": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
@@ -2259,11 +2258,99 @@
         "immer": true
       }
     },
+    "@metamask/smart-transactions-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/controller-utils>@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/controller-utils>@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/controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/network-controller": {
+      "globals": {
+        "URL": true,
+        "btoa": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-middleware": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": true,
+        "@metamask/eth-query": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/utils": true,
+        "browserify>assert": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
       "globals": {
         "clearTimeout": true,
@@ -2276,18 +2363,18 @@
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
-        "@metamask/controller-utils": 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/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": 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/gas-fee-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
-        "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
@@ -2320,6 +2407,37 @@
         "webpack>events": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
+      "globals": {
+        "clearInterval": true,
+        "console.error": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
+        "browserify>assert": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": 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,
@@ -2868,6 +2986,10 @@
       }
     },
     "@segment/loosely-validate-event": {
+      "globals": {
+        "console.log": true,
+        "uffer.byteLength": true
+      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 816de3d28ecc..aba7eb9f4ba9 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -983,8 +983,8 @@
       },
       "packages": {
         "@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
+        "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
         "@metamask/name-controller>async-mutex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
         "pify": true
       }
@@ -995,6 +995,13 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -1004,17 +1011,24 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "pify": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -1680,9 +1694,9 @@
         "@metamask/network-controller>@metamask/base-controller": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1701,26 +1715,32 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+      }
+    },
     "@metamask/notification-controller": {
       "packages": {
         "@metamask/notification-controller>@metamask/base-controller": true,
@@ -1783,9 +1803,9 @@
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -1799,13 +1819,6 @@
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1947,13 +1960,6 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -1984,8 +1990,8 @@
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
-        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -1997,13 +2003,6 @@
         "immer": true
       }
     },
-    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
@@ -2113,11 +2112,11 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": 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/polling-controller": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
@@ -2174,11 +2173,99 @@
         "immer": true
       }
     },
+    "@metamask/smart-transactions-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/controller-utils>@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/controller-utils>@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/controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/network-controller": {
+      "globals": {
+        "URL": true,
+        "btoa": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-middleware": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": true,
+        "@metamask/eth-query": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/utils": true,
+        "browserify>assert": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
       "globals": {
         "clearTimeout": true,
@@ -2191,18 +2278,18 @@
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
-        "@metamask/controller-utils": 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/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": 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/gas-fee-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
-        "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
@@ -2235,6 +2322,37 @@
         "webpack>events": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
+      "globals": {
+        "clearInterval": true,
+        "console.error": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
+        "browserify>assert": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": 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,
@@ -2783,6 +2901,10 @@
       }
     },
     "@segment/loosely-validate-event": {
+      "globals": {
+        "console.log": true,
+        "uffer.byteLength": true
+      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index dc6edd72b20e..78784ac5a975 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1076,8 +1076,8 @@
       },
       "packages": {
         "@metamask/eth-json-rpc-filters>@metamask/eth-query": true,
+        "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": true,
         "@metamask/name-controller>async-mutex": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true,
         "pify": true
       }
@@ -1088,6 +1088,13 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/eth-json-rpc-middleware": {
       "globals": {
         "URL": true,
@@ -1097,17 +1104,24 @@
       "packages": {
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
       }
     },
-    "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": {
+    "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
       "packages": {
-        "@metamask/providers>@metamask/json-rpc-engine": true,
-        "@metamask/safe-event-emitter": true
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true,
+        "pify": true
       }
     },
     "@metamask/eth-keyring-controller": {
@@ -1773,9 +1787,9 @@
         "@metamask/network-controller>@metamask/base-controller": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1794,26 +1808,32 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true,
-        "@metamask/providers>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
     },
-    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
         "@metamask/safe-event-emitter": true
       }
     },
-    "@metamask/network-controller>@metamask/json-rpc-engine": {
+    "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+      }
+    },
     "@metamask/notification-controller": {
       "packages": {
         "@metamask/notification-controller>@metamask/base-controller": true,
@@ -1876,9 +1896,9 @@
       "packages": {
         "@metamask/controller-utils": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
-        "@metamask/permission-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -1892,13 +1912,6 @@
         "immer": true
       }
     },
-    "@metamask/permission-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2040,13 +2053,6 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -2077,8 +2083,8 @@
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
-        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2090,13 +2096,6 @@
         "immer": true
       }
     },
-    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
@@ -2206,11 +2205,11 @@
       },
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
-        "@metamask/gas-fee-controller>@metamask/polling-controller": 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/polling-controller": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller": true,
         "@metamask/smart-transactions-controller>bignumber.js": true,
         "browserify>buffer": true,
@@ -2267,11 +2266,99 @@
         "immer": true
       }
     },
+    "@metamask/smart-transactions-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/controller-utils>@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/controller-utils>@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/controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/network-controller": {
+      "globals": {
+        "URL": true,
+        "btoa": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/eth-json-rpc-middleware": true,
+        "@metamask/eth-json-rpc-middleware>@metamask/eth-block-tracker": true,
+        "@metamask/eth-query": true,
+        "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
+        "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/utils": true,
+        "browserify>assert": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/eth-json-rpc-provider": {
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/polling-controller": {
+      "globals": {
+        "clearTimeout": true,
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/base-controller": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "uuid": true
+      }
+    },
     "@metamask/smart-transactions-controller>@metamask/transaction-controller": {
       "globals": {
         "clearTimeout": true,
@@ -2284,18 +2371,18 @@
         "@ethersproject/abi": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
-        "@metamask/controller-utils": 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/base-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/network-controller>async-mutex": 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/gas-fee-controller": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true,
         "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true,
-        "@metamask/transaction-controller>nonce-tracker": true,
         "@metamask/utils": true,
         "bn.js": true,
         "browserify>buffer": true,
@@ -2328,6 +2415,37 @@
         "webpack>events": true
       }
     },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/gas-fee-controller": {
+      "globals": {
+        "clearInterval": true,
+        "console.error": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@metamask/eth-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controller-utils": true,
+        "@metamask/smart-transactions-controller>@metamask/polling-controller": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "uuid": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": {
+      "packages": {
+        "@ethersproject/providers": true,
+        "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": true,
+        "browserify>assert": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker>async-mutex": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@trezor/connect-web>tslib": 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,
@@ -2876,6 +2994,10 @@
       }
     },
     "@segment/loosely-validate-event": {
+      "globals": {
+        "console.log": true,
+        "uffer.byteLength": true
+      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/package.json b/package.json
index 003771d18197..b5625414dc14 100644
--- a/package.json
+++ b/package.json
@@ -330,7 +330,7 @@
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch",
     "@metamask/signature-controller": "^12.0.0",
-    "@metamask/smart-transactions-controller": "^10.0.1",
+    "@metamask/smart-transactions-controller": "^10.1.1",
     "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch",
     "@metamask/snaps-execution-environments": "6.0.2",
     "@metamask/snaps-rpc-methods": "8.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9a62dd32ce74..d7ecd122dd1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4143,6 +4143,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/approval-controller@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "@metamask/approval-controller@npm:7.0.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/utils": "npm:^8.3.0"
+    nanoid: "npm:^3.1.31"
+  checksum: a7d4e721de1676e1a7d284d10c0c21e21f724e1ad9365048398396eb7cd4f1359a99d18e667669dad1432537340d978b9d7bfe7cdf353453988580637d230204
+  languageName: node
+  linkType: hard
+
 "@metamask/assets-controllers@npm:26.0.0":
   version: 26.0.0
   resolution: "@metamask/assets-controllers@npm:26.0.0"
@@ -4355,6 +4367,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/base-controller@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@metamask/base-controller@npm:6.0.0"
+  dependencies:
+    "@metamask/utils": "npm:^8.3.0"
+    immer: "npm:^9.0.6"
+  checksum: 569ecd28499c0353930471db6be6625629407f6c3e4409a96243caaf515b4db78041a8d8aa6185b82d83095ceb0f7b521e4023bad663b021ab04bb64870b21d1
+  languageName: node
+  linkType: hard
+
 "@metamask/browser-passworder@npm:^4.3.0":
   version: 4.3.0
   resolution: "@metamask/browser-passworder@npm:4.3.0"
@@ -4381,6 +4403,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/controller-utils@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "@metamask/controller-utils@npm:11.0.0"
+  dependencies:
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/ethjs-unit": "npm:^0.3.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@spruceid/siwe-parser": "npm:2.1.0"
+    "@types/bn.js": "npm:^5.1.5"
+    bn.js: "npm:^5.2.1"
+    eth-ens-namehash: "npm:^2.0.8"
+    fast-deep-equal: "npm:^3.1.3"
+  checksum: 3bb18d6dbac04b1b2566b0c207614d216829a1ab77d1192e3d02f2c3c3a658c6a4d200a285433b8e583c1f33fddb9e07043af7d05a7cb88fd055a90ad52ee843
+  languageName: node
+  linkType: hard
+
 "@metamask/controller-utils@npm:^8.0.1, @metamask/controller-utils@npm:^8.0.2, @metamask/controller-utils@npm:^8.0.4":
   version: 8.0.4
   resolution: "@metamask/controller-utils@npm:8.0.4"
@@ -4521,6 +4560,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eth-block-tracker@npm:^9.0.2, @metamask/eth-block-tracker@npm:^9.0.3":
+  version: 9.0.3
+  resolution: "@metamask/eth-block-tracker@npm:9.0.3"
+  dependencies:
+    "@metamask/eth-json-rpc-provider": "npm:^3.0.2"
+    "@metamask/safe-event-emitter": "npm:^3.0.0"
+    "@metamask/utils": "npm:^8.1.0"
+    json-rpc-random-id: "npm:^1.0.1"
+    pify: "npm:^5.0.0"
+  checksum: f49bb158b2c9669e91813a1f34948a6c2a2d1f8507ea0b1afae9a003a4d276d892b5cde4c183f970fcec32f253a14f1abf39b6411beabeb113eeed75cd7e29b8
+  languageName: node
+  linkType: hard
+
 "@metamask/eth-hd-keyring@npm:^7.0.1":
   version: 7.0.1
   resolution: "@metamask/eth-hd-keyring@npm:7.0.1"
@@ -4560,20 +4612,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-json-rpc-middleware@npm:^12.1.0":
-  version: 12.1.0
-  resolution: "@metamask/eth-json-rpc-middleware@npm:12.1.0"
+"@metamask/eth-json-rpc-middleware@npm:^12.1.0, @metamask/eth-json-rpc-middleware@npm:^12.1.1":
+  version: 12.1.2
+  resolution: "@metamask/eth-json-rpc-middleware@npm:12.1.2"
   dependencies:
-    "@metamask/eth-json-rpc-provider": "npm:^2.1.0"
+    "@metamask/eth-block-tracker": "npm:^9.0.3"
+    "@metamask/eth-json-rpc-provider": "npm:^3.0.2"
     "@metamask/eth-sig-util": "npm:^7.0.0"
-    "@metamask/json-rpc-engine": "npm:^7.1.1"
+    "@metamask/json-rpc-engine": "npm:^8.0.2"
     "@metamask/rpc-errors": "npm:^6.0.0"
     "@metamask/utils": "npm:^8.1.0"
-    eth-block-tracker: "npm:^8.0.0"
     klona: "npm:^2.0.6"
     pify: "npm:^5.0.0"
     safe-stable-stringify: "npm:^2.4.3"
-  checksum: 35a34dba839b957068030880328b43aabca615cc9f9fbf2d11fd998f0cc622ff3eec87582861b6cc517ee18cbd652f5c237647d651aa939151ac3f8738abae73
+  checksum: 1c0f186a35765394a28695bcade84c636b0c92cf3252219d1e9cbdd31231ad09fea5ec7bff7d31e2c7fe4d2158f15b54a5e42166549b69af1f7e475a1c7ae536
   languageName: node
   linkType: hard
 
@@ -4599,6 +4651,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/eth-json-rpc-provider@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@metamask/eth-json-rpc-provider@npm:4.0.0"
+  dependencies:
+    "@metamask/json-rpc-engine": "npm:^9.0.0"
+    "@metamask/safe-event-emitter": "npm:^3.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+  checksum: 00e87f5d70e044d3dfe7a62ae8c3b530e92dea91de2ad921dee00cd3307fbb1444c5441a05f6178aaf81e3b11f6feeccaa4a8683edf058bf7769c00efeb8915a
+  languageName: node
+  linkType: hard
+
 "@metamask/eth-keyring-controller@npm:^16.0.0":
   version: 16.0.0
   resolution: "@metamask/eth-keyring-controller@npm:16.0.0"
@@ -4894,7 +4957,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/gas-fee-controller@npm:^15.1.0, @metamask/gas-fee-controller@npm:^15.1.2":
+"@metamask/gas-fee-controller@npm:^15.1.2":
   version: 15.1.2
   resolution: "@metamask/gas-fee-controller@npm:15.1.2"
   dependencies:
@@ -4915,6 +4978,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/gas-fee-controller@npm:^17.0.0":
+  version: 17.0.0
+  resolution: "@metamask/gas-fee-controller@npm:17.0.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/ethjs-unit": "npm:^0.3.0"
+    "@metamask/network-controller": "npm:^19.0.0"
+    "@metamask/polling-controller": "npm:^8.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@types/bn.js": "npm:^5.1.5"
+    "@types/uuid": "npm:^8.3.0"
+    bn.js: "npm:^5.2.1"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@metamask/network-controller": ^19.0.0
+  checksum: 673cbea0d2eb696815a6608303667cc81ba432aeb903c52a78ac71884715dc165db71daea25fc368c68c60ab39ffbefe5191d4faa6ca31d52020cf2ae49d55e4
+  languageName: node
+  linkType: hard
+
 "@metamask/jazzicon@npm:^2.0.0":
   version: 2.0.0
   resolution: "@metamask/jazzicon@npm:2.0.0"
@@ -4947,6 +5031,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/json-rpc-engine@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@metamask/json-rpc-engine@npm:9.0.0"
+  dependencies:
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/safe-event-emitter": "npm:^3.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+  checksum: 9ddde2ca81e3b3a70e0cc752b5e22e436723cafa1948cbb45d63a42796a1260ff0f9356ebda0d375d9aae81232e77e487a8d0e1273aed3aa83ca0fe3e2f2763f
+  languageName: node
+  linkType: hard
+
 "@metamask/json-rpc-middleware-stream@npm:^7.0.1":
   version: 7.0.1
   resolution: "@metamask/json-rpc-middleware-stream@npm:7.0.1"
@@ -5219,6 +5314,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/network-controller@npm:^19.0.0":
+  version: 19.0.0
+  resolution: "@metamask/network-controller@npm:19.0.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/eth-block-tracker": "npm:^9.0.2"
+    "@metamask/eth-json-rpc-infura": "npm:^9.1.0"
+    "@metamask/eth-json-rpc-middleware": "npm:^12.1.1"
+    "@metamask/eth-json-rpc-provider": "npm:^4.0.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/json-rpc-engine": "npm:^9.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/swappable-obj-proxy": "npm:^2.2.0"
+    "@metamask/utils": "npm:^8.3.0"
+    async-mutex: "npm:^0.5.0"
+    immer: "npm:^9.0.6"
+    uuid: "npm:^8.3.2"
+  checksum: d23c1c18ad909876ca5e6080f97ed982688fefbe0bfe3878897d094b7b0cf81b49a8166a7352aa051619967fb1b29179c5dae69cd0666ecef02827a8ce78bb64
+  languageName: node
+  linkType: hard
+
 "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch":
   version: 18.1.0
   resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.0#~/.yarn/patches/@metamask-network-controller-npm-18.1.0-680908c29a.patch::version=18.1.0&hash=da1bba"
@@ -5241,6 +5358,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/nonce-tracker@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@metamask/nonce-tracker@npm:5.0.0"
+  dependencies:
+    "@ethersproject/providers": "npm:^5.7.2"
+    async-mutex: "npm:^0.3.1"
+  peerDependencies:
+    "@metamask/eth-block-tracker": ">=9"
+  checksum: 72bce31702c5575b6dd583dd772312994103ff25389643526284d0e4320588cb0c7b389739fbdb1828f3e6ab387deddfc8cf2b674aa65bf3054db089cafce1db
+  languageName: node
+  linkType: hard
+
 "@metamask/notification-controller@npm:^3.0.0":
   version: 3.0.0
   resolution: "@metamask/notification-controller@npm:3.0.0"
@@ -5439,6 +5568,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/polling-controller@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/polling-controller@npm:8.0.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/network-controller": "npm:^19.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@types/uuid": "npm:^8.3.0"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@metamask/network-controller": ^19.0.0
+  checksum: 440abc7848a2f01af21acc9c0afee46898ecdce71b02e6525c1571eda30d33e3d4cf005f6af1179ed60ec2859a7afd79f0bfcac703cad67b83d7fcc871d31b5b
+  languageName: node
+  linkType: hard
+
 "@metamask/post-message-stream@npm:^7.0.0":
   version: 7.0.0
   resolution: "@metamask/post-message-stream@npm:7.0.0"
@@ -5653,25 +5799,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/smart-transactions-controller@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "@metamask/smart-transactions-controller@npm:10.0.1"
+"@metamask/smart-transactions-controller@npm:^10.1.1":
+  version: 10.1.6
+  resolution: "@metamask/smart-transactions-controller@npm:10.1.6"
   dependencies:
     "@babel/runtime": "npm:^7.24.1"
     "@ethereumjs/tx": "npm:^5.2.1"
     "@ethereumjs/util": "npm:^9.0.2"
     "@ethersproject/bytes": "npm:^5.7.0"
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/network-controller": "npm:^18.1.0"
-    "@metamask/polling-controller": "npm:^6.0.1"
-    "@metamask/transaction-controller": "npm:^28.1.0"
+    "@metamask/network-controller": "npm:^19.0.0"
+    "@metamask/polling-controller": "npm:^8.0.0"
+    "@metamask/transaction-controller": "npm:^32.0.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: ff8c14257ed733161650f1527c136eac0b31bafd1c027af839a492bb8995c236d517a140a6c5201ed1b34726ef9c2674c1ab4830e5dc54546586601532546715
+  checksum: e914a35ba822ad9bad877c9a5f5496b85fbe9b8dc6b682cc46134c18fdfef29fc5cad1af4c8bac4c2feddfe97fbf9b78faa021da0ea08559bdcc05bef3b49d85
   languageName: node
   linkType: hard
 
@@ -6116,9 +6262,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^28.1.0":
-  version: 28.1.1
-  resolution: "@metamask/transaction-controller@npm:28.1.1"
+"@metamask/transaction-controller@npm:^32.0.0":
+  version: 32.0.0
+  resolution: "@metamask/transaction-controller@npm:32.0.0"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -6126,28 +6272,28 @@ __metadata:
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
-    "@metamask/approval-controller": "npm:^6.0.1"
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/approval-controller": "npm:^7.0.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
     "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/gas-fee-controller": "npm:^15.1.0"
+    "@metamask/gas-fee-controller": "npm:^17.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/network-controller": "npm:^18.1.0"
+    "@metamask/network-controller": "npm:^19.0.0"
+    "@metamask/nonce-tracker": "npm:^5.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/utils": "npm:^8.3.0"
-    async-mutex: "npm:^0.2.6"
+    async-mutex: "npm:^0.5.0"
     bn.js: "npm:^5.2.1"
     eth-method-registry: "npm:^4.0.0"
     fast-json-patch: "npm:^3.1.1"
     lodash: "npm:^4.17.21"
-    nonce-tracker: "npm:^3.0.0"
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@babel/runtime": ^7.23.9
-    "@metamask/approval-controller": ^6.0.0
-    "@metamask/gas-fee-controller": ^15.0.0
-    "@metamask/network-controller": ^18.0.0
-  checksum: 01e6f0e1431e56cc0ef986cbfa99cf37e0a44aade14419c69d815be77847bb33b43049b90c6e6961bb5070ecfe1420c893db8a68c0fd6977d5ec28d9853d6554
+    "@metamask/approval-controller": ^7.0.0
+    "@metamask/gas-fee-controller": ^17.0.0
+    "@metamask/network-controller": ^19.0.0
+  checksum: 90c2f48883f325ba44ef4070d6f25f98dd369fdd2d1c862b45aa7ad5406a17884ea1e6a7a08203f93b4b4f02779f0d4e2ab1c3120f8a0e991c3ca67af91fe7c4
   languageName: node
   linkType: hard
 
@@ -12454,6 +12600,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async-mutex@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "async-mutex@npm:0.5.0"
+  dependencies:
+    tslib: "npm:^2.4.0"
+  checksum: 4c6bfce1cc9cd43f723c4d96403ac5f4757f885c953b839cde6956ec8817ff39623b82d67614de10c7933e21626925882fb9bac367db7d15d7cb4f84228722c9
+  languageName: node
+  linkType: hard
+
 "async-settle@npm:^1.0.0":
   version: 1.0.0
   resolution: "async-settle@npm:1.0.0"
@@ -25212,7 +25367,7 @@ __metadata:
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch"
     "@metamask/signature-controller": "npm:^12.0.0"
-    "@metamask/smart-transactions-controller": "npm:^10.0.1"
+    "@metamask/smart-transactions-controller": "npm:^10.1.1"
     "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch"
     "@metamask/snaps-execution-environments": "npm:6.0.2"
     "@metamask/snaps-rpc-methods": "npm:8.0.0"

From ab468eb6fc928fdcfb2b9ae8747f2fb10c7cd2f4 Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Thu, 6 Jun 2024 13:40:52 +0200
Subject: [PATCH 033/236] fix:
 @metamask/smart-transactions-controller@^10.1.1->^10.1.2 (#25069)

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index b5625414dc14..8f33f48cb6c7 100644
--- a/package.json
+++ b/package.json
@@ -330,7 +330,7 @@
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch",
     "@metamask/signature-controller": "^12.0.0",
-    "@metamask/smart-transactions-controller": "^10.1.1",
+    "@metamask/smart-transactions-controller": "^10.1.2",
     "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch",
     "@metamask/snaps-execution-environments": "6.0.2",
     "@metamask/snaps-rpc-methods": "8.0.0",
diff --git a/yarn.lock b/yarn.lock
index d7ecd122dd1c..75ed417c17b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5799,7 +5799,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/smart-transactions-controller@npm:^10.1.1":
+"@metamask/smart-transactions-controller@npm:^10.1.2":
   version: 10.1.6
   resolution: "@metamask/smart-transactions-controller@npm:10.1.6"
   dependencies:
@@ -25367,7 +25367,7 @@ __metadata:
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A12.0.1#~/.yarn/patches/@metamask-selected-network-controller-npm-12.0.1-34b2edf62d.patch"
     "@metamask/signature-controller": "npm:^12.0.0"
-    "@metamask/smart-transactions-controller": "npm:^10.1.1"
+    "@metamask/smart-transactions-controller": "npm:^10.1.2"
     "@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@patch%3A@metamask/snaps-controllers@npm%253A8.0.0%23~/.yarn/patches/@metamask-snaps-controllers-npm-8.0.0-7e59688855.patch%3A%3Aversion=8.0.0&hash=79a89d#~/.yarn/patches/@metamask-snaps-controllers-patch-93f004a36a.patch"
     "@metamask/snaps-execution-environments": "npm:6.0.2"
     "@metamask/snaps-rpc-methods": "npm:8.0.0"

From 854d54cfbbb2600c824a5bbc8df66e6eb9a5830b Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 13 Jun 2024 19:01:58 -0230
Subject: [PATCH 034/236] Update lavamoat policies for the
 Version-v11.16.11-stx-controller cherry-pick branch

---
 lavamoat/browserify/beta/policy.json    | 4 ----
 lavamoat/browserify/desktop/policy.json | 4 ----
 lavamoat/browserify/flask/policy.json   | 4 ----
 lavamoat/browserify/main/policy.json    | 4 ----
 lavamoat/browserify/mmi/policy.json     | 4 ----
 5 files changed, 20 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 61aa709c1c9f..0d79a15d8602 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2643,10 +2643,6 @@
       }
     },
     "@segment/loosely-validate-event": {
-      "globals": {
-        "console.log": true,
-        "uffer.byteLength": true
-      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 44b0f0857ea2..4112d0a992f5 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -2934,10 +2934,6 @@
       }
     },
     "@segment/loosely-validate-event": {
-      "globals": {
-        "console.log": true,
-        "uffer.byteLength": true
-      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 9d2d512062b6..8f658fc7d31c 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2986,10 +2986,6 @@
       }
     },
     "@segment/loosely-validate-event": {
-      "globals": {
-        "console.log": true,
-        "uffer.byteLength": true
-      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index aba7eb9f4ba9..8aaad9ea07c6 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2901,10 +2901,6 @@
       }
     },
     "@segment/loosely-validate-event": {
-      "globals": {
-        "console.log": true,
-        "uffer.byteLength": true
-      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 78784ac5a975..d0eec498aeee 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2994,10 +2994,6 @@
       }
     },
     "@segment/loosely-validate-event": {
-      "globals": {
-        "console.log": true,
-        "uffer.byteLength": true
-      },
       "packages": {
         "@segment/loosely-validate-event>component-type": true,
         "@segment/loosely-validate-event>join-component": true,

From 51daf28e1fbf079a6e4b0f75e4e135b16a709c92 Mon Sep 17 00:00:00 2001
From: Derek Brans <dbrans@gmail.com>
Date: Fri, 14 Jun 2024 11:24:54 -0400
Subject: [PATCH 035/236] cherry-pick chore: revert recent gas api endpoint
 changes (#25230) into Version v11.16.11  (#25304)

cherry-pick chore: revert recent gas api endpoint changes
04642d21f9feeccd09b16fa318c6c7876fd34ab1 (#25230) into Version v11.16.11

Merge conflicts were resolved by comparing this PR diff with the
[intended
diff](https://github.com/MetaMask/metamask-extension/pull/25230/files).

```bash
CONFLICT (content): Merge conflict in app/scripts/metamask-controller.js
CONFLICT (content): Merge conflict in package.json
CONFLICT (content): Merge conflict in shared/constants/swaps.ts
CONFLICT (content): Merge conflict in shared/lib/swaps-utils.js
CONFLICT (content): Merge conflict in test/e2e/mock-e2e.js
CONFLICT (content): Merge conflict in test/jest/constants.js
CONFLICT (content): Merge conflict in yarn.lock
```

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 ...fee-controller-npm-15.1.2-db4d2976aa.patch | 2630 +++++++++++++++++
 app/scripts/metamask-controller.js            |   13 +-
 lavamoat/browserify/beta/policy.json          |    1 -
 lavamoat/browserify/desktop/policy.json       |    1 -
 lavamoat/browserify/flask/policy.json         |    1 -
 lavamoat/browserify/main/policy.json          |    1 -
 lavamoat/browserify/mmi/policy.json           |    1 -
 package.json                                  |    5 +-
 privacy-snapshot.json                         |    2 +-
 shared/constants/swaps.ts                     |    2 +-
 shared/lib/swaps-utils.js                     |    3 +-
 test/e2e/mock-e2e.js                          |   97 +-
 test/jest/constants.js                        |    2 +-
 ui/pages/swaps/swaps.util.ts                  |   13 +-
 yarn.lock                                     |   55 +-
 15 files changed, 2733 insertions(+), 94 deletions(-)
 create mode 100644 .yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch

diff --git a/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch b/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch
new file mode 100644
index 000000000000..e4e69c39609c
--- /dev/null
+++ b/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch
@@ -0,0 +1,2630 @@
+diff --git a/dist/GasFeeController.js b/dist/GasFeeController.js
+index 089bba219bac937eeccb423f3e69ad5407ef9be0..b6bdda12ceeb0c38b344b20f80c3afc5120ce3f9 100644
+--- a/dist/GasFeeController.js
++++ b/dist/GasFeeController.js
+@@ -3,12 +3,12 @@
+
+
+
+-var _chunkH5WHAYLIjs = require('./chunk-H5WHAYLI.js');
+-require('./chunk-Q2YPK5SL.js');
++var _chunkX74LQX2Yjs = require('./chunk-X74LQX2Y.js');
++require('./chunk-2MFVV2BX.js');
+
+
+
+
+
+-exports.GAS_API_BASE_URL = _chunkH5WHAYLIjs.GAS_API_BASE_URL; exports.GAS_ESTIMATE_TYPES = _chunkH5WHAYLIjs.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkH5WHAYLIjs.GasFeeController; exports.default = _chunkH5WHAYLIjs.GasFeeController_default;
++exports.GAS_ESTIMATE_TYPES = _chunkX74LQX2Yjs.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkX74LQX2Yjs.GasFeeController; exports.LEGACY_GAS_PRICES_API_URL = _chunkX74LQX2Yjs.LEGACY_GAS_PRICES_API_URL; exports.default = _chunkX74LQX2Yjs.GasFeeController_default;
+ //# sourceMappingURL=GasFeeController.js.map
+\ No newline at end of file
+diff --git a/dist/GasFeeController.mjs b/dist/GasFeeController.mjs
+index 14ab557e85665a30cbd8b4cec41448d5b88fed91..9b9b90786ac35a4cf320d00a933ef151cdf03821 100644
+--- a/dist/GasFeeController.mjs
++++ b/dist/GasFeeController.mjs
+@@ -1,14 +1,14 @@
+ import {
+-  GAS_API_BASE_URL,
+   GAS_ESTIMATE_TYPES,
+   GasFeeController,
+-  GasFeeController_default
+-} from "./chunk-BEVZS3YV.mjs";
+-import "./chunk-KORLXV32.mjs";
++  GasFeeController_default,
++  LEGACY_GAS_PRICES_API_URL
++} from "./chunk-A7NHJBXX.mjs";
++import "./chunk-R3IOI7AK.mjs";
+ export {
+-  GAS_API_BASE_URL,
+   GAS_ESTIMATE_TYPES,
+   GasFeeController,
++  LEGACY_GAS_PRICES_API_URL,
+   GasFeeController_default as default
+ };
+ //# sourceMappingURL=GasFeeController.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-2MFVV2BX.js b/dist/chunk-2MFVV2BX.js
+new file mode 100644
+index 0000000000000000000000000000000000000000..4f83a713baa28f3d687c50ed7ad3c79715a2b588
+--- /dev/null
++++ b/dist/chunk-2MFVV2BX.js
+@@ -0,0 +1,156 @@
++"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var __accessCheck = (obj, member, msg) => {
++  if (!member.has(obj))
++    throw TypeError("Cannot " + msg);
++};
++var __privateGet = (obj, member, getter) => {
++  __accessCheck(obj, member, "read from private field");
++  return getter ? getter.call(obj) : member.get(obj);
++};
++var __privateAdd = (obj, member, value) => {
++  if (member.has(obj))
++    throw TypeError("Cannot add the same private member more than once");
++  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
++};
++var __privateSet = (obj, member, value, setter) => {
++  __accessCheck(obj, member, "write to private field");
++  setter ? setter.call(obj, value) : member.set(obj, value);
++  return value;
++};
++var __privateMethod = (obj, member, method) => {
++  __accessCheck(obj, member, "access private method");
++  return method;
++};
++
++// src/gas-util.ts
++
++
++
++
++
++var _controllerutils = require('@metamask/controller-utils');
++var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
++var makeClientIdHeader = (clientId) => ({ "X-Client-Id": clientId });
++function normalizeGWEIDecimalNumbers(n) {
++  const numberAsWEIHex = _controllerutils.gweiDecToWEIBN.call(void 0, n).toString(16);
++  const numberAsGWEI = _controllerutils.weiHexToGweiDec.call(void 0, numberAsWEIHex);
++  return numberAsGWEI;
++}
++async function fetchGasEstimates(url, clientId) {
++  const estimates = await _controllerutils.handleFetch.call(void 0,
++    url,
++    clientId ? { headers: makeClientIdHeader(clientId) } : void 0
++  );
++  return {
++    low: {
++      ...estimates.low,
++      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.low.suggestedMaxPriorityFeePerGas
++      ),
++      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.low.suggestedMaxFeePerGas
++      )
++    },
++    medium: {
++      ...estimates.medium,
++      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.medium.suggestedMaxPriorityFeePerGas
++      ),
++      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.medium.suggestedMaxFeePerGas
++      )
++    },
++    high: {
++      ...estimates.high,
++      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.high.suggestedMaxPriorityFeePerGas
++      ),
++      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.high.suggestedMaxFeePerGas
++      )
++    },
++    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),
++    historicalBaseFeeRange: estimates.historicalBaseFeeRange,
++    baseFeeTrend: estimates.baseFeeTrend,
++    latestPriorityFeeRange: estimates.latestPriorityFeeRange,
++    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,
++    priorityFeeTrend: estimates.priorityFeeTrend,
++    networkCongestion: estimates.networkCongestion
++  };
++}
++async function fetchLegacyGasPriceEstimates(url, clientId) {
++  const result = await _controllerutils.handleFetch.call(void 0, url, {
++    referrer: url,
++    referrerPolicy: "no-referrer-when-downgrade",
++    method: "GET",
++    mode: "cors",
++    headers: {
++      "Content-Type": "application/json",
++      ...clientId && makeClientIdHeader(clientId)
++    }
++  });
++  return {
++    low: result.SafeGasPrice,
++    medium: result.ProposeGasPrice,
++    high: result.FastGasPrice
++  };
++}
++async function fetchEthGasPriceEstimate(ethQuery) {
++  const gasPrice = await _controllerutils.query.call(void 0, ethQuery, "gasPrice");
++  return {
++    gasPrice: _controllerutils.weiHexToGweiDec.call(void 0, gasPrice).toString()
++  };
++}
++function calculateTimeEstimate(maxPriorityFeePerGas, maxFeePerGas, gasFeeEstimates) {
++  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;
++  const maxPriorityFeePerGasInWEI = _controllerutils.gweiDecToWEIBN.call(void 0, maxPriorityFeePerGas);
++  const maxFeePerGasInWEI = _controllerutils.gweiDecToWEIBN.call(void 0, maxFeePerGas);
++  const estimatedBaseFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0, estimatedBaseFee);
++  const effectiveMaxPriorityFee = _bnjs2.default.min(
++    maxPriorityFeePerGasInWEI,
++    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI)
++  );
++  const lowMaxPriorityFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0,
++    low.suggestedMaxPriorityFeePerGas
++  );
++  const mediumMaxPriorityFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0,
++    medium.suggestedMaxPriorityFeePerGas
++  );
++  const highMaxPriorityFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0,
++    high.suggestedMaxPriorityFeePerGas
++  );
++  let lowerTimeBound;
++  let upperTimeBound;
++  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {
++    lowerTimeBound = null;
++    upperTimeBound = "unknown";
++  } else if (effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)) {
++    lowerTimeBound = low.minWaitTimeEstimate;
++    upperTimeBound = low.maxWaitTimeEstimate;
++  } else if (effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)) {
++    lowerTimeBound = medium.minWaitTimeEstimate;
++    upperTimeBound = medium.maxWaitTimeEstimate;
++  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {
++    lowerTimeBound = high.minWaitTimeEstimate;
++    upperTimeBound = high.maxWaitTimeEstimate;
++  } else {
++    lowerTimeBound = 0;
++    upperTimeBound = high.maxWaitTimeEstimate;
++  }
++  return {
++    lowerTimeBound,
++    upperTimeBound
++  };
++}
++
++
++
++
++
++
++
++
++
++
++
++exports.__privateGet = __privateGet; exports.__privateAdd = __privateAdd; exports.__privateSet = __privateSet; exports.__privateMethod = __privateMethod; exports.normalizeGWEIDecimalNumbers = normalizeGWEIDecimalNumbers; exports.fetchGasEstimates = fetchGasEstimates; exports.fetchLegacyGasPriceEstimates = fetchLegacyGasPriceEstimates; exports.fetchEthGasPriceEstimate = fetchEthGasPriceEstimate; exports.calculateTimeEstimate = calculateTimeEstimate;
++//# sourceMappingURL=chunk-2MFVV2BX.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-2MFVV2BX.js.map b/dist/chunk-2MFVV2BX.js.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..c6d83c1c168ee0b053be10a74334ac712bb6a6a1
+--- /dev/null
++++ b/dist/chunk-2MFVV2BX.js.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/gas-util.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  query,\n  handleFetch,\n  gweiDecToWEIBN,\n  weiHexToGweiDec,\n} from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport BN from 'bn.js';\n\nimport type {\n  GasFeeEstimates,\n  EthGasPriceEstimate,\n  EstimatedGasFeeTimeBounds,\n  unknownString,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\n\nconst makeClientIdHeader = (clientId: string) => ({ 'X-Client-Id': clientId });\n\n/**\n * Convert a decimal GWEI value to a decimal string rounded to the nearest WEI.\n *\n * @param n - The input GWEI amount, as a decimal string or a number.\n * @returns The decimal string GWEI amount.\n */\nexport function normalizeGWEIDecimalNumbers(n: string | number) {\n  const numberAsWEIHex = gweiDecToWEIBN(n).toString(16);\n  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex);\n  return numberAsGWEI;\n}\n\n/**\n * Fetch gas estimates from the given URL.\n *\n * @param url - The gas estimate URL.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas estimates.\n */\nexport async function fetchGasEstimates(\n  url: string,\n  clientId?: string,\n): Promise<GasFeeEstimates> {\n  const estimates = await handleFetch(\n    url,\n    clientId ? { headers: makeClientIdHeader(clientId) } : undefined,\n  );\n  return {\n    low: {\n      ...estimates.low,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxFeePerGas,\n      ),\n    },\n    medium: {\n      ...estimates.medium,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxFeePerGas,\n      ),\n    },\n    high: {\n      ...estimates.high,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxFeePerGas,\n      ),\n    },\n    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),\n    historicalBaseFeeRange: estimates.historicalBaseFeeRange,\n    baseFeeTrend: estimates.baseFeeTrend,\n    latestPriorityFeeRange: estimates.latestPriorityFeeRange,\n    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,\n    priorityFeeTrend: estimates.priorityFeeTrend,\n    networkCongestion: estimates.networkCongestion,\n  };\n}\n\n/**\n * Hit the legacy MetaSwaps gasPrices estimate api and return the low, medium\n * high values from that API.\n *\n * @param url - The URL to fetch gas price estimates from.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas price estimates.\n */\nexport async function fetchLegacyGasPriceEstimates(\n  url: string,\n  clientId?: string,\n): Promise<LegacyGasPriceEstimate> {\n  const result = await handleFetch(url, {\n    referrer: url,\n    referrerPolicy: 'no-referrer-when-downgrade',\n    method: 'GET',\n    mode: 'cors',\n    headers: {\n      'Content-Type': 'application/json',\n      ...(clientId && makeClientIdHeader(clientId)),\n    },\n  });\n  return {\n    low: result.SafeGasPrice,\n    medium: result.ProposeGasPrice,\n    high: result.FastGasPrice,\n  };\n}\n\n/**\n * Get a gas price estimate from the network using the `eth_gasPrice` method.\n *\n * @param ethQuery - The EthQuery instance to call the network with.\n * @returns A gas price estimate.\n */\nexport async function fetchEthGasPriceEstimate(\n  ethQuery: EthQuery,\n): Promise<EthGasPriceEstimate> {\n  const gasPrice = await query(ethQuery, 'gasPrice');\n  return {\n    gasPrice: weiHexToGweiDec(gasPrice).toString(),\n  };\n}\n\n/**\n * Estimate the time it will take for a transaction to be confirmed.\n *\n * @param maxPriorityFeePerGas - The max priority fee per gas.\n * @param maxFeePerGas - The max fee per gas.\n * @param gasFeeEstimates - The gas fee estimates.\n * @returns The estimated lower and upper bounds for when this transaction will be confirmed.\n */\nexport function calculateTimeEstimate(\n  maxPriorityFeePerGas: string,\n  maxFeePerGas: string,\n  gasFeeEstimates: GasFeeEstimates,\n): EstimatedGasFeeTimeBounds {\n  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;\n\n  const maxPriorityFeePerGasInWEI = gweiDecToWEIBN(maxPriorityFeePerGas);\n  const maxFeePerGasInWEI = gweiDecToWEIBN(maxFeePerGas);\n  const estimatedBaseFeeInWEI = gweiDecToWEIBN(estimatedBaseFee);\n\n  const effectiveMaxPriorityFee = BN.min(\n    maxPriorityFeePerGasInWEI,\n    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI),\n  );\n\n  const lowMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    low.suggestedMaxPriorityFeePerGas,\n  );\n  const mediumMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    medium.suggestedMaxPriorityFeePerGas,\n  );\n  const highMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    high.suggestedMaxPriorityFeePerGas,\n  );\n\n  let lowerTimeBound;\n  let upperTimeBound;\n\n  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {\n    lowerTimeBound = null;\n    upperTimeBound = 'unknown' as unknownString;\n  } else if (\n    effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = low.minWaitTimeEstimate;\n    upperTimeBound = low.maxWaitTimeEstimate;\n  } else if (\n    effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = medium.minWaitTimeEstimate;\n    upperTimeBound = medium.maxWaitTimeEstimate;\n  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {\n    lowerTimeBound = high.minWaitTimeEstimate;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  } else {\n    lowerTimeBound = 0;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  }\n\n  return {\n    lowerTimeBound,\n    upperTimeBound,\n  };\n}\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-A7NHJBXX.mjs b/dist/chunk-A7NHJBXX.mjs
+new file mode 100644
+index 0000000000000000000000000000000000000000..1dd920c4a314888548db98885976b336d2fec79d
+--- /dev/null
++++ b/dist/chunk-A7NHJBXX.mjs
+@@ -0,0 +1,390 @@
++import {
++  __privateAdd,
++  __privateGet,
++  __privateMethod,
++  __privateSet,
++  calculateTimeEstimate,
++  fetchEthGasPriceEstimate,
++  fetchGasEstimates,
++  fetchLegacyGasPriceEstimates
++} from "./chunk-R3IOI7AK.mjs";
++
++// src/GasFeeController.ts
++import {
++  convertHexToDecimal,
++  safelyExecute,
++  toHex
++} from "@metamask/controller-utils";
++import EthQuery from "@metamask/eth-query";
++import { StaticIntervalPollingController } from "@metamask/polling-controller";
++import { v1 as random } from "uuid";
++var LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;
++var GAS_ESTIMATE_TYPES = {
++  FEE_MARKET: "fee-market",
++  LEGACY: "legacy",
++  ETH_GASPRICE: "eth_gasPrice",
++  NONE: "none"
++};
++var metadata = {
++  gasFeeEstimatesByChainId: {
++    persist: true,
++    anonymous: false
++  },
++  gasFeeEstimates: { persist: true, anonymous: false },
++  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
++  gasEstimateType: { persist: true, anonymous: false },
++  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false }
++};
++var name = "GasFeeController";
++var defaultState = {
++  gasFeeEstimatesByChainId: {},
++  gasFeeEstimates: {},
++  estimatedGasFeeTimeBounds: {},
++  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,
++  nonRPCGasFeeApisDisabled: false
++};
++var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
++var GasFeeController = class extends StaticIntervalPollingController {
++  /**
++   * Creates a GasFeeController instance.
++   *
++   * @param options - The controller options.
++   * @param options.interval - The time in milliseconds to wait between polls.
++   * @param options.messenger - The controller messenger.
++   * @param options.state - The initial state.
++   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
++   * network is EIP-1559 compatible.
++   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
++   * current network is compatible with the legacy gas price API.
++   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
++   * account is EIP-1559 compatible.
++   * @param options.getChainId - Returns the current chain ID.
++   * @param options.getProvider - Returns a network provider for the current network.
++   * @param options.onNetworkDidChange - A function for registering an event handler for the
++   * network state change event.
++   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for
++   * testing purposes.
++   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.
++   * @param options.clientId - The client ID used to identify to the gas estimation API who is
++   * asking for estimates.
++   */
++  constructor({
++    interval = 15e3,
++    messenger,
++    state,
++    getCurrentNetworkEIP1559Compatibility,
++    getCurrentAccountEIP1559Compatibility,
++    getChainId,
++    getCurrentNetworkLegacyGasAPICompatibility,
++    getProvider,
++    onNetworkDidChange,
++    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,
++    EIP1559APIEndpoint,
++    clientId
++  }) {
++    super({
++      name,
++      metadata,
++      messenger,
++      state: { ...defaultState, ...state }
++    });
++    __privateAdd(this, _onNetworkControllerDidChange);
++    __privateAdd(this, _getProvider, void 0);
++    this.intervalDelay = interval;
++    this.setIntervalLength(interval);
++    this.pollTokens = /* @__PURE__ */ new Set();
++    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
++    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
++    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
++    __privateSet(this, _getProvider, getProvider);
++    this.EIP1559APIEndpoint = EIP1559APIEndpoint;
++    this.legacyAPIEndpoint = legacyAPIEndpoint;
++    this.clientId = clientId;
++    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
++    if (onNetworkDidChange && getChainId) {
++      this.currentChainId = getChainId();
++      onNetworkDidChange(async (networkControllerState) => {
++        await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
++      });
++    } else {
++      this.currentChainId = this.messagingSystem.call(
++        "NetworkController:getState"
++      ).providerConfig.chainId;
++      this.messagingSystem.subscribe(
++        "NetworkController:networkDidChange",
++        async (networkControllerState) => {
++          await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
++        }
++      );
++    }
++  }
++  async resetPolling() {
++    if (this.pollTokens.size !== 0) {
++      const tokens = Array.from(this.pollTokens);
++      this.stopPolling();
++      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
++      tokens.slice(1).forEach((token) => {
++        this.pollTokens.add(token);
++      });
++    }
++  }
++  async fetchGasFeeEstimates(options) {
++    return await this._fetchGasFeeEstimateData(options);
++  }
++  async getGasFeeEstimatesAndStartPolling(pollToken) {
++    const _pollToken = pollToken || random();
++    this.pollTokens.add(_pollToken);
++    if (this.pollTokens.size === 1) {
++      await this._fetchGasFeeEstimateData();
++      this._poll();
++    }
++    return _pollToken;
++  }
++  /**
++   * Gets and sets gasFeeEstimates in state.
++   *
++   * @param options - The gas fee estimate options.
++   * @param options.shouldUpdateState - Determines whether the state should be updated with the
++   * updated gas estimates.
++   * @returns The gas fee estimates.
++   */
++  async _fetchGasFeeEstimateData(options = {}) {
++    const { shouldUpdateState = true, networkClientId } = options;
++    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
++    if (networkClientId !== void 0) {
++      const networkClient = this.messagingSystem.call(
++        "NetworkController:getNetworkClientById",
++        networkClientId
++      );
++      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
++      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);
++      try {
++        const result = await this.messagingSystem.call(
++          "NetworkController:getEIP1559Compatibility",
++          networkClientId
++        );
++        isEIP1559Compatible = result || false;
++      } catch {
++        isEIP1559Compatible = false;
++      }
++      ethQuery = new EthQuery(networkClient.provider);
++    }
++    ethQuery ?? (ethQuery = this.ethQuery);
++    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
++    decimalChainId ?? (decimalChainId = convertHexToDecimal(this.currentChainId));
++    try {
++      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
++    } catch (e) {
++      console.error(e);
++      isEIP1559Compatible ?? (isEIP1559Compatible = false);
++    }
++    const gasFeeCalculations = await determineGasFeeCalculations({
++      isEIP1559Compatible,
++      isLegacyGasAPICompatible,
++      fetchGasEstimates,
++      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
++        "<chain_id>",
++        `${decimalChainId}`
++      ),
++      fetchLegacyGasPriceEstimates,
++      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
++        "<chain_id>",
++        `${decimalChainId}`
++      ),
++      fetchEthGasPriceEstimate,
++      calculateTimeEstimate,
++      clientId: this.clientId,
++      ethQuery,
++      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled
++    });
++    if (shouldUpdateState) {
++      const chainId = toHex(decimalChainId);
++      this.update((state) => {
++        if (this.currentChainId === chainId) {
++          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
++          state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
++          state.gasEstimateType = gasFeeCalculations.gasEstimateType;
++        }
++        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
++        state.gasFeeEstimatesByChainId[chainId] = {
++          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
++          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
++          gasEstimateType: gasFeeCalculations.gasEstimateType
++        };
++      });
++    }
++    return gasFeeCalculations;
++  }
++  /**
++   * Remove the poll token, and stop polling if the set of poll tokens is empty.
++   *
++   * @param pollToken - The poll token to disconnect.
++   */
++  disconnectPoller(pollToken) {
++    this.pollTokens.delete(pollToken);
++    if (this.pollTokens.size === 0) {
++      this.stopPolling();
++    }
++  }
++  stopPolling() {
++    if (this.intervalId) {
++      clearInterval(this.intervalId);
++    }
++    this.pollTokens.clear();
++    this.resetState();
++  }
++  /**
++   * Prepare to discard this controller.
++   *
++   * This stops any active polling.
++   */
++  destroy() {
++    super.destroy();
++    this.stopPolling();
++  }
++  _poll() {
++    if (this.intervalId) {
++      clearInterval(this.intervalId);
++    }
++    this.intervalId = setInterval(async () => {
++      await safelyExecute(() => this._fetchGasFeeEstimateData());
++    }, this.intervalDelay);
++  }
++  /**
++   * Fetching token list from the Token Service API.
++   *
++   * @private
++   * @param networkClientId - The ID of the network client triggering the fetch.
++   * @returns A promise that resolves when this operation completes.
++   */
++  async _executePoll(networkClientId) {
++    await this._fetchGasFeeEstimateData({ networkClientId });
++  }
++  resetState() {
++    this.update(() => {
++      return defaultState;
++    });
++  }
++  async getEIP1559Compatibility() {
++    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
++    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
++    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
++  }
++  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
++    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
++      return {};
++    }
++    return calculateTimeEstimate(
++      maxPriorityFeePerGas,
++      maxFeePerGas,
++      this.state.gasFeeEstimates
++    );
++  }
++  enableNonRPCGasFeeApis() {
++    this.update((state) => {
++      state.nonRPCGasFeeApisDisabled = false;
++    });
++  }
++  disableNonRPCGasFeeApis() {
++    this.update((state) => {
++      state.nonRPCGasFeeApisDisabled = true;
++    });
++  }
++};
++_getProvider = new WeakMap();
++_onNetworkControllerDidChange = new WeakSet();
++onNetworkControllerDidChange_fn = async function(networkControllerState) {
++  const newChainId = networkControllerState.providerConfig.chainId;
++  if (newChainId !== this.currentChainId) {
++    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
++    await this.resetPolling();
++    this.currentChainId = newChainId;
++  }
++};
++var GasFeeController_default = GasFeeController;
++
++// src/determineGasFeeCalculations.ts
++async function determineGasFeeCalculations(args) {
++  try {
++    return await getEstimatesUsingFallbacks(args);
++  } catch (error) {
++    if (error instanceof Error) {
++      throw new Error(
++        `Gas fee/price estimation failed. Message: ${error.message}`
++      );
++    }
++    throw error;
++  }
++}
++async function getEstimatesUsingFallbacks(request) {
++  const {
++    isEIP1559Compatible,
++    isLegacyGasAPICompatible,
++    nonRPCGasFeeApisDisabled
++  } = request;
++  try {
++    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {
++      return await getEstimatesUsingFeeMarketEndpoint(request);
++    }
++    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {
++      return await getEstimatesUsingLegacyEndpoint(request);
++    }
++    throw new Error("Main gas fee/price estimation failed. Use fallback");
++  } catch {
++    return await getEstimatesUsingProvider(request);
++  }
++}
++async function getEstimatesUsingFeeMarketEndpoint(request) {
++  const {
++    fetchGasEstimates: fetchGasEstimates2,
++    fetchGasEstimatesUrl,
++    clientId,
++    calculateTimeEstimate: calculateTimeEstimate2
++  } = request;
++  const estimates = await fetchGasEstimates2(fetchGasEstimatesUrl, clientId);
++  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
++  const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
++    suggestedMaxPriorityFeePerGas,
++    suggestedMaxFeePerGas,
++    estimates
++  );
++  return {
++    gasFeeEstimates: estimates,
++    estimatedGasFeeTimeBounds,
++    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
++  };
++}
++async function getEstimatesUsingLegacyEndpoint(request) {
++  const {
++    fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
++    fetchLegacyGasPriceEstimatesUrl,
++    clientId
++  } = request;
++  const estimates = await fetchLegacyGasPriceEstimates2(
++    fetchLegacyGasPriceEstimatesUrl,
++    clientId
++  );
++  return {
++    gasFeeEstimates: estimates,
++    estimatedGasFeeTimeBounds: {},
++    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
++  };
++}
++async function getEstimatesUsingProvider(request) {
++  const { ethQuery, fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2 } = request;
++  const estimates = await fetchEthGasPriceEstimate2(ethQuery);
++  return {
++    gasFeeEstimates: estimates,
++    estimatedGasFeeTimeBounds: {},
++    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
++  };
++}
++
++export {
++  determineGasFeeCalculations,
++  LEGACY_GAS_PRICES_API_URL,
++  GAS_ESTIMATE_TYPES,
++  GasFeeController,
++  GasFeeController_default
++};
++//# sourceMappingURL=chunk-A7NHJBXX.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-A7NHJBXX.mjs.map b/dist/chunk-A7NHJBXX.mjs.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..d40e21b8870bb3ef2d3a092e9abdbb83527764f3
+--- /dev/null
++++ b/dist/chunk-A7NHJBXX.mjs.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport {\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n} from './gas-util';\n\nexport const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId &\n  SingleChainGasFeeState & {\n    nonRPCGasFeeApisDisabled?: boolean;\n  };\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n  nonRPCGasFeeApisDisabled: false,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for\n   * testing purposes.\n   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,\n    EIP1559APIEndpoint,\n    clientId,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    legacyAPIEndpoint?: string;\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    EIP1559APIEndpoint: string;\n    clientId?: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = EIP1559APIEndpoint;\n    this.legacyAPIEndpoint = legacyAPIEndpoint;\n    this.clientId = clientId;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled,\n    });\n\n    if (shouldUpdateState) {\n      const chainId = toHex(decimalChainId);\n      this.update((state) => {\n        if (this.currentChainId === chainId) {\n          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n          state.estimatedGasFeeTimeBounds =\n            gasFeeCalculations.estimatedGasFeeTimeBounds;\n          state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        }\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[chainId] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n\n  enableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = false;\n    });\n  }\n\n  disableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = true;\n    });\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\ntype DetermineGasFeeCalculationsRequest = {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n  nonRPCGasFeeApisDisabled?: boolean;\n};\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @param args.nonRPCGasFeeApisDisabled - Whether to disable requests to the legacyAPIEndpoint and the EIP1559APIEndpoint\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations(\n  args: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  try {\n    return await getEstimatesUsingFallbacks(args);\n  } catch (error) {\n    if (error instanceof Error) {\n      throw new Error(\n        `Gas fee/price estimation failed. Message: ${error.message}`,\n      );\n    }\n\n    throw error;\n  }\n}\n\n/**\n * Retrieve the gas fee estimates using a series of fallback mechanisms.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFallbacks(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    isEIP1559Compatible,\n    isLegacyGasAPICompatible,\n    nonRPCGasFeeApisDisabled,\n  } = request;\n\n  try {\n    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingFeeMarketEndpoint(request);\n    }\n\n    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingLegacyEndpoint(request);\n    }\n\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    return await getEstimatesUsingProvider(request);\n  }\n}\n\n/**\n * Retrieve gas fee estimates using the EIP-1559 endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFeeMarketEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchGasEstimates,\n    fetchGasEstimatesUrl,\n    clientId,\n    calculateTimeEstimate,\n  } = request;\n\n  const estimates = await fetchGasEstimates(fetchGasEstimatesUrl, clientId);\n\n  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n    estimates.medium;\n\n  const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n    suggestedMaxPriorityFeePerGas,\n    suggestedMaxFeePerGas,\n    estimates,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds,\n    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using the legacy endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingLegacyEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchLegacyGasPriceEstimates,\n    fetchLegacyGasPriceEstimatesUrl,\n    clientId,\n  } = request;\n\n  const estimates = await fetchLegacyGasPriceEstimates(\n    fetchLegacyGasPriceEstimatesUrl,\n    clientId,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using an `eth_gasPrice` call to the RPC provider.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingProvider(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const { ethQuery, fetchEthGasPriceEstimate } = request;\n\n  const estimates = await fetchEthGasPriceEstimate(ethQuery);\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n  };\n}\n"],"mappings":"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","names":["fetchGasEstimates","calculateTimeEstimate","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate"]}
+\ No newline at end of file
+diff --git a/dist/chunk-BEVZS3YV.mjs b/dist/chunk-BEVZS3YV.mjs
+deleted file mode 100644
+index 3be5db0695ee6a2c71e64ed76c43a1f30cc9e5ac..0000000000000000000000000000000000000000
+--- a/dist/chunk-BEVZS3YV.mjs
++++ /dev/null
+@@ -1,396 +0,0 @@
+-import {
+-  __privateAdd,
+-  __privateGet,
+-  __privateMethod,
+-  __privateSet,
+-  calculateTimeEstimate,
+-  fetchEthGasPriceEstimate,
+-  fetchGasEstimates,
+-  fetchLegacyGasPriceEstimates
+-} from "./chunk-KORLXV32.mjs";
+-
+-// src/GasFeeController.ts
+-import {
+-  convertHexToDecimal,
+-  safelyExecute,
+-  toHex
+-} from "@metamask/controller-utils";
+-import EthQuery from "@metamask/eth-query";
+-import { StaticIntervalPollingController } from "@metamask/polling-controller";
+-import { v1 as random } from "uuid";
+-var GAS_API_BASE_URL = "https://gas.api.infura.io";
+-var GAS_ESTIMATE_TYPES = {
+-  FEE_MARKET: "fee-market",
+-  LEGACY: "legacy",
+-  ETH_GASPRICE: "eth_gasPrice",
+-  NONE: "none"
+-};
+-var metadata = {
+-  gasFeeEstimatesByChainId: {
+-    persist: true,
+-    anonymous: false
+-  },
+-  gasFeeEstimates: { persist: true, anonymous: false },
+-  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
+-  gasEstimateType: { persist: true, anonymous: false },
+-  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false }
+-};
+-var name = "GasFeeController";
+-var defaultState = {
+-  gasFeeEstimatesByChainId: {},
+-  gasFeeEstimates: {},
+-  estimatedGasFeeTimeBounds: {},
+-  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,
+-  nonRPCGasFeeApisDisabled: false
+-};
+-var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
+-var GasFeeController = class extends StaticIntervalPollingController {
+-  /**
+-   * Creates a GasFeeController instance.
+-   *
+-   * @param options - The controller options.
+-   * @param options.interval - The time in milliseconds to wait between polls.
+-   * @param options.messenger - The controller messenger.
+-   * @param options.state - The initial state.
+-   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
+-   * network is EIP-1559 compatible.
+-   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
+-   * current network is compatible with the legacy gas price API.
+-   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
+-   * account is EIP-1559 compatible.
+-   * @param options.getChainId - Returns the current chain ID.
+-   * @param options.getProvider - Returns a network provider for the current network.
+-   * @param options.onNetworkDidChange - A function for registering an event handler for the
+-   * network state change event.
+-   * @param options.clientId - The client ID used to identify to the gas estimation API who is
+-   * asking for estimates.
+-   * @param options.infuraAPIKey - The Infura API key used for infura API requests.
+-   */
+-  constructor({
+-    interval = 15e3,
+-    messenger,
+-    state,
+-    getCurrentNetworkEIP1559Compatibility,
+-    getCurrentAccountEIP1559Compatibility,
+-    getChainId,
+-    getCurrentNetworkLegacyGasAPICompatibility,
+-    getProvider,
+-    onNetworkDidChange,
+-    clientId,
+-    infuraAPIKey
+-  }) {
+-    super({
+-      name,
+-      metadata,
+-      messenger,
+-      state: { ...defaultState, ...state }
+-    });
+-    __privateAdd(this, _onNetworkControllerDidChange);
+-    __privateAdd(this, _getProvider, void 0);
+-    this.intervalDelay = interval;
+-    this.setIntervalLength(interval);
+-    this.pollTokens = /* @__PURE__ */ new Set();
+-    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
+-    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
+-    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
+-    __privateSet(this, _getProvider, getProvider);
+-    this.EIP1559APIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/suggestedGasFees`;
+-    this.legacyAPIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/gasPrices`;
+-    this.clientId = clientId;
+-    this.infuraAPIKey = infuraAPIKey;
+-    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
+-    if (onNetworkDidChange && getChainId) {
+-      this.currentChainId = getChainId();
+-      onNetworkDidChange(async (networkControllerState) => {
+-        await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
+-      });
+-    } else {
+-      this.currentChainId = this.messagingSystem.call(
+-        "NetworkController:getState"
+-      ).providerConfig.chainId;
+-      this.messagingSystem.subscribe(
+-        "NetworkController:networkDidChange",
+-        async (networkControllerState) => {
+-          await __privateMethod(this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
+-        }
+-      );
+-    }
+-  }
+-  async resetPolling() {
+-    if (this.pollTokens.size !== 0) {
+-      const tokens = Array.from(this.pollTokens);
+-      this.stopPolling();
+-      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
+-      tokens.slice(1).forEach((token) => {
+-        this.pollTokens.add(token);
+-      });
+-    }
+-  }
+-  async fetchGasFeeEstimates(options) {
+-    return await this._fetchGasFeeEstimateData(options);
+-  }
+-  async getGasFeeEstimatesAndStartPolling(pollToken) {
+-    const _pollToken = pollToken || random();
+-    this.pollTokens.add(_pollToken);
+-    if (this.pollTokens.size === 1) {
+-      await this._fetchGasFeeEstimateData();
+-      this._poll();
+-    }
+-    return _pollToken;
+-  }
+-  /**
+-   * Gets and sets gasFeeEstimates in state.
+-   *
+-   * @param options - The gas fee estimate options.
+-   * @param options.shouldUpdateState - Determines whether the state should be updated with the
+-   * updated gas estimates.
+-   * @returns The gas fee estimates.
+-   */
+-  async _fetchGasFeeEstimateData(options = {}) {
+-    const { shouldUpdateState = true, networkClientId } = options;
+-    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
+-    if (networkClientId !== void 0) {
+-      const networkClient = this.messagingSystem.call(
+-        "NetworkController:getNetworkClientById",
+-        networkClientId
+-      );
+-      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
+-      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);
+-      try {
+-        const result = await this.messagingSystem.call(
+-          "NetworkController:getEIP1559Compatibility",
+-          networkClientId
+-        );
+-        isEIP1559Compatible = result || false;
+-      } catch {
+-        isEIP1559Compatible = false;
+-      }
+-      ethQuery = new EthQuery(networkClient.provider);
+-    }
+-    ethQuery ?? (ethQuery = this.ethQuery);
+-    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
+-    decimalChainId ?? (decimalChainId = convertHexToDecimal(this.currentChainId));
+-    try {
+-      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
+-    } catch (e) {
+-      console.error(e);
+-      isEIP1559Compatible ?? (isEIP1559Compatible = false);
+-    }
+-    const gasFeeCalculations = await determineGasFeeCalculations({
+-      isEIP1559Compatible,
+-      isLegacyGasAPICompatible,
+-      fetchGasEstimates,
+-      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
+-        "<chain_id>",
+-        `${decimalChainId}`
+-      ),
+-      fetchLegacyGasPriceEstimates,
+-      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
+-        "<chain_id>",
+-        `${decimalChainId}`
+-      ),
+-      fetchEthGasPriceEstimate,
+-      calculateTimeEstimate,
+-      clientId: this.clientId,
+-      ethQuery,
+-      infuraAPIKey: this.infuraAPIKey,
+-      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled
+-    });
+-    if (shouldUpdateState) {
+-      const chainId = toHex(decimalChainId);
+-      this.update((state) => {
+-        if (this.currentChainId === chainId) {
+-          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
+-          state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
+-          state.gasEstimateType = gasFeeCalculations.gasEstimateType;
+-        }
+-        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
+-        state.gasFeeEstimatesByChainId[chainId] = {
+-          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
+-          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
+-          gasEstimateType: gasFeeCalculations.gasEstimateType
+-        };
+-      });
+-    }
+-    return gasFeeCalculations;
+-  }
+-  /**
+-   * Remove the poll token, and stop polling if the set of poll tokens is empty.
+-   *
+-   * @param pollToken - The poll token to disconnect.
+-   */
+-  disconnectPoller(pollToken) {
+-    this.pollTokens.delete(pollToken);
+-    if (this.pollTokens.size === 0) {
+-      this.stopPolling();
+-    }
+-  }
+-  stopPolling() {
+-    if (this.intervalId) {
+-      clearInterval(this.intervalId);
+-    }
+-    this.pollTokens.clear();
+-    this.resetState();
+-  }
+-  /**
+-   * Prepare to discard this controller.
+-   *
+-   * This stops any active polling.
+-   */
+-  destroy() {
+-    super.destroy();
+-    this.stopPolling();
+-  }
+-  _poll() {
+-    if (this.intervalId) {
+-      clearInterval(this.intervalId);
+-    }
+-    this.intervalId = setInterval(async () => {
+-      await safelyExecute(() => this._fetchGasFeeEstimateData());
+-    }, this.intervalDelay);
+-  }
+-  /**
+-   * Fetching token list from the Token Service API.
+-   *
+-   * @private
+-   * @param networkClientId - The ID of the network client triggering the fetch.
+-   * @returns A promise that resolves when this operation completes.
+-   */
+-  async _executePoll(networkClientId) {
+-    await this._fetchGasFeeEstimateData({ networkClientId });
+-  }
+-  resetState() {
+-    this.update(() => {
+-      return defaultState;
+-    });
+-  }
+-  async getEIP1559Compatibility() {
+-    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
+-    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
+-    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
+-  }
+-  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
+-    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
+-      return {};
+-    }
+-    return calculateTimeEstimate(
+-      maxPriorityFeePerGas,
+-      maxFeePerGas,
+-      this.state.gasFeeEstimates
+-    );
+-  }
+-  enableNonRPCGasFeeApis() {
+-    this.update((state) => {
+-      state.nonRPCGasFeeApisDisabled = false;
+-    });
+-  }
+-  disableNonRPCGasFeeApis() {
+-    this.update((state) => {
+-      state.nonRPCGasFeeApisDisabled = true;
+-    });
+-  }
+-};
+-_getProvider = new WeakMap();
+-_onNetworkControllerDidChange = new WeakSet();
+-onNetworkControllerDidChange_fn = async function(networkControllerState) {
+-  const newChainId = networkControllerState.providerConfig.chainId;
+-  if (newChainId !== this.currentChainId) {
+-    this.ethQuery = new EthQuery(__privateGet(this, _getProvider).call(this));
+-    await this.resetPolling();
+-    this.currentChainId = newChainId;
+-  }
+-};
+-var GasFeeController_default = GasFeeController;
+-
+-// src/determineGasFeeCalculations.ts
+-async function determineGasFeeCalculations(args) {
+-  try {
+-    return await getEstimatesUsingFallbacks(args);
+-  } catch (error) {
+-    if (error instanceof Error) {
+-      throw new Error(
+-        `Gas fee/price estimation failed. Message: ${error.message}`
+-      );
+-    }
+-    throw error;
+-  }
+-}
+-async function getEstimatesUsingFallbacks(request) {
+-  const {
+-    isEIP1559Compatible,
+-    isLegacyGasAPICompatible,
+-    nonRPCGasFeeApisDisabled
+-  } = request;
+-  try {
+-    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {
+-      return await getEstimatesUsingFeeMarketEndpoint(request);
+-    }
+-    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {
+-      return await getEstimatesUsingLegacyEndpoint(request);
+-    }
+-    throw new Error("Main gas fee/price estimation failed. Use fallback");
+-  } catch {
+-    return await getEstimatesUsingProvider(request);
+-  }
+-}
+-async function getEstimatesUsingFeeMarketEndpoint(request) {
+-  const {
+-    fetchGasEstimates: fetchGasEstimates2,
+-    fetchGasEstimatesUrl,
+-    infuraAPIKey,
+-    clientId,
+-    calculateTimeEstimate: calculateTimeEstimate2
+-  } = request;
+-  const estimates = await fetchGasEstimates2(
+-    fetchGasEstimatesUrl,
+-    infuraAPIKey,
+-    clientId
+-  );
+-  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
+-  const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
+-    suggestedMaxPriorityFeePerGas,
+-    suggestedMaxFeePerGas,
+-    estimates
+-  );
+-  return {
+-    gasFeeEstimates: estimates,
+-    estimatedGasFeeTimeBounds,
+-    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
+-  };
+-}
+-async function getEstimatesUsingLegacyEndpoint(request) {
+-  const {
+-    fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
+-    fetchLegacyGasPriceEstimatesUrl,
+-    infuraAPIKey,
+-    clientId
+-  } = request;
+-  const estimates = await fetchLegacyGasPriceEstimates2(
+-    fetchLegacyGasPriceEstimatesUrl,
+-    infuraAPIKey,
+-    clientId
+-  );
+-  return {
+-    gasFeeEstimates: estimates,
+-    estimatedGasFeeTimeBounds: {},
+-    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
+-  };
+-}
+-async function getEstimatesUsingProvider(request) {
+-  const { ethQuery, fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2 } = request;
+-  const estimates = await fetchEthGasPriceEstimate2(ethQuery);
+-  return {
+-    gasFeeEstimates: estimates,
+-    estimatedGasFeeTimeBounds: {},
+-    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
+-  };
+-}
+-
+-export {
+-  determineGasFeeCalculations,
+-  GAS_API_BASE_URL,
+-  GAS_ESTIMATE_TYPES,
+-  GasFeeController,
+-  GasFeeController_default
+-};
+-//# sourceMappingURL=chunk-BEVZS3YV.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-BEVZS3YV.mjs.map b/dist/chunk-BEVZS3YV.mjs.map
+deleted file mode 100644
+index fc90025f10e73e5cdafc8964cd84365e51ad0c42..0000000000000000000000000000000000000000
+--- a/dist/chunk-BEVZS3YV.mjs.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport {\n  calculateTimeEstimate,\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n} from './gas-util';\n\nexport const GAS_API_BASE_URL = 'https://gas.api.infura.io';\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId &\n  SingleChainGasFeeState & {\n    nonRPCGasFeeApisDisabled?: boolean;\n  };\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n  nonRPCGasFeeApisDisabled: false,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private readonly infuraAPIKey: string;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   * @param options.infuraAPIKey - The Infura API key used for infura API requests.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    clientId,\n    infuraAPIKey,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    clientId?: string;\n    infuraAPIKey: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/suggestedGasFees`;\n    this.legacyAPIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/gasPrices`;\n    this.clientId = clientId;\n    this.infuraAPIKey = infuraAPIKey;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n      infuraAPIKey: this.infuraAPIKey,\n      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled,\n    });\n\n    if (shouldUpdateState) {\n      const chainId = toHex(decimalChainId);\n      this.update((state) => {\n        if (this.currentChainId === chainId) {\n          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n          state.estimatedGasFeeTimeBounds =\n            gasFeeCalculations.estimatedGasFeeTimeBounds;\n          state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        }\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[chainId] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n\n  enableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = false;\n    });\n  }\n\n  disableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = true;\n    });\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\ntype DetermineGasFeeCalculationsRequest = {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    infuraAPIKey: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    infuraAPIKey: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n  infuraAPIKey: string;\n  nonRPCGasFeeApisDisabled?: boolean;\n};\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @param args.infuraAPIKey - Infura API key to use for requests to Infura.\n * @param args.nonRPCGasFeeApisDisabled - Whether to disable requests to the legacyAPIEndpoint and the EIP1559APIEndpoint\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations(\n  args: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  try {\n    return await getEstimatesUsingFallbacks(args);\n  } catch (error) {\n    if (error instanceof Error) {\n      throw new Error(\n        `Gas fee/price estimation failed. Message: ${error.message}`,\n      );\n    }\n\n    throw error;\n  }\n}\n\n/**\n * Retrieve the gas fee estimates using a series of fallback mechanisms.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFallbacks(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    isEIP1559Compatible,\n    isLegacyGasAPICompatible,\n    nonRPCGasFeeApisDisabled,\n  } = request;\n\n  try {\n    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingFeeMarketEndpoint(request);\n    }\n\n    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingLegacyEndpoint(request);\n    }\n\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    return await getEstimatesUsingProvider(request);\n  }\n}\n\n/**\n * Retrieve gas fee estimates using the EIP-1559 endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFeeMarketEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchGasEstimates,\n    fetchGasEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n    calculateTimeEstimate,\n  } = request;\n\n  const estimates = await fetchGasEstimates(\n    fetchGasEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n  );\n\n  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n    estimates.medium;\n\n  const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n    suggestedMaxPriorityFeePerGas,\n    suggestedMaxFeePerGas,\n    estimates,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds,\n    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using the legacy endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingLegacyEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchLegacyGasPriceEstimates,\n    fetchLegacyGasPriceEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n  } = request;\n\n  const estimates = await fetchLegacyGasPriceEstimates(\n    fetchLegacyGasPriceEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using an `eth_gasPrice` call to the RPC provider.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingProvider(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const { ethQuery, fetchEthGasPriceEstimate } = request;\n\n  const estimates = await fetchEthGasPriceEstimate(ethQuery);\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n  };\n}\n"],"mappings":"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","names":["fetchGasEstimates","calculateTimeEstimate","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate"]}
+\ No newline at end of file
+diff --git a/dist/chunk-H5WHAYLI.js b/dist/chunk-H5WHAYLI.js
+deleted file mode 100644
+index 3d6f8458707153d0b3cdd19da2bce7cb32da8eef..0000000000000000000000000000000000000000
+--- a/dist/chunk-H5WHAYLI.js
++++ /dev/null
+@@ -1,396 +0,0 @@
+-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+-
+-
+-
+-
+-
+-
+-
+-
+-var _chunkQ2YPK5SLjs = require('./chunk-Q2YPK5SL.js');
+-
+-// src/GasFeeController.ts
+-
+-
+-
+-
+-var _controllerutils = require('@metamask/controller-utils');
+-var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
+-var _pollingcontroller = require('@metamask/polling-controller');
+-var _uuid = require('uuid');
+-var GAS_API_BASE_URL = "https://gas.api.infura.io";
+-var GAS_ESTIMATE_TYPES = {
+-  FEE_MARKET: "fee-market",
+-  LEGACY: "legacy",
+-  ETH_GASPRICE: "eth_gasPrice",
+-  NONE: "none"
+-};
+-var metadata = {
+-  gasFeeEstimatesByChainId: {
+-    persist: true,
+-    anonymous: false
+-  },
+-  gasFeeEstimates: { persist: true, anonymous: false },
+-  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
+-  gasEstimateType: { persist: true, anonymous: false },
+-  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false }
+-};
+-var name = "GasFeeController";
+-var defaultState = {
+-  gasFeeEstimatesByChainId: {},
+-  gasFeeEstimates: {},
+-  estimatedGasFeeTimeBounds: {},
+-  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,
+-  nonRPCGasFeeApisDisabled: false
+-};
+-var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
+-var GasFeeController = class extends _pollingcontroller.StaticIntervalPollingController {
+-  /**
+-   * Creates a GasFeeController instance.
+-   *
+-   * @param options - The controller options.
+-   * @param options.interval - The time in milliseconds to wait between polls.
+-   * @param options.messenger - The controller messenger.
+-   * @param options.state - The initial state.
+-   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
+-   * network is EIP-1559 compatible.
+-   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
+-   * current network is compatible with the legacy gas price API.
+-   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
+-   * account is EIP-1559 compatible.
+-   * @param options.getChainId - Returns the current chain ID.
+-   * @param options.getProvider - Returns a network provider for the current network.
+-   * @param options.onNetworkDidChange - A function for registering an event handler for the
+-   * network state change event.
+-   * @param options.clientId - The client ID used to identify to the gas estimation API who is
+-   * asking for estimates.
+-   * @param options.infuraAPIKey - The Infura API key used for infura API requests.
+-   */
+-  constructor({
+-    interval = 15e3,
+-    messenger,
+-    state,
+-    getCurrentNetworkEIP1559Compatibility,
+-    getCurrentAccountEIP1559Compatibility,
+-    getChainId,
+-    getCurrentNetworkLegacyGasAPICompatibility,
+-    getProvider,
+-    onNetworkDidChange,
+-    clientId,
+-    infuraAPIKey
+-  }) {
+-    super({
+-      name,
+-      metadata,
+-      messenger,
+-      state: { ...defaultState, ...state }
+-    });
+-    _chunkQ2YPK5SLjs.__privateAdd.call(void 0, this, _onNetworkControllerDidChange);
+-    _chunkQ2YPK5SLjs.__privateAdd.call(void 0, this, _getProvider, void 0);
+-    this.intervalDelay = interval;
+-    this.setIntervalLength(interval);
+-    this.pollTokens = /* @__PURE__ */ new Set();
+-    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
+-    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
+-    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
+-    _chunkQ2YPK5SLjs.__privateSet.call(void 0, this, _getProvider, getProvider);
+-    this.EIP1559APIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/suggestedGasFees`;
+-    this.legacyAPIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/gasPrices`;
+-    this.clientId = clientId;
+-    this.infuraAPIKey = infuraAPIKey;
+-    this.ethQuery = new (0, _ethquery2.default)(_chunkQ2YPK5SLjs.__privateGet.call(void 0, this, _getProvider).call(this));
+-    if (onNetworkDidChange && getChainId) {
+-      this.currentChainId = getChainId();
+-      onNetworkDidChange(async (networkControllerState) => {
+-        await _chunkQ2YPK5SLjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
+-      });
+-    } else {
+-      this.currentChainId = this.messagingSystem.call(
+-        "NetworkController:getState"
+-      ).providerConfig.chainId;
+-      this.messagingSystem.subscribe(
+-        "NetworkController:networkDidChange",
+-        async (networkControllerState) => {
+-          await _chunkQ2YPK5SLjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
+-        }
+-      );
+-    }
+-  }
+-  async resetPolling() {
+-    if (this.pollTokens.size !== 0) {
+-      const tokens = Array.from(this.pollTokens);
+-      this.stopPolling();
+-      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
+-      tokens.slice(1).forEach((token) => {
+-        this.pollTokens.add(token);
+-      });
+-    }
+-  }
+-  async fetchGasFeeEstimates(options) {
+-    return await this._fetchGasFeeEstimateData(options);
+-  }
+-  async getGasFeeEstimatesAndStartPolling(pollToken) {
+-    const _pollToken = pollToken || _uuid.v1.call(void 0, );
+-    this.pollTokens.add(_pollToken);
+-    if (this.pollTokens.size === 1) {
+-      await this._fetchGasFeeEstimateData();
+-      this._poll();
+-    }
+-    return _pollToken;
+-  }
+-  /**
+-   * Gets and sets gasFeeEstimates in state.
+-   *
+-   * @param options - The gas fee estimate options.
+-   * @param options.shouldUpdateState - Determines whether the state should be updated with the
+-   * updated gas estimates.
+-   * @returns The gas fee estimates.
+-   */
+-  async _fetchGasFeeEstimateData(options = {}) {
+-    const { shouldUpdateState = true, networkClientId } = options;
+-    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
+-    if (networkClientId !== void 0) {
+-      const networkClient = this.messagingSystem.call(
+-        "NetworkController:getNetworkClientById",
+-        networkClientId
+-      );
+-      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
+-      decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, networkClient.configuration.chainId);
+-      try {
+-        const result = await this.messagingSystem.call(
+-          "NetworkController:getEIP1559Compatibility",
+-          networkClientId
+-        );
+-        isEIP1559Compatible = result || false;
+-      } catch {
+-        isEIP1559Compatible = false;
+-      }
+-      ethQuery = new (0, _ethquery2.default)(networkClient.provider);
+-    }
+-    ethQuery ?? (ethQuery = this.ethQuery);
+-    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
+-    decimalChainId ?? (decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, this.currentChainId));
+-    try {
+-      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
+-    } catch (e) {
+-      console.error(e);
+-      isEIP1559Compatible ?? (isEIP1559Compatible = false);
+-    }
+-    const gasFeeCalculations = await determineGasFeeCalculations({
+-      isEIP1559Compatible,
+-      isLegacyGasAPICompatible,
+-      fetchGasEstimates: _chunkQ2YPK5SLjs.fetchGasEstimates,
+-      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
+-        "<chain_id>",
+-        `${decimalChainId}`
+-      ),
+-      fetchLegacyGasPriceEstimates: _chunkQ2YPK5SLjs.fetchLegacyGasPriceEstimates,
+-      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
+-        "<chain_id>",
+-        `${decimalChainId}`
+-      ),
+-      fetchEthGasPriceEstimate: _chunkQ2YPK5SLjs.fetchEthGasPriceEstimate,
+-      calculateTimeEstimate: _chunkQ2YPK5SLjs.calculateTimeEstimate,
+-      clientId: this.clientId,
+-      ethQuery,
+-      infuraAPIKey: this.infuraAPIKey,
+-      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled
+-    });
+-    if (shouldUpdateState) {
+-      const chainId = _controllerutils.toHex.call(void 0, decimalChainId);
+-      this.update((state) => {
+-        if (this.currentChainId === chainId) {
+-          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
+-          state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
+-          state.gasEstimateType = gasFeeCalculations.gasEstimateType;
+-        }
+-        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
+-        state.gasFeeEstimatesByChainId[chainId] = {
+-          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
+-          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
+-          gasEstimateType: gasFeeCalculations.gasEstimateType
+-        };
+-      });
+-    }
+-    return gasFeeCalculations;
+-  }
+-  /**
+-   * Remove the poll token, and stop polling if the set of poll tokens is empty.
+-   *
+-   * @param pollToken - The poll token to disconnect.
+-   */
+-  disconnectPoller(pollToken) {
+-    this.pollTokens.delete(pollToken);
+-    if (this.pollTokens.size === 0) {
+-      this.stopPolling();
+-    }
+-  }
+-  stopPolling() {
+-    if (this.intervalId) {
+-      clearInterval(this.intervalId);
+-    }
+-    this.pollTokens.clear();
+-    this.resetState();
+-  }
+-  /**
+-   * Prepare to discard this controller.
+-   *
+-   * This stops any active polling.
+-   */
+-  destroy() {
+-    super.destroy();
+-    this.stopPolling();
+-  }
+-  _poll() {
+-    if (this.intervalId) {
+-      clearInterval(this.intervalId);
+-    }
+-    this.intervalId = setInterval(async () => {
+-      await _controllerutils.safelyExecute.call(void 0, () => this._fetchGasFeeEstimateData());
+-    }, this.intervalDelay);
+-  }
+-  /**
+-   * Fetching token list from the Token Service API.
+-   *
+-   * @private
+-   * @param networkClientId - The ID of the network client triggering the fetch.
+-   * @returns A promise that resolves when this operation completes.
+-   */
+-  async _executePoll(networkClientId) {
+-    await this._fetchGasFeeEstimateData({ networkClientId });
+-  }
+-  resetState() {
+-    this.update(() => {
+-      return defaultState;
+-    });
+-  }
+-  async getEIP1559Compatibility() {
+-    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
+-    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
+-    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
+-  }
+-  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
+-    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
+-      return {};
+-    }
+-    return _chunkQ2YPK5SLjs.calculateTimeEstimate.call(void 0,
+-      maxPriorityFeePerGas,
+-      maxFeePerGas,
+-      this.state.gasFeeEstimates
+-    );
+-  }
+-  enableNonRPCGasFeeApis() {
+-    this.update((state) => {
+-      state.nonRPCGasFeeApisDisabled = false;
+-    });
+-  }
+-  disableNonRPCGasFeeApis() {
+-    this.update((state) => {
+-      state.nonRPCGasFeeApisDisabled = true;
+-    });
+-  }
+-};
+-_getProvider = new WeakMap();
+-_onNetworkControllerDidChange = new WeakSet();
+-onNetworkControllerDidChange_fn = async function(networkControllerState) {
+-  const newChainId = networkControllerState.providerConfig.chainId;
+-  if (newChainId !== this.currentChainId) {
+-    this.ethQuery = new (0, _ethquery2.default)(_chunkQ2YPK5SLjs.__privateGet.call(void 0, this, _getProvider).call(this));
+-    await this.resetPolling();
+-    this.currentChainId = newChainId;
+-  }
+-};
+-var GasFeeController_default = GasFeeController;
+-
+-// src/determineGasFeeCalculations.ts
+-async function determineGasFeeCalculations(args) {
+-  try {
+-    return await getEstimatesUsingFallbacks(args);
+-  } catch (error) {
+-    if (error instanceof Error) {
+-      throw new Error(
+-        `Gas fee/price estimation failed. Message: ${error.message}`
+-      );
+-    }
+-    throw error;
+-  }
+-}
+-async function getEstimatesUsingFallbacks(request) {
+-  const {
+-    isEIP1559Compatible,
+-    isLegacyGasAPICompatible,
+-    nonRPCGasFeeApisDisabled
+-  } = request;
+-  try {
+-    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {
+-      return await getEstimatesUsingFeeMarketEndpoint(request);
+-    }
+-    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {
+-      return await getEstimatesUsingLegacyEndpoint(request);
+-    }
+-    throw new Error("Main gas fee/price estimation failed. Use fallback");
+-  } catch {
+-    return await getEstimatesUsingProvider(request);
+-  }
+-}
+-async function getEstimatesUsingFeeMarketEndpoint(request) {
+-  const {
+-    fetchGasEstimates: fetchGasEstimates2,
+-    fetchGasEstimatesUrl,
+-    infuraAPIKey,
+-    clientId,
+-    calculateTimeEstimate: calculateTimeEstimate2
+-  } = request;
+-  const estimates = await fetchGasEstimates2(
+-    fetchGasEstimatesUrl,
+-    infuraAPIKey,
+-    clientId
+-  );
+-  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
+-  const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
+-    suggestedMaxPriorityFeePerGas,
+-    suggestedMaxFeePerGas,
+-    estimates
+-  );
+-  return {
+-    gasFeeEstimates: estimates,
+-    estimatedGasFeeTimeBounds,
+-    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
+-  };
+-}
+-async function getEstimatesUsingLegacyEndpoint(request) {
+-  const {
+-    fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
+-    fetchLegacyGasPriceEstimatesUrl,
+-    infuraAPIKey,
+-    clientId
+-  } = request;
+-  const estimates = await fetchLegacyGasPriceEstimates2(
+-    fetchLegacyGasPriceEstimatesUrl,
+-    infuraAPIKey,
+-    clientId
+-  );
+-  return {
+-    gasFeeEstimates: estimates,
+-    estimatedGasFeeTimeBounds: {},
+-    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
+-  };
+-}
+-async function getEstimatesUsingProvider(request) {
+-  const { ethQuery, fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2 } = request;
+-  const estimates = await fetchEthGasPriceEstimate2(ethQuery);
+-  return {
+-    gasFeeEstimates: estimates,
+-    estimatedGasFeeTimeBounds: {},
+-    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
+-  };
+-}
+-
+-
+-
+-
+-
+-
+-
+-exports.determineGasFeeCalculations = determineGasFeeCalculations; exports.GAS_API_BASE_URL = GAS_API_BASE_URL; exports.GAS_ESTIMATE_TYPES = GAS_ESTIMATE_TYPES; exports.GasFeeController = GasFeeController; exports.GasFeeController_default = GasFeeController_default;
+-//# sourceMappingURL=chunk-H5WHAYLI.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-H5WHAYLI.js.map b/dist/chunk-H5WHAYLI.js.map
+deleted file mode 100644
+index ed761f584584470a8176f029d9d860dc017428fc..0000000000000000000000000000000000000000
+--- a/dist/chunk-H5WHAYLI.js.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"names":["fetchGasEstimates","calculateTimeEstimate","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate"],"mappings":"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","sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport {\n  calculateTimeEstimate,\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n} from './gas-util';\n\nexport const GAS_API_BASE_URL = 'https://gas.api.infura.io';\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId &\n  SingleChainGasFeeState & {\n    nonRPCGasFeeApisDisabled?: boolean;\n  };\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n  nonRPCGasFeeApisDisabled: false,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private readonly infuraAPIKey: string;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   * @param options.infuraAPIKey - The Infura API key used for infura API requests.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    clientId,\n    infuraAPIKey,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    clientId?: string;\n    infuraAPIKey: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/suggestedGasFees`;\n    this.legacyAPIEndpoint = `${GAS_API_BASE_URL}/networks/<chain_id>/gasPrices`;\n    this.clientId = clientId;\n    this.infuraAPIKey = infuraAPIKey;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n      infuraAPIKey: this.infuraAPIKey,\n      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled,\n    });\n\n    if (shouldUpdateState) {\n      const chainId = toHex(decimalChainId);\n      this.update((state) => {\n        if (this.currentChainId === chainId) {\n          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n          state.estimatedGasFeeTimeBounds =\n            gasFeeCalculations.estimatedGasFeeTimeBounds;\n          state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        }\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[chainId] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n\n  enableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = false;\n    });\n  }\n\n  disableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = true;\n    });\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\ntype DetermineGasFeeCalculationsRequest = {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    infuraAPIKey: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    infuraAPIKey: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n  infuraAPIKey: string;\n  nonRPCGasFeeApisDisabled?: boolean;\n};\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @param args.infuraAPIKey - Infura API key to use for requests to Infura.\n * @param args.nonRPCGasFeeApisDisabled - Whether to disable requests to the legacyAPIEndpoint and the EIP1559APIEndpoint\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations(\n  args: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  try {\n    return await getEstimatesUsingFallbacks(args);\n  } catch (error) {\n    if (error instanceof Error) {\n      throw new Error(\n        `Gas fee/price estimation failed. Message: ${error.message}`,\n      );\n    }\n\n    throw error;\n  }\n}\n\n/**\n * Retrieve the gas fee estimates using a series of fallback mechanisms.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFallbacks(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    isEIP1559Compatible,\n    isLegacyGasAPICompatible,\n    nonRPCGasFeeApisDisabled,\n  } = request;\n\n  try {\n    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingFeeMarketEndpoint(request);\n    }\n\n    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingLegacyEndpoint(request);\n    }\n\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    return await getEstimatesUsingProvider(request);\n  }\n}\n\n/**\n * Retrieve gas fee estimates using the EIP-1559 endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFeeMarketEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchGasEstimates,\n    fetchGasEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n    calculateTimeEstimate,\n  } = request;\n\n  const estimates = await fetchGasEstimates(\n    fetchGasEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n  );\n\n  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n    estimates.medium;\n\n  const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n    suggestedMaxPriorityFeePerGas,\n    suggestedMaxFeePerGas,\n    estimates,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds,\n    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using the legacy endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingLegacyEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchLegacyGasPriceEstimates,\n    fetchLegacyGasPriceEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n  } = request;\n\n  const estimates = await fetchLegacyGasPriceEstimates(\n    fetchLegacyGasPriceEstimatesUrl,\n    infuraAPIKey,\n    clientId,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using an `eth_gasPrice` call to the RPC provider.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingProvider(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const { ethQuery, fetchEthGasPriceEstimate } = request;\n\n  const estimates = await fetchEthGasPriceEstimate(ethQuery);\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n  };\n}\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-KORLXV32.mjs b/dist/chunk-KORLXV32.mjs
+deleted file mode 100644
+index a964582d5c161e6b650fe9447442ca9540f9fdb9..0000000000000000000000000000000000000000
+--- a/dist/chunk-KORLXV32.mjs
++++ /dev/null
+@@ -1,165 +0,0 @@
+-var __accessCheck = (obj, member, msg) => {
+-  if (!member.has(obj))
+-    throw TypeError("Cannot " + msg);
+-};
+-var __privateGet = (obj, member, getter) => {
+-  __accessCheck(obj, member, "read from private field");
+-  return getter ? getter.call(obj) : member.get(obj);
+-};
+-var __privateAdd = (obj, member, value) => {
+-  if (member.has(obj))
+-    throw TypeError("Cannot add the same private member more than once");
+-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+-};
+-var __privateSet = (obj, member, value, setter) => {
+-  __accessCheck(obj, member, "write to private field");
+-  setter ? setter.call(obj, value) : member.set(obj, value);
+-  return value;
+-};
+-var __privateMethod = (obj, member, method) => {
+-  __accessCheck(obj, member, "access private method");
+-  return method;
+-};
+-
+-// src/gas-util.ts
+-import {
+-  query,
+-  handleFetch,
+-  gweiDecToWEIBN,
+-  weiHexToGweiDec
+-} from "@metamask/controller-utils";
+-import BN from "bn.js";
+-var makeClientIdHeader = (clientId) => ({ "X-Client-Id": clientId });
+-function normalizeGWEIDecimalNumbers(n) {
+-  const numberAsWEIHex = gweiDecToWEIBN(n).toString(16);
+-  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex);
+-  return numberAsGWEI;
+-}
+-async function fetchGasEstimates(url, infuraAPIKey, clientId) {
+-  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);
+-  const estimates = await handleFetch(url, {
+-    headers: getHeaders(infuraAuthToken, clientId)
+-  });
+-  return {
+-    low: {
+-      ...estimates.low,
+-      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.low.suggestedMaxPriorityFeePerGas
+-      ),
+-      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.low.suggestedMaxFeePerGas
+-      )
+-    },
+-    medium: {
+-      ...estimates.medium,
+-      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.medium.suggestedMaxPriorityFeePerGas
+-      ),
+-      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.medium.suggestedMaxFeePerGas
+-      )
+-    },
+-    high: {
+-      ...estimates.high,
+-      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.high.suggestedMaxPriorityFeePerGas
+-      ),
+-      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.high.suggestedMaxFeePerGas
+-      )
+-    },
+-    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),
+-    historicalBaseFeeRange: estimates.historicalBaseFeeRange,
+-    baseFeeTrend: estimates.baseFeeTrend,
+-    latestPriorityFeeRange: estimates.latestPriorityFeeRange,
+-    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,
+-    priorityFeeTrend: estimates.priorityFeeTrend,
+-    networkCongestion: estimates.networkCongestion
+-  };
+-}
+-async function fetchLegacyGasPriceEstimates(url, infuraAPIKey, clientId) {
+-  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);
+-  const result = await handleFetch(url, {
+-    referrer: url,
+-    referrerPolicy: "no-referrer-when-downgrade",
+-    method: "GET",
+-    mode: "cors",
+-    headers: getHeaders(infuraAuthToken, clientId)
+-  });
+-  return {
+-    low: result.SafeGasPrice,
+-    medium: result.ProposeGasPrice,
+-    high: result.FastGasPrice
+-  };
+-}
+-async function fetchEthGasPriceEstimate(ethQuery) {
+-  const gasPrice = await query(ethQuery, "gasPrice");
+-  return {
+-    gasPrice: weiHexToGweiDec(gasPrice).toString()
+-  };
+-}
+-function calculateTimeEstimate(maxPriorityFeePerGas, maxFeePerGas, gasFeeEstimates) {
+-  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;
+-  const maxPriorityFeePerGasInWEI = gweiDecToWEIBN(maxPriorityFeePerGas);
+-  const maxFeePerGasInWEI = gweiDecToWEIBN(maxFeePerGas);
+-  const estimatedBaseFeeInWEI = gweiDecToWEIBN(estimatedBaseFee);
+-  const effectiveMaxPriorityFee = BN.min(
+-    maxPriorityFeePerGasInWEI,
+-    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI)
+-  );
+-  const lowMaxPriorityFeeInWEI = gweiDecToWEIBN(
+-    low.suggestedMaxPriorityFeePerGas
+-  );
+-  const mediumMaxPriorityFeeInWEI = gweiDecToWEIBN(
+-    medium.suggestedMaxPriorityFeePerGas
+-  );
+-  const highMaxPriorityFeeInWEI = gweiDecToWEIBN(
+-    high.suggestedMaxPriorityFeePerGas
+-  );
+-  let lowerTimeBound;
+-  let upperTimeBound;
+-  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = null;
+-    upperTimeBound = "unknown";
+-  } else if (effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = low.minWaitTimeEstimate;
+-    upperTimeBound = low.maxWaitTimeEstimate;
+-  } else if (effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = medium.minWaitTimeEstimate;
+-    upperTimeBound = medium.maxWaitTimeEstimate;
+-  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = high.minWaitTimeEstimate;
+-    upperTimeBound = high.maxWaitTimeEstimate;
+-  } else {
+-    lowerTimeBound = 0;
+-    upperTimeBound = high.maxWaitTimeEstimate;
+-  }
+-  return {
+-    lowerTimeBound,
+-    upperTimeBound
+-  };
+-}
+-function buildInfuraAuthToken(infuraAPIKey) {
+-  return Buffer.from(`${infuraAPIKey}:`).toString("base64");
+-}
+-function getHeaders(infuraAuthToken, clientId) {
+-  return {
+-    "Content-Type": "application/json",
+-    Authorization: `Basic ${infuraAuthToken}`,
+-    // Only add the clientId header if clientId is a non-empty string
+-    ...clientId?.trim() ? makeClientIdHeader(clientId) : {}
+-  };
+-}
+-
+-export {
+-  __privateGet,
+-  __privateAdd,
+-  __privateSet,
+-  __privateMethod,
+-  normalizeGWEIDecimalNumbers,
+-  fetchGasEstimates,
+-  fetchLegacyGasPriceEstimates,
+-  fetchEthGasPriceEstimate,
+-  calculateTimeEstimate
+-};
+-//# sourceMappingURL=chunk-KORLXV32.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-KORLXV32.mjs.map b/dist/chunk-KORLXV32.mjs.map
+deleted file mode 100644
+index b95130543a5b39392214c5fe873ad367e6fa8af7..0000000000000000000000000000000000000000
+--- a/dist/chunk-KORLXV32.mjs.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/gas-util.ts"],"sourcesContent":["import {\n  query,\n  handleFetch,\n  gweiDecToWEIBN,\n  weiHexToGweiDec,\n} from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport BN from 'bn.js';\n\nimport type {\n  GasFeeEstimates,\n  EthGasPriceEstimate,\n  EstimatedGasFeeTimeBounds,\n  unknownString,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\n\nconst makeClientIdHeader = (clientId: string) => ({ 'X-Client-Id': clientId });\n\n/**\n * Convert a decimal GWEI value to a decimal string rounded to the nearest WEI.\n *\n * @param n - The input GWEI amount, as a decimal string or a number.\n * @returns The decimal string GWEI amount.\n */\nexport function normalizeGWEIDecimalNumbers(n: string | number) {\n  const numberAsWEIHex = gweiDecToWEIBN(n).toString(16);\n  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex);\n  return numberAsGWEI;\n}\n\n/**\n * Fetch gas estimates from the given URL.\n *\n * @param url - The gas estimate URL.\n * @param infuraAPIKey - The Infura API key used for infura API requests.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas estimates.\n */\nexport async function fetchGasEstimates(\n  url: string,\n  infuraAPIKey: string,\n  clientId?: string,\n): Promise<GasFeeEstimates> {\n  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);\n  const estimates = await handleFetch(url, {\n    headers: getHeaders(infuraAuthToken, clientId),\n  });\n  return {\n    low: {\n      ...estimates.low,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxFeePerGas,\n      ),\n    },\n    medium: {\n      ...estimates.medium,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxFeePerGas,\n      ),\n    },\n    high: {\n      ...estimates.high,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxFeePerGas,\n      ),\n    },\n    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),\n    historicalBaseFeeRange: estimates.historicalBaseFeeRange,\n    baseFeeTrend: estimates.baseFeeTrend,\n    latestPriorityFeeRange: estimates.latestPriorityFeeRange,\n    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,\n    priorityFeeTrend: estimates.priorityFeeTrend,\n    networkCongestion: estimates.networkCongestion,\n  };\n}\n\n/**\n * Hit the legacy MetaSwaps gasPrices estimate api and return the low, medium\n * high values from that API.\n *\n * @param url - The URL to fetch gas price estimates from.\n * @param infuraAPIKey - The Infura API key used for infura API requests.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas price estimates.\n */\nexport async function fetchLegacyGasPriceEstimates(\n  url: string,\n  infuraAPIKey: string,\n  clientId?: string,\n): Promise<LegacyGasPriceEstimate> {\n  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);\n  const result = await handleFetch(url, {\n    referrer: url,\n    referrerPolicy: 'no-referrer-when-downgrade',\n    method: 'GET',\n    mode: 'cors',\n    headers: getHeaders(infuraAuthToken, clientId),\n  });\n  return {\n    low: result.SafeGasPrice,\n    medium: result.ProposeGasPrice,\n    high: result.FastGasPrice,\n  };\n}\n\n/**\n * Get a gas price estimate from the network using the `eth_gasPrice` method.\n *\n * @param ethQuery - The EthQuery instance to call the network with.\n * @returns A gas price estimate.\n */\nexport async function fetchEthGasPriceEstimate(\n  ethQuery: EthQuery,\n): Promise<EthGasPriceEstimate> {\n  const gasPrice = await query(ethQuery, 'gasPrice');\n  return {\n    gasPrice: weiHexToGweiDec(gasPrice).toString(),\n  };\n}\n\n/**\n * Estimate the time it will take for a transaction to be confirmed.\n *\n * @param maxPriorityFeePerGas - The max priority fee per gas.\n * @param maxFeePerGas - The max fee per gas.\n * @param gasFeeEstimates - The gas fee estimates.\n * @returns The estimated lower and upper bounds for when this transaction will be confirmed.\n */\nexport function calculateTimeEstimate(\n  maxPriorityFeePerGas: string,\n  maxFeePerGas: string,\n  gasFeeEstimates: GasFeeEstimates,\n): EstimatedGasFeeTimeBounds {\n  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;\n\n  const maxPriorityFeePerGasInWEI = gweiDecToWEIBN(maxPriorityFeePerGas);\n  const maxFeePerGasInWEI = gweiDecToWEIBN(maxFeePerGas);\n  const estimatedBaseFeeInWEI = gweiDecToWEIBN(estimatedBaseFee);\n\n  const effectiveMaxPriorityFee = BN.min(\n    maxPriorityFeePerGasInWEI,\n    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI),\n  );\n\n  const lowMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    low.suggestedMaxPriorityFeePerGas,\n  );\n  const mediumMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    medium.suggestedMaxPriorityFeePerGas,\n  );\n  const highMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    high.suggestedMaxPriorityFeePerGas,\n  );\n\n  let lowerTimeBound;\n  let upperTimeBound;\n\n  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {\n    lowerTimeBound = null;\n    upperTimeBound = 'unknown' as unknownString;\n  } else if (\n    effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = low.minWaitTimeEstimate;\n    upperTimeBound = low.maxWaitTimeEstimate;\n  } else if (\n    effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = medium.minWaitTimeEstimate;\n    upperTimeBound = medium.maxWaitTimeEstimate;\n  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {\n    lowerTimeBound = high.minWaitTimeEstimate;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  } else {\n    lowerTimeBound = 0;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  }\n\n  return {\n    lowerTimeBound,\n    upperTimeBound,\n  };\n}\n\n/**\n * Build an infura auth token from the given API key and secret.\n *\n * @param infuraAPIKey - The Infura API key.\n * @returns The base64 encoded auth token.\n */\nfunction buildInfuraAuthToken(infuraAPIKey: string) {\n  // We intentionally leave the password empty, as Infura does not require one\n  return Buffer.from(`${infuraAPIKey}:`).toString('base64');\n}\n\n/**\n * Get the headers for a request to the gas fee API.\n *\n * @param infuraAuthToken - The Infura auth token to use for the request.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The headers for the request.\n */\nfunction getHeaders(infuraAuthToken: string, clientId?: string) {\n  return {\n    'Content-Type': 'application/json',\n    Authorization: `Basic ${infuraAuthToken}`,\n    // Only add the clientId header if clientId is a non-empty string\n    ...(clientId?.trim() ? makeClientIdHeader(clientId) : {}),\n  };\n}\n"],"mappings":"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","names":[]}
+\ No newline at end of file
+diff --git a/dist/chunk-Q2YPK5SL.js b/dist/chunk-Q2YPK5SL.js
+deleted file mode 100644
+index 154d3eafb98cdb84cda1a2ea60f6be8a75f4e7a6..0000000000000000000000000000000000000000
+--- a/dist/chunk-Q2YPK5SL.js
++++ /dev/null
+@@ -1,165 +0,0 @@
+-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var __accessCheck = (obj, member, msg) => {
+-  if (!member.has(obj))
+-    throw TypeError("Cannot " + msg);
+-};
+-var __privateGet = (obj, member, getter) => {
+-  __accessCheck(obj, member, "read from private field");
+-  return getter ? getter.call(obj) : member.get(obj);
+-};
+-var __privateAdd = (obj, member, value) => {
+-  if (member.has(obj))
+-    throw TypeError("Cannot add the same private member more than once");
+-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+-};
+-var __privateSet = (obj, member, value, setter) => {
+-  __accessCheck(obj, member, "write to private field");
+-  setter ? setter.call(obj, value) : member.set(obj, value);
+-  return value;
+-};
+-var __privateMethod = (obj, member, method) => {
+-  __accessCheck(obj, member, "access private method");
+-  return method;
+-};
+-
+-// src/gas-util.ts
+-
+-
+-
+-
+-
+-var _controllerutils = require('@metamask/controller-utils');
+-var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
+-var makeClientIdHeader = (clientId) => ({ "X-Client-Id": clientId });
+-function normalizeGWEIDecimalNumbers(n) {
+-  const numberAsWEIHex = _controllerutils.gweiDecToWEIBN.call(void 0, n).toString(16);
+-  const numberAsGWEI = _controllerutils.weiHexToGweiDec.call(void 0, numberAsWEIHex);
+-  return numberAsGWEI;
+-}
+-async function fetchGasEstimates(url, infuraAPIKey, clientId) {
+-  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);
+-  const estimates = await _controllerutils.handleFetch.call(void 0, url, {
+-    headers: getHeaders(infuraAuthToken, clientId)
+-  });
+-  return {
+-    low: {
+-      ...estimates.low,
+-      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.low.suggestedMaxPriorityFeePerGas
+-      ),
+-      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.low.suggestedMaxFeePerGas
+-      )
+-    },
+-    medium: {
+-      ...estimates.medium,
+-      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.medium.suggestedMaxPriorityFeePerGas
+-      ),
+-      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.medium.suggestedMaxFeePerGas
+-      )
+-    },
+-    high: {
+-      ...estimates.high,
+-      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.high.suggestedMaxPriorityFeePerGas
+-      ),
+-      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
+-        estimates.high.suggestedMaxFeePerGas
+-      )
+-    },
+-    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),
+-    historicalBaseFeeRange: estimates.historicalBaseFeeRange,
+-    baseFeeTrend: estimates.baseFeeTrend,
+-    latestPriorityFeeRange: estimates.latestPriorityFeeRange,
+-    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,
+-    priorityFeeTrend: estimates.priorityFeeTrend,
+-    networkCongestion: estimates.networkCongestion
+-  };
+-}
+-async function fetchLegacyGasPriceEstimates(url, infuraAPIKey, clientId) {
+-  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);
+-  const result = await _controllerutils.handleFetch.call(void 0, url, {
+-    referrer: url,
+-    referrerPolicy: "no-referrer-when-downgrade",
+-    method: "GET",
+-    mode: "cors",
+-    headers: getHeaders(infuraAuthToken, clientId)
+-  });
+-  return {
+-    low: result.SafeGasPrice,
+-    medium: result.ProposeGasPrice,
+-    high: result.FastGasPrice
+-  };
+-}
+-async function fetchEthGasPriceEstimate(ethQuery) {
+-  const gasPrice = await _controllerutils.query.call(void 0, ethQuery, "gasPrice");
+-  return {
+-    gasPrice: _controllerutils.weiHexToGweiDec.call(void 0, gasPrice).toString()
+-  };
+-}
+-function calculateTimeEstimate(maxPriorityFeePerGas, maxFeePerGas, gasFeeEstimates) {
+-  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;
+-  const maxPriorityFeePerGasInWEI = _controllerutils.gweiDecToWEIBN.call(void 0, maxPriorityFeePerGas);
+-  const maxFeePerGasInWEI = _controllerutils.gweiDecToWEIBN.call(void 0, maxFeePerGas);
+-  const estimatedBaseFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0, estimatedBaseFee);
+-  const effectiveMaxPriorityFee = _bnjs2.default.min(
+-    maxPriorityFeePerGasInWEI,
+-    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI)
+-  );
+-  const lowMaxPriorityFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0,
+-    low.suggestedMaxPriorityFeePerGas
+-  );
+-  const mediumMaxPriorityFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0,
+-    medium.suggestedMaxPriorityFeePerGas
+-  );
+-  const highMaxPriorityFeeInWEI = _controllerutils.gweiDecToWEIBN.call(void 0,
+-    high.suggestedMaxPriorityFeePerGas
+-  );
+-  let lowerTimeBound;
+-  let upperTimeBound;
+-  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = null;
+-    upperTimeBound = "unknown";
+-  } else if (effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = low.minWaitTimeEstimate;
+-    upperTimeBound = low.maxWaitTimeEstimate;
+-  } else if (effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = medium.minWaitTimeEstimate;
+-    upperTimeBound = medium.maxWaitTimeEstimate;
+-  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {
+-    lowerTimeBound = high.minWaitTimeEstimate;
+-    upperTimeBound = high.maxWaitTimeEstimate;
+-  } else {
+-    lowerTimeBound = 0;
+-    upperTimeBound = high.maxWaitTimeEstimate;
+-  }
+-  return {
+-    lowerTimeBound,
+-    upperTimeBound
+-  };
+-}
+-function buildInfuraAuthToken(infuraAPIKey) {
+-  return Buffer.from(`${infuraAPIKey}:`).toString("base64");
+-}
+-function getHeaders(infuraAuthToken, clientId) {
+-  return {
+-    "Content-Type": "application/json",
+-    Authorization: `Basic ${infuraAuthToken}`,
+-    // Only add the clientId header if clientId is a non-empty string
+-    ...clientId?.trim() ? makeClientIdHeader(clientId) : {}
+-  };
+-}
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-exports.__privateGet = __privateGet; exports.__privateAdd = __privateAdd; exports.__privateSet = __privateSet; exports.__privateMethod = __privateMethod; exports.normalizeGWEIDecimalNumbers = normalizeGWEIDecimalNumbers; exports.fetchGasEstimates = fetchGasEstimates; exports.fetchLegacyGasPriceEstimates = fetchLegacyGasPriceEstimates; exports.fetchEthGasPriceEstimate = fetchEthGasPriceEstimate; exports.calculateTimeEstimate = calculateTimeEstimate;
+-//# sourceMappingURL=chunk-Q2YPK5SL.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-Q2YPK5SL.js.map b/dist/chunk-Q2YPK5SL.js.map
+deleted file mode 100644
+index dc1a17f2cd5fdd749b46fbb546375ea3a1925081..0000000000000000000000000000000000000000
+--- a/dist/chunk-Q2YPK5SL.js.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/gas-util.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  query,\n  handleFetch,\n  gweiDecToWEIBN,\n  weiHexToGweiDec,\n} from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport BN from 'bn.js';\n\nimport type {\n  GasFeeEstimates,\n  EthGasPriceEstimate,\n  EstimatedGasFeeTimeBounds,\n  unknownString,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\n\nconst makeClientIdHeader = (clientId: string) => ({ 'X-Client-Id': clientId });\n\n/**\n * Convert a decimal GWEI value to a decimal string rounded to the nearest WEI.\n *\n * @param n - The input GWEI amount, as a decimal string or a number.\n * @returns The decimal string GWEI amount.\n */\nexport function normalizeGWEIDecimalNumbers(n: string | number) {\n  const numberAsWEIHex = gweiDecToWEIBN(n).toString(16);\n  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex);\n  return numberAsGWEI;\n}\n\n/**\n * Fetch gas estimates from the given URL.\n *\n * @param url - The gas estimate URL.\n * @param infuraAPIKey - The Infura API key used for infura API requests.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas estimates.\n */\nexport async function fetchGasEstimates(\n  url: string,\n  infuraAPIKey: string,\n  clientId?: string,\n): Promise<GasFeeEstimates> {\n  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);\n  const estimates = await handleFetch(url, {\n    headers: getHeaders(infuraAuthToken, clientId),\n  });\n  return {\n    low: {\n      ...estimates.low,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxFeePerGas,\n      ),\n    },\n    medium: {\n      ...estimates.medium,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxFeePerGas,\n      ),\n    },\n    high: {\n      ...estimates.high,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxFeePerGas,\n      ),\n    },\n    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),\n    historicalBaseFeeRange: estimates.historicalBaseFeeRange,\n    baseFeeTrend: estimates.baseFeeTrend,\n    latestPriorityFeeRange: estimates.latestPriorityFeeRange,\n    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,\n    priorityFeeTrend: estimates.priorityFeeTrend,\n    networkCongestion: estimates.networkCongestion,\n  };\n}\n\n/**\n * Hit the legacy MetaSwaps gasPrices estimate api and return the low, medium\n * high values from that API.\n *\n * @param url - The URL to fetch gas price estimates from.\n * @param infuraAPIKey - The Infura API key used for infura API requests.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas price estimates.\n */\nexport async function fetchLegacyGasPriceEstimates(\n  url: string,\n  infuraAPIKey: string,\n  clientId?: string,\n): Promise<LegacyGasPriceEstimate> {\n  const infuraAuthToken = buildInfuraAuthToken(infuraAPIKey);\n  const result = await handleFetch(url, {\n    referrer: url,\n    referrerPolicy: 'no-referrer-when-downgrade',\n    method: 'GET',\n    mode: 'cors',\n    headers: getHeaders(infuraAuthToken, clientId),\n  });\n  return {\n    low: result.SafeGasPrice,\n    medium: result.ProposeGasPrice,\n    high: result.FastGasPrice,\n  };\n}\n\n/**\n * Get a gas price estimate from the network using the `eth_gasPrice` method.\n *\n * @param ethQuery - The EthQuery instance to call the network with.\n * @returns A gas price estimate.\n */\nexport async function fetchEthGasPriceEstimate(\n  ethQuery: EthQuery,\n): Promise<EthGasPriceEstimate> {\n  const gasPrice = await query(ethQuery, 'gasPrice');\n  return {\n    gasPrice: weiHexToGweiDec(gasPrice).toString(),\n  };\n}\n\n/**\n * Estimate the time it will take for a transaction to be confirmed.\n *\n * @param maxPriorityFeePerGas - The max priority fee per gas.\n * @param maxFeePerGas - The max fee per gas.\n * @param gasFeeEstimates - The gas fee estimates.\n * @returns The estimated lower and upper bounds for when this transaction will be confirmed.\n */\nexport function calculateTimeEstimate(\n  maxPriorityFeePerGas: string,\n  maxFeePerGas: string,\n  gasFeeEstimates: GasFeeEstimates,\n): EstimatedGasFeeTimeBounds {\n  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;\n\n  const maxPriorityFeePerGasInWEI = gweiDecToWEIBN(maxPriorityFeePerGas);\n  const maxFeePerGasInWEI = gweiDecToWEIBN(maxFeePerGas);\n  const estimatedBaseFeeInWEI = gweiDecToWEIBN(estimatedBaseFee);\n\n  const effectiveMaxPriorityFee = BN.min(\n    maxPriorityFeePerGasInWEI,\n    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI),\n  );\n\n  const lowMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    low.suggestedMaxPriorityFeePerGas,\n  );\n  const mediumMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    medium.suggestedMaxPriorityFeePerGas,\n  );\n  const highMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    high.suggestedMaxPriorityFeePerGas,\n  );\n\n  let lowerTimeBound;\n  let upperTimeBound;\n\n  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {\n    lowerTimeBound = null;\n    upperTimeBound = 'unknown' as unknownString;\n  } else if (\n    effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = low.minWaitTimeEstimate;\n    upperTimeBound = low.maxWaitTimeEstimate;\n  } else if (\n    effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = medium.minWaitTimeEstimate;\n    upperTimeBound = medium.maxWaitTimeEstimate;\n  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {\n    lowerTimeBound = high.minWaitTimeEstimate;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  } else {\n    lowerTimeBound = 0;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  }\n\n  return {\n    lowerTimeBound,\n    upperTimeBound,\n  };\n}\n\n/**\n * Build an infura auth token from the given API key and secret.\n *\n * @param infuraAPIKey - The Infura API key.\n * @returns The base64 encoded auth token.\n */\nfunction buildInfuraAuthToken(infuraAPIKey: string) {\n  // We intentionally leave the password empty, as Infura does not require one\n  return Buffer.from(`${infuraAPIKey}:`).toString('base64');\n}\n\n/**\n * Get the headers for a request to the gas fee API.\n *\n * @param infuraAuthToken - The Infura auth token to use for the request.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The headers for the request.\n */\nfunction getHeaders(infuraAuthToken: string, clientId?: string) {\n  return {\n    'Content-Type': 'application/json',\n    Authorization: `Basic ${infuraAuthToken}`,\n    // Only add the clientId header if clientId is a non-empty string\n    ...(clientId?.trim() ? makeClientIdHeader(clientId) : {}),\n  };\n}\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-R3IOI7AK.mjs b/dist/chunk-R3IOI7AK.mjs
+new file mode 100644
+index 0000000000000000000000000000000000000000..005f6ca08cfdc55aabcf1849e2a3b651ee7d9303
+--- /dev/null
++++ b/dist/chunk-R3IOI7AK.mjs
+@@ -0,0 +1,156 @@
++var __accessCheck = (obj, member, msg) => {
++  if (!member.has(obj))
++    throw TypeError("Cannot " + msg);
++};
++var __privateGet = (obj, member, getter) => {
++  __accessCheck(obj, member, "read from private field");
++  return getter ? getter.call(obj) : member.get(obj);
++};
++var __privateAdd = (obj, member, value) => {
++  if (member.has(obj))
++    throw TypeError("Cannot add the same private member more than once");
++  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
++};
++var __privateSet = (obj, member, value, setter) => {
++  __accessCheck(obj, member, "write to private field");
++  setter ? setter.call(obj, value) : member.set(obj, value);
++  return value;
++};
++var __privateMethod = (obj, member, method) => {
++  __accessCheck(obj, member, "access private method");
++  return method;
++};
++
++// src/gas-util.ts
++import {
++  query,
++  handleFetch,
++  gweiDecToWEIBN,
++  weiHexToGweiDec
++} from "@metamask/controller-utils";
++import BN from "bn.js";
++var makeClientIdHeader = (clientId) => ({ "X-Client-Id": clientId });
++function normalizeGWEIDecimalNumbers(n) {
++  const numberAsWEIHex = gweiDecToWEIBN(n).toString(16);
++  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex);
++  return numberAsGWEI;
++}
++async function fetchGasEstimates(url, clientId) {
++  const estimates = await handleFetch(
++    url,
++    clientId ? { headers: makeClientIdHeader(clientId) } : void 0
++  );
++  return {
++    low: {
++      ...estimates.low,
++      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.low.suggestedMaxPriorityFeePerGas
++      ),
++      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.low.suggestedMaxFeePerGas
++      )
++    },
++    medium: {
++      ...estimates.medium,
++      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.medium.suggestedMaxPriorityFeePerGas
++      ),
++      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.medium.suggestedMaxFeePerGas
++      )
++    },
++    high: {
++      ...estimates.high,
++      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.high.suggestedMaxPriorityFeePerGas
++      ),
++      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(
++        estimates.high.suggestedMaxFeePerGas
++      )
++    },
++    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),
++    historicalBaseFeeRange: estimates.historicalBaseFeeRange,
++    baseFeeTrend: estimates.baseFeeTrend,
++    latestPriorityFeeRange: estimates.latestPriorityFeeRange,
++    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,
++    priorityFeeTrend: estimates.priorityFeeTrend,
++    networkCongestion: estimates.networkCongestion
++  };
++}
++async function fetchLegacyGasPriceEstimates(url, clientId) {
++  const result = await handleFetch(url, {
++    referrer: url,
++    referrerPolicy: "no-referrer-when-downgrade",
++    method: "GET",
++    mode: "cors",
++    headers: {
++      "Content-Type": "application/json",
++      ...clientId && makeClientIdHeader(clientId)
++    }
++  });
++  return {
++    low: result.SafeGasPrice,
++    medium: result.ProposeGasPrice,
++    high: result.FastGasPrice
++  };
++}
++async function fetchEthGasPriceEstimate(ethQuery) {
++  const gasPrice = await query(ethQuery, "gasPrice");
++  return {
++    gasPrice: weiHexToGweiDec(gasPrice).toString()
++  };
++}
++function calculateTimeEstimate(maxPriorityFeePerGas, maxFeePerGas, gasFeeEstimates) {
++  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;
++  const maxPriorityFeePerGasInWEI = gweiDecToWEIBN(maxPriorityFeePerGas);
++  const maxFeePerGasInWEI = gweiDecToWEIBN(maxFeePerGas);
++  const estimatedBaseFeeInWEI = gweiDecToWEIBN(estimatedBaseFee);
++  const effectiveMaxPriorityFee = BN.min(
++    maxPriorityFeePerGasInWEI,
++    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI)
++  );
++  const lowMaxPriorityFeeInWEI = gweiDecToWEIBN(
++    low.suggestedMaxPriorityFeePerGas
++  );
++  const mediumMaxPriorityFeeInWEI = gweiDecToWEIBN(
++    medium.suggestedMaxPriorityFeePerGas
++  );
++  const highMaxPriorityFeeInWEI = gweiDecToWEIBN(
++    high.suggestedMaxPriorityFeePerGas
++  );
++  let lowerTimeBound;
++  let upperTimeBound;
++  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {
++    lowerTimeBound = null;
++    upperTimeBound = "unknown";
++  } else if (effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)) {
++    lowerTimeBound = low.minWaitTimeEstimate;
++    upperTimeBound = low.maxWaitTimeEstimate;
++  } else if (effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) && effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)) {
++    lowerTimeBound = medium.minWaitTimeEstimate;
++    upperTimeBound = medium.maxWaitTimeEstimate;
++  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {
++    lowerTimeBound = high.minWaitTimeEstimate;
++    upperTimeBound = high.maxWaitTimeEstimate;
++  } else {
++    lowerTimeBound = 0;
++    upperTimeBound = high.maxWaitTimeEstimate;
++  }
++  return {
++    lowerTimeBound,
++    upperTimeBound
++  };
++}
++
++export {
++  __privateGet,
++  __privateAdd,
++  __privateSet,
++  __privateMethod,
++  normalizeGWEIDecimalNumbers,
++  fetchGasEstimates,
++  fetchLegacyGasPriceEstimates,
++  fetchEthGasPriceEstimate,
++  calculateTimeEstimate
++};
++//# sourceMappingURL=chunk-R3IOI7AK.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-R3IOI7AK.mjs.map b/dist/chunk-R3IOI7AK.mjs.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..151a4aa1146e106a273c2e7cbfe8e97c7e6ae6b6
+--- /dev/null
++++ b/dist/chunk-R3IOI7AK.mjs.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/gas-util.ts"],"sourcesContent":["import {\n  query,\n  handleFetch,\n  gweiDecToWEIBN,\n  weiHexToGweiDec,\n} from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport BN from 'bn.js';\n\nimport type {\n  GasFeeEstimates,\n  EthGasPriceEstimate,\n  EstimatedGasFeeTimeBounds,\n  unknownString,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\n\nconst makeClientIdHeader = (clientId: string) => ({ 'X-Client-Id': clientId });\n\n/**\n * Convert a decimal GWEI value to a decimal string rounded to the nearest WEI.\n *\n * @param n - The input GWEI amount, as a decimal string or a number.\n * @returns The decimal string GWEI amount.\n */\nexport function normalizeGWEIDecimalNumbers(n: string | number) {\n  const numberAsWEIHex = gweiDecToWEIBN(n).toString(16);\n  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex);\n  return numberAsGWEI;\n}\n\n/**\n * Fetch gas estimates from the given URL.\n *\n * @param url - The gas estimate URL.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas estimates.\n */\nexport async function fetchGasEstimates(\n  url: string,\n  clientId?: string,\n): Promise<GasFeeEstimates> {\n  const estimates = await handleFetch(\n    url,\n    clientId ? { headers: makeClientIdHeader(clientId) } : undefined,\n  );\n  return {\n    low: {\n      ...estimates.low,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.low.suggestedMaxFeePerGas,\n      ),\n    },\n    medium: {\n      ...estimates.medium,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.medium.suggestedMaxFeePerGas,\n      ),\n    },\n    high: {\n      ...estimates.high,\n      suggestedMaxPriorityFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxPriorityFeePerGas,\n      ),\n      suggestedMaxFeePerGas: normalizeGWEIDecimalNumbers(\n        estimates.high.suggestedMaxFeePerGas,\n      ),\n    },\n    estimatedBaseFee: normalizeGWEIDecimalNumbers(estimates.estimatedBaseFee),\n    historicalBaseFeeRange: estimates.historicalBaseFeeRange,\n    baseFeeTrend: estimates.baseFeeTrend,\n    latestPriorityFeeRange: estimates.latestPriorityFeeRange,\n    historicalPriorityFeeRange: estimates.historicalPriorityFeeRange,\n    priorityFeeTrend: estimates.priorityFeeTrend,\n    networkCongestion: estimates.networkCongestion,\n  };\n}\n\n/**\n * Hit the legacy MetaSwaps gasPrices estimate api and return the low, medium\n * high values from that API.\n *\n * @param url - The URL to fetch gas price estimates from.\n * @param clientId - The client ID used to identify to the API who is asking for estimates.\n * @returns The gas price estimates.\n */\nexport async function fetchLegacyGasPriceEstimates(\n  url: string,\n  clientId?: string,\n): Promise<LegacyGasPriceEstimate> {\n  const result = await handleFetch(url, {\n    referrer: url,\n    referrerPolicy: 'no-referrer-when-downgrade',\n    method: 'GET',\n    mode: 'cors',\n    headers: {\n      'Content-Type': 'application/json',\n      ...(clientId && makeClientIdHeader(clientId)),\n    },\n  });\n  return {\n    low: result.SafeGasPrice,\n    medium: result.ProposeGasPrice,\n    high: result.FastGasPrice,\n  };\n}\n\n/**\n * Get a gas price estimate from the network using the `eth_gasPrice` method.\n *\n * @param ethQuery - The EthQuery instance to call the network with.\n * @returns A gas price estimate.\n */\nexport async function fetchEthGasPriceEstimate(\n  ethQuery: EthQuery,\n): Promise<EthGasPriceEstimate> {\n  const gasPrice = await query(ethQuery, 'gasPrice');\n  return {\n    gasPrice: weiHexToGweiDec(gasPrice).toString(),\n  };\n}\n\n/**\n * Estimate the time it will take for a transaction to be confirmed.\n *\n * @param maxPriorityFeePerGas - The max priority fee per gas.\n * @param maxFeePerGas - The max fee per gas.\n * @param gasFeeEstimates - The gas fee estimates.\n * @returns The estimated lower and upper bounds for when this transaction will be confirmed.\n */\nexport function calculateTimeEstimate(\n  maxPriorityFeePerGas: string,\n  maxFeePerGas: string,\n  gasFeeEstimates: GasFeeEstimates,\n): EstimatedGasFeeTimeBounds {\n  const { low, medium, high, estimatedBaseFee } = gasFeeEstimates;\n\n  const maxPriorityFeePerGasInWEI = gweiDecToWEIBN(maxPriorityFeePerGas);\n  const maxFeePerGasInWEI = gweiDecToWEIBN(maxFeePerGas);\n  const estimatedBaseFeeInWEI = gweiDecToWEIBN(estimatedBaseFee);\n\n  const effectiveMaxPriorityFee = BN.min(\n    maxPriorityFeePerGasInWEI,\n    maxFeePerGasInWEI.sub(estimatedBaseFeeInWEI),\n  );\n\n  const lowMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    low.suggestedMaxPriorityFeePerGas,\n  );\n  const mediumMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    medium.suggestedMaxPriorityFeePerGas,\n  );\n  const highMaxPriorityFeeInWEI = gweiDecToWEIBN(\n    high.suggestedMaxPriorityFeePerGas,\n  );\n\n  let lowerTimeBound;\n  let upperTimeBound;\n\n  if (effectiveMaxPriorityFee.lt(lowMaxPriorityFeeInWEI)) {\n    lowerTimeBound = null;\n    upperTimeBound = 'unknown' as unknownString;\n  } else if (\n    effectiveMaxPriorityFee.gte(lowMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(mediumMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = low.minWaitTimeEstimate;\n    upperTimeBound = low.maxWaitTimeEstimate;\n  } else if (\n    effectiveMaxPriorityFee.gte(mediumMaxPriorityFeeInWEI) &&\n    effectiveMaxPriorityFee.lt(highMaxPriorityFeeInWEI)\n  ) {\n    lowerTimeBound = medium.minWaitTimeEstimate;\n    upperTimeBound = medium.maxWaitTimeEstimate;\n  } else if (effectiveMaxPriorityFee.eq(highMaxPriorityFeeInWEI)) {\n    lowerTimeBound = high.minWaitTimeEstimate;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  } else {\n    lowerTimeBound = 0;\n    upperTimeBound = high.maxWaitTimeEstimate;\n  }\n\n  return {\n    lowerTimeBound,\n    upperTimeBound,\n  };\n}\n"],"mappings":"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","names":[]}
+\ No newline at end of file
+diff --git a/dist/chunk-X74LQX2Y.js b/dist/chunk-X74LQX2Y.js
+new file mode 100644
+index 0000000000000000000000000000000000000000..11d4e4b36c51872b5b529eb4e7d4f7eea91e87c7
+--- /dev/null
++++ b/dist/chunk-X74LQX2Y.js
+@@ -0,0 +1,390 @@
++"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
++
++
++
++
++
++
++
++
++var _chunk2MFVV2BXjs = require('./chunk-2MFVV2BX.js');
++
++// src/GasFeeController.ts
++
++
++
++
++var _controllerutils = require('@metamask/controller-utils');
++var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
++var _pollingcontroller = require('@metamask/polling-controller');
++var _uuid = require('uuid');
++var LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;
++var GAS_ESTIMATE_TYPES = {
++  FEE_MARKET: "fee-market",
++  LEGACY: "legacy",
++  ETH_GASPRICE: "eth_gasPrice",
++  NONE: "none"
++};
++var metadata = {
++  gasFeeEstimatesByChainId: {
++    persist: true,
++    anonymous: false
++  },
++  gasFeeEstimates: { persist: true, anonymous: false },
++  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },
++  gasEstimateType: { persist: true, anonymous: false },
++  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false }
++};
++var name = "GasFeeController";
++var defaultState = {
++  gasFeeEstimatesByChainId: {},
++  gasFeeEstimates: {},
++  estimatedGasFeeTimeBounds: {},
++  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,
++  nonRPCGasFeeApisDisabled: false
++};
++var _getProvider, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn;
++var GasFeeController = class extends _pollingcontroller.StaticIntervalPollingController {
++  /**
++   * Creates a GasFeeController instance.
++   *
++   * @param options - The controller options.
++   * @param options.interval - The time in milliseconds to wait between polls.
++   * @param options.messenger - The controller messenger.
++   * @param options.state - The initial state.
++   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current
++   * network is EIP-1559 compatible.
++   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the
++   * current network is compatible with the legacy gas price API.
++   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current
++   * account is EIP-1559 compatible.
++   * @param options.getChainId - Returns the current chain ID.
++   * @param options.getProvider - Returns a network provider for the current network.
++   * @param options.onNetworkDidChange - A function for registering an event handler for the
++   * network state change event.
++   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for
++   * testing purposes.
++   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.
++   * @param options.clientId - The client ID used to identify to the gas estimation API who is
++   * asking for estimates.
++   */
++  constructor({
++    interval = 15e3,
++    messenger,
++    state,
++    getCurrentNetworkEIP1559Compatibility,
++    getCurrentAccountEIP1559Compatibility,
++    getChainId,
++    getCurrentNetworkLegacyGasAPICompatibility,
++    getProvider,
++    onNetworkDidChange,
++    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,
++    EIP1559APIEndpoint,
++    clientId
++  }) {
++    super({
++      name,
++      metadata,
++      messenger,
++      state: { ...defaultState, ...state }
++    });
++    _chunk2MFVV2BXjs.__privateAdd.call(void 0, this, _onNetworkControllerDidChange);
++    _chunk2MFVV2BXjs.__privateAdd.call(void 0, this, _getProvider, void 0);
++    this.intervalDelay = interval;
++    this.setIntervalLength(interval);
++    this.pollTokens = /* @__PURE__ */ new Set();
++    this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
++    this.getCurrentNetworkLegacyGasAPICompatibility = getCurrentNetworkLegacyGasAPICompatibility;
++    this.getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
++    _chunk2MFVV2BXjs.__privateSet.call(void 0, this, _getProvider, getProvider);
++    this.EIP1559APIEndpoint = EIP1559APIEndpoint;
++    this.legacyAPIEndpoint = legacyAPIEndpoint;
++    this.clientId = clientId;
++    this.ethQuery = new (0, _ethquery2.default)(_chunk2MFVV2BXjs.__privateGet.call(void 0, this, _getProvider).call(this));
++    if (onNetworkDidChange && getChainId) {
++      this.currentChainId = getChainId();
++      onNetworkDidChange(async (networkControllerState) => {
++        await _chunk2MFVV2BXjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
++      });
++    } else {
++      this.currentChainId = this.messagingSystem.call(
++        "NetworkController:getState"
++      ).providerConfig.chainId;
++      this.messagingSystem.subscribe(
++        "NetworkController:networkDidChange",
++        async (networkControllerState) => {
++          await _chunk2MFVV2BXjs.__privateMethod.call(void 0, this, _onNetworkControllerDidChange, onNetworkControllerDidChange_fn).call(this, networkControllerState);
++        }
++      );
++    }
++  }
++  async resetPolling() {
++    if (this.pollTokens.size !== 0) {
++      const tokens = Array.from(this.pollTokens);
++      this.stopPolling();
++      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);
++      tokens.slice(1).forEach((token) => {
++        this.pollTokens.add(token);
++      });
++    }
++  }
++  async fetchGasFeeEstimates(options) {
++    return await this._fetchGasFeeEstimateData(options);
++  }
++  async getGasFeeEstimatesAndStartPolling(pollToken) {
++    const _pollToken = pollToken || _uuid.v1.call(void 0, );
++    this.pollTokens.add(_pollToken);
++    if (this.pollTokens.size === 1) {
++      await this._fetchGasFeeEstimateData();
++      this._poll();
++    }
++    return _pollToken;
++  }
++  /**
++   * Gets and sets gasFeeEstimates in state.
++   *
++   * @param options - The gas fee estimate options.
++   * @param options.shouldUpdateState - Determines whether the state should be updated with the
++   * updated gas estimates.
++   * @returns The gas fee estimates.
++   */
++  async _fetchGasFeeEstimateData(options = {}) {
++    const { shouldUpdateState = true, networkClientId } = options;
++    let ethQuery, isEIP1559Compatible, isLegacyGasAPICompatible, decimalChainId;
++    if (networkClientId !== void 0) {
++      const networkClient = this.messagingSystem.call(
++        "NetworkController:getNetworkClientById",
++        networkClientId
++      );
++      isLegacyGasAPICompatible = networkClient.configuration.chainId === "0x38";
++      decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, networkClient.configuration.chainId);
++      try {
++        const result = await this.messagingSystem.call(
++          "NetworkController:getEIP1559Compatibility",
++          networkClientId
++        );
++        isEIP1559Compatible = result || false;
++      } catch {
++        isEIP1559Compatible = false;
++      }
++      ethQuery = new (0, _ethquery2.default)(networkClient.provider);
++    }
++    ethQuery ?? (ethQuery = this.ethQuery);
++    isLegacyGasAPICompatible ?? (isLegacyGasAPICompatible = this.getCurrentNetworkLegacyGasAPICompatibility());
++    decimalChainId ?? (decimalChainId = _controllerutils.convertHexToDecimal.call(void 0, this.currentChainId));
++    try {
++      isEIP1559Compatible ?? (isEIP1559Compatible = await this.getEIP1559Compatibility());
++    } catch (e) {
++      console.error(e);
++      isEIP1559Compatible ?? (isEIP1559Compatible = false);
++    }
++    const gasFeeCalculations = await determineGasFeeCalculations({
++      isEIP1559Compatible,
++      isLegacyGasAPICompatible,
++      fetchGasEstimates: _chunk2MFVV2BXjs.fetchGasEstimates,
++      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(
++        "<chain_id>",
++        `${decimalChainId}`
++      ),
++      fetchLegacyGasPriceEstimates: _chunk2MFVV2BXjs.fetchLegacyGasPriceEstimates,
++      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(
++        "<chain_id>",
++        `${decimalChainId}`
++      ),
++      fetchEthGasPriceEstimate: _chunk2MFVV2BXjs.fetchEthGasPriceEstimate,
++      calculateTimeEstimate: _chunk2MFVV2BXjs.calculateTimeEstimate,
++      clientId: this.clientId,
++      ethQuery,
++      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled
++    });
++    if (shouldUpdateState) {
++      const chainId = _controllerutils.toHex.call(void 0, decimalChainId);
++      this.update((state) => {
++        if (this.currentChainId === chainId) {
++          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;
++          state.estimatedGasFeeTimeBounds = gasFeeCalculations.estimatedGasFeeTimeBounds;
++          state.gasEstimateType = gasFeeCalculations.gasEstimateType;
++        }
++        state.gasFeeEstimatesByChainId ?? (state.gasFeeEstimatesByChainId = {});
++        state.gasFeeEstimatesByChainId[chainId] = {
++          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,
++          estimatedGasFeeTimeBounds: gasFeeCalculations.estimatedGasFeeTimeBounds,
++          gasEstimateType: gasFeeCalculations.gasEstimateType
++        };
++      });
++    }
++    return gasFeeCalculations;
++  }
++  /**
++   * Remove the poll token, and stop polling if the set of poll tokens is empty.
++   *
++   * @param pollToken - The poll token to disconnect.
++   */
++  disconnectPoller(pollToken) {
++    this.pollTokens.delete(pollToken);
++    if (this.pollTokens.size === 0) {
++      this.stopPolling();
++    }
++  }
++  stopPolling() {
++    if (this.intervalId) {
++      clearInterval(this.intervalId);
++    }
++    this.pollTokens.clear();
++    this.resetState();
++  }
++  /**
++   * Prepare to discard this controller.
++   *
++   * This stops any active polling.
++   */
++  destroy() {
++    super.destroy();
++    this.stopPolling();
++  }
++  _poll() {
++    if (this.intervalId) {
++      clearInterval(this.intervalId);
++    }
++    this.intervalId = setInterval(async () => {
++      await _controllerutils.safelyExecute.call(void 0, () => this._fetchGasFeeEstimateData());
++    }, this.intervalDelay);
++  }
++  /**
++   * Fetching token list from the Token Service API.
++   *
++   * @private
++   * @param networkClientId - The ID of the network client triggering the fetch.
++   * @returns A promise that resolves when this operation completes.
++   */
++  async _executePoll(networkClientId) {
++    await this._fetchGasFeeEstimateData({ networkClientId });
++  }
++  resetState() {
++    this.update(() => {
++      return defaultState;
++    });
++  }
++  async getEIP1559Compatibility() {
++    const currentNetworkIsEIP1559Compatible = await this.getCurrentNetworkEIP1559Compatibility();
++    const currentAccountIsEIP1559Compatible = this.getCurrentAccountEIP1559Compatibility?.() ?? true;
++    return currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible;
++  }
++  getTimeEstimate(maxPriorityFeePerGas, maxFeePerGas) {
++    if (!this.state.gasFeeEstimates || this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET) {
++      return {};
++    }
++    return _chunk2MFVV2BXjs.calculateTimeEstimate.call(void 0,
++      maxPriorityFeePerGas,
++      maxFeePerGas,
++      this.state.gasFeeEstimates
++    );
++  }
++  enableNonRPCGasFeeApis() {
++    this.update((state) => {
++      state.nonRPCGasFeeApisDisabled = false;
++    });
++  }
++  disableNonRPCGasFeeApis() {
++    this.update((state) => {
++      state.nonRPCGasFeeApisDisabled = true;
++    });
++  }
++};
++_getProvider = new WeakMap();
++_onNetworkControllerDidChange = new WeakSet();
++onNetworkControllerDidChange_fn = async function(networkControllerState) {
++  const newChainId = networkControllerState.providerConfig.chainId;
++  if (newChainId !== this.currentChainId) {
++    this.ethQuery = new (0, _ethquery2.default)(_chunk2MFVV2BXjs.__privateGet.call(void 0, this, _getProvider).call(this));
++    await this.resetPolling();
++    this.currentChainId = newChainId;
++  }
++};
++var GasFeeController_default = GasFeeController;
++
++// src/determineGasFeeCalculations.ts
++async function determineGasFeeCalculations(args) {
++  try {
++    return await getEstimatesUsingFallbacks(args);
++  } catch (error) {
++    if (error instanceof Error) {
++      throw new Error(
++        `Gas fee/price estimation failed. Message: ${error.message}`
++      );
++    }
++    throw error;
++  }
++}
++async function getEstimatesUsingFallbacks(request) {
++  const {
++    isEIP1559Compatible,
++    isLegacyGasAPICompatible,
++    nonRPCGasFeeApisDisabled
++  } = request;
++  try {
++    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {
++      return await getEstimatesUsingFeeMarketEndpoint(request);
++    }
++    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {
++      return await getEstimatesUsingLegacyEndpoint(request);
++    }
++    throw new Error("Main gas fee/price estimation failed. Use fallback");
++  } catch {
++    return await getEstimatesUsingProvider(request);
++  }
++}
++async function getEstimatesUsingFeeMarketEndpoint(request) {
++  const {
++    fetchGasEstimates: fetchGasEstimates2,
++    fetchGasEstimatesUrl,
++    clientId,
++    calculateTimeEstimate: calculateTimeEstimate2
++  } = request;
++  const estimates = await fetchGasEstimates2(fetchGasEstimatesUrl, clientId);
++  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } = estimates.medium;
++  const estimatedGasFeeTimeBounds = calculateTimeEstimate2(
++    suggestedMaxPriorityFeePerGas,
++    suggestedMaxFeePerGas,
++    estimates
++  );
++  return {
++    gasFeeEstimates: estimates,
++    estimatedGasFeeTimeBounds,
++    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET
++  };
++}
++async function getEstimatesUsingLegacyEndpoint(request) {
++  const {
++    fetchLegacyGasPriceEstimates: fetchLegacyGasPriceEstimates2,
++    fetchLegacyGasPriceEstimatesUrl,
++    clientId
++  } = request;
++  const estimates = await fetchLegacyGasPriceEstimates2(
++    fetchLegacyGasPriceEstimatesUrl,
++    clientId
++  );
++  return {
++    gasFeeEstimates: estimates,
++    estimatedGasFeeTimeBounds: {},
++    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY
++  };
++}
++async function getEstimatesUsingProvider(request) {
++  const { ethQuery, fetchEthGasPriceEstimate: fetchEthGasPriceEstimate2 } = request;
++  const estimates = await fetchEthGasPriceEstimate2(ethQuery);
++  return {
++    gasFeeEstimates: estimates,
++    estimatedGasFeeTimeBounds: {},
++    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE
++  };
++}
++
++
++
++
++
++
++
++exports.determineGasFeeCalculations = determineGasFeeCalculations; exports.LEGACY_GAS_PRICES_API_URL = LEGACY_GAS_PRICES_API_URL; exports.GAS_ESTIMATE_TYPES = GAS_ESTIMATE_TYPES; exports.GasFeeController = GasFeeController; exports.GasFeeController_default = GasFeeController_default;
++//# sourceMappingURL=chunk-X74LQX2Y.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-X74LQX2Y.js.map b/dist/chunk-X74LQX2Y.js.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..c330267c1f74907a70d669611fb5d8eff71305aa
+--- /dev/null
++++ b/dist/chunk-X74LQX2Y.js.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/GasFeeController.ts","../src/determineGasFeeCalculations.ts"],"names":["fetchGasEstimates","calculateTimeEstimate","fetchLegacyGasPriceEstimates","fetchEthGasPriceEstimate"],"mappings":"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","sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport {\n  convertHexToDecimal,\n  safelyExecute,\n  toHex,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport type {\n  NetworkClientId,\n  NetworkControllerGetEIP1559CompatibilityAction,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerNetworkDidChangeEvent,\n  NetworkState,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { Hex } from '@metamask/utils';\nimport { v1 as random } from 'uuid';\n\nimport determineGasFeeCalculations from './determineGasFeeCalculations';\nimport {\n  fetchGasEstimates,\n  fetchLegacyGasPriceEstimates,\n  fetchEthGasPriceEstimate,\n  calculateTimeEstimate,\n} from './gas-util';\n\nexport const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;\n\nexport type unknownString = 'unknown';\n\n// Fee Market describes the way gas is set after the london hardfork, and was\n// defined by EIP-1559.\nexport type FeeMarketEstimateType = 'fee-market';\n// Legacy describes gasPrice estimates from before london hardfork, when the\n// user is connected to mainnet and are presented with fast/average/slow\n// estimate levels to choose from.\nexport type LegacyEstimateType = 'legacy';\n// EthGasPrice describes a gasPrice estimate received from eth_gasPrice. Post\n// london this value should only be used for legacy type transactions when on\n// networks that support EIP-1559. This type of estimate is the most accurate\n// to display on custom networks that don't support EIP-1559.\nexport type EthGasPriceEstimateType = 'eth_gasPrice';\n// NoEstimate describes the state of the controller before receiving its first\n// estimate.\nexport type NoEstimateType = 'none';\n\n/**\n * Indicates which type of gasEstimate the controller is currently returning.\n * This is useful as a way of asserting that the shape of gasEstimates matches\n * expectations. NONE is a special case indicating that no previous gasEstimate\n * has been fetched.\n */\nexport const GAS_ESTIMATE_TYPES = {\n  FEE_MARKET: 'fee-market' as FeeMarketEstimateType,\n  LEGACY: 'legacy' as LegacyEstimateType,\n  ETH_GASPRICE: 'eth_gasPrice' as EthGasPriceEstimateType,\n  NONE: 'none' as NoEstimateType,\n};\n\nexport type GasEstimateType =\n  | FeeMarketEstimateType\n  | EthGasPriceEstimateType\n  | LegacyEstimateType\n  | NoEstimateType;\n\nexport type EstimatedGasFeeTimeBounds = {\n  lowerTimeBound: number | null;\n  upperTimeBound: number | unknownString;\n};\n\n/**\n * @type EthGasPriceEstimate\n *\n * A single gas price estimate for networks and accounts that don't support EIP-1559\n * This estimate comes from eth_gasPrice but is converted to dec gwei to match other\n * return values\n * @property gasPrice - A GWEI dec string\n */\n\nexport type EthGasPriceEstimate = {\n  gasPrice: string;\n};\n\n/**\n * @type LegacyGasPriceEstimate\n *\n * A set of gas price estimates for networks and accounts that don't support EIP-1559\n * These estimates include low, medium and high all as strings representing gwei in\n * decimal format.\n * @property high - gasPrice, in decimal gwei string format, suggested for fast inclusion\n * @property medium - gasPrice, in decimal gwei string format, suggested for avg inclusion\n * @property low - gasPrice, in decimal gwei string format, suggested for slow inclusion\n */\nexport type LegacyGasPriceEstimate = {\n  high: string;\n  medium: string;\n  low: string;\n};\n\n/**\n * @type Eip1559GasFee\n *\n * Data necessary to provide an estimate of a gas fee with a specific tip\n * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds\n * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds\n * @property suggestedMaxPriorityFeePerGas - A suggested \"tip\", a GWEI hex number\n * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number\n */\nexport type Eip1559GasFee = {\n  minWaitTimeEstimate: number; // a time duration in milliseconds\n  maxWaitTimeEstimate: number; // a time duration in milliseconds\n  suggestedMaxPriorityFeePerGas: string; // a GWEI decimal number\n  suggestedMaxFeePerGas: string; // a GWEI decimal number\n};\n\n/**\n * @type GasFeeEstimates\n *\n * Data necessary to provide multiple GasFee estimates, and supporting information, to the user\n * @property low - A GasFee for a minimum necessary combination of tip and maxFee\n * @property medium - A GasFee for a recommended combination of tip and maxFee\n * @property high - A GasFee for a high combination of tip and maxFee\n * @property estimatedBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI dec number\n * @property networkCongestion - A normalized number that can be used to gauge the congestion\n * level of the network, with 0 meaning not congested and 1 meaning extremely congested\n */\nexport type GasFeeEstimates = SourcedGasFeeEstimates | FallbackGasFeeEstimates;\n\ntype SourcedGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: [string, string];\n  baseFeeTrend: 'up' | 'down' | 'level';\n  latestPriorityFeeRange: [string, string];\n  historicalPriorityFeeRange: [string, string];\n  priorityFeeTrend: 'up' | 'down' | 'level';\n  networkCongestion: number;\n};\n\ntype FallbackGasFeeEstimates = {\n  low: Eip1559GasFee;\n  medium: Eip1559GasFee;\n  high: Eip1559GasFee;\n  estimatedBaseFee: string;\n  historicalBaseFeeRange: null;\n  baseFeeTrend: null;\n  latestPriorityFeeRange: null;\n  historicalPriorityFeeRange: null;\n  priorityFeeTrend: null;\n  networkCongestion: null;\n};\n\nconst metadata = {\n  gasFeeEstimatesByChainId: {\n    persist: true,\n    anonymous: false,\n  },\n  gasFeeEstimates: { persist: true, anonymous: false },\n  estimatedGasFeeTimeBounds: { persist: true, anonymous: false },\n  gasEstimateType: { persist: true, anonymous: false },\n  nonRPCGasFeeApisDisabled: { persist: true, anonymous: false },\n};\n\nexport type GasFeeStateEthGasPrice = {\n  gasFeeEstimates: EthGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: EthGasPriceEstimateType;\n};\n\nexport type GasFeeStateFeeMarket = {\n  gasFeeEstimates: GasFeeEstimates;\n  estimatedGasFeeTimeBounds: EstimatedGasFeeTimeBounds | Record<string, never>;\n  gasEstimateType: FeeMarketEstimateType;\n};\n\nexport type GasFeeStateLegacy = {\n  gasFeeEstimates: LegacyGasPriceEstimate;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: LegacyEstimateType;\n};\n\nexport type GasFeeStateNoEstimates = {\n  gasFeeEstimates: Record<string, never>;\n  estimatedGasFeeTimeBounds: Record<string, never>;\n  gasEstimateType: NoEstimateType;\n};\n\nexport type FetchGasFeeEstimateOptions = {\n  shouldUpdateState?: boolean;\n  networkClientId?: NetworkClientId;\n};\n\n/**\n * @type GasFeeState\n *\n * Gas Fee controller state\n * @property gasFeeEstimates - Gas fee estimate data based on new EIP-1559 properties\n * @property estimatedGasFeeTimeBounds - Estimates representing the minimum and maximum\n */\nexport type SingleChainGasFeeState =\n  | GasFeeStateEthGasPrice\n  | GasFeeStateFeeMarket\n  | GasFeeStateLegacy\n  | GasFeeStateNoEstimates;\n\nexport type GasFeeEstimatesByChainId = {\n  gasFeeEstimatesByChainId?: Record<string, SingleChainGasFeeState>;\n};\n\nexport type GasFeeState = GasFeeEstimatesByChainId &\n  SingleChainGasFeeState & {\n    nonRPCGasFeeApisDisabled?: boolean;\n  };\n\nconst name = 'GasFeeController';\n\nexport type GasFeeStateChange = ControllerStateChangeEvent<\n  typeof name,\n  GasFeeState\n>;\n\nexport type GetGasFeeState = ControllerGetStateAction<typeof name, GasFeeState>;\n\nexport type GasFeeControllerActions = GetGasFeeState;\n\nexport type GasFeeControllerEvents = GasFeeStateChange;\n\ntype AllowedActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetEIP1559CompatibilityAction;\n\ntype GasFeeMessenger = RestrictedControllerMessenger<\n  typeof name,\n  GasFeeControllerActions | AllowedActions,\n  GasFeeControllerEvents | NetworkControllerNetworkDidChangeEvent,\n  AllowedActions['type'],\n  NetworkControllerNetworkDidChangeEvent['type']\n>;\n\nconst defaultState: GasFeeState = {\n  gasFeeEstimatesByChainId: {},\n  gasFeeEstimates: {},\n  estimatedGasFeeTimeBounds: {},\n  gasEstimateType: GAS_ESTIMATE_TYPES.NONE,\n  nonRPCGasFeeApisDisabled: false,\n};\n\n/**\n * Controller that retrieves gas fee estimate data and polls for updated data on a set interval\n */\nexport class GasFeeController extends StaticIntervalPollingController<\n  typeof name,\n  GasFeeState,\n  GasFeeMessenger\n> {\n  private intervalId?: ReturnType<typeof setTimeout>;\n\n  private readonly intervalDelay;\n\n  private readonly pollTokens: Set<string>;\n\n  private readonly legacyAPIEndpoint: string;\n\n  private readonly EIP1559APIEndpoint: string;\n\n  private readonly getCurrentNetworkEIP1559Compatibility;\n\n  private readonly getCurrentNetworkLegacyGasAPICompatibility;\n\n  private readonly getCurrentAccountEIP1559Compatibility;\n\n  private currentChainId;\n\n  private ethQuery?: EthQuery;\n\n  private readonly clientId?: string;\n\n  #getProvider: () => ProviderProxy;\n\n  /**\n   * Creates a GasFeeController instance.\n   *\n   * @param options - The controller options.\n   * @param options.interval - The time in milliseconds to wait between polls.\n   * @param options.messenger - The controller messenger.\n   * @param options.state - The initial state.\n   * @param options.getCurrentNetworkEIP1559Compatibility - Determines whether or not the current\n   * network is EIP-1559 compatible.\n   * @param options.getCurrentNetworkLegacyGasAPICompatibility - Determines whether or not the\n   * current network is compatible with the legacy gas price API.\n   * @param options.getCurrentAccountEIP1559Compatibility - Determines whether or not the current\n   * account is EIP-1559 compatible.\n   * @param options.getChainId - Returns the current chain ID.\n   * @param options.getProvider - Returns a network provider for the current network.\n   * @param options.onNetworkDidChange - A function for registering an event handler for the\n   * network state change event.\n   * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for\n   * testing purposes.\n   * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.\n   * @param options.clientId - The client ID used to identify to the gas estimation API who is\n   * asking for estimates.\n   */\n  constructor({\n    interval = 15000,\n    messenger,\n    state,\n    getCurrentNetworkEIP1559Compatibility,\n    getCurrentAccountEIP1559Compatibility,\n    getChainId,\n    getCurrentNetworkLegacyGasAPICompatibility,\n    getProvider,\n    onNetworkDidChange,\n    legacyAPIEndpoint = LEGACY_GAS_PRICES_API_URL,\n    EIP1559APIEndpoint,\n    clientId,\n  }: {\n    interval?: number;\n    messenger: GasFeeMessenger;\n    state?: GasFeeState;\n    getCurrentNetworkEIP1559Compatibility: () => Promise<boolean>;\n    getCurrentNetworkLegacyGasAPICompatibility: () => boolean;\n    getCurrentAccountEIP1559Compatibility?: () => boolean;\n    getChainId?: () => Hex;\n    getProvider: () => ProviderProxy;\n    onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;\n    legacyAPIEndpoint?: string;\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    EIP1559APIEndpoint: string;\n    clientId?: string;\n  }) {\n    super({\n      name,\n      metadata,\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    this.intervalDelay = interval;\n    this.setIntervalLength(interval);\n    this.pollTokens = new Set();\n    this.getCurrentNetworkEIP1559Compatibility =\n      getCurrentNetworkEIP1559Compatibility;\n    this.getCurrentNetworkLegacyGasAPICompatibility =\n      getCurrentNetworkLegacyGasAPICompatibility;\n    this.getCurrentAccountEIP1559Compatibility =\n      getCurrentAccountEIP1559Compatibility;\n    this.#getProvider = getProvider;\n    this.EIP1559APIEndpoint = EIP1559APIEndpoint;\n    this.legacyAPIEndpoint = legacyAPIEndpoint;\n    this.clientId = clientId;\n\n    this.ethQuery = new EthQuery(this.#getProvider());\n\n    if (onNetworkDidChange && getChainId) {\n      this.currentChainId = getChainId();\n      onNetworkDidChange(async (networkControllerState) => {\n        await this.#onNetworkControllerDidChange(networkControllerState);\n      });\n    } else {\n      this.currentChainId = this.messagingSystem.call(\n        'NetworkController:getState',\n      ).providerConfig.chainId;\n      this.messagingSystem.subscribe(\n        'NetworkController:networkDidChange',\n        async (networkControllerState) => {\n          await this.#onNetworkControllerDidChange(networkControllerState);\n        },\n      );\n    }\n  }\n\n  async resetPolling() {\n    if (this.pollTokens.size !== 0) {\n      const tokens = Array.from(this.pollTokens);\n      this.stopPolling();\n      await this.getGasFeeEstimatesAndStartPolling(tokens[0]);\n      tokens.slice(1).forEach((token) => {\n        this.pollTokens.add(token);\n      });\n    }\n  }\n\n  async fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions) {\n    return await this._fetchGasFeeEstimateData(options);\n  }\n\n  async getGasFeeEstimatesAndStartPolling(\n    pollToken: string | undefined,\n  ): Promise<string> {\n    const _pollToken = pollToken || random();\n\n    this.pollTokens.add(_pollToken);\n\n    if (this.pollTokens.size === 1) {\n      await this._fetchGasFeeEstimateData();\n      this._poll();\n    }\n\n    return _pollToken;\n  }\n\n  /**\n   * Gets and sets gasFeeEstimates in state.\n   *\n   * @param options - The gas fee estimate options.\n   * @param options.shouldUpdateState - Determines whether the state should be updated with the\n   * updated gas estimates.\n   * @returns The gas fee estimates.\n   */\n  async _fetchGasFeeEstimateData(\n    options: FetchGasFeeEstimateOptions = {},\n  ): Promise<GasFeeState> {\n    const { shouldUpdateState = true, networkClientId } = options;\n\n    let ethQuery,\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      decimalChainId: number;\n\n    if (networkClientId !== undefined) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getNetworkClientById',\n        networkClientId,\n      );\n      isLegacyGasAPICompatible = networkClient.configuration.chainId === '0x38';\n\n      decimalChainId = convertHexToDecimal(networkClient.configuration.chainId);\n\n      try {\n        const result = await this.messagingSystem.call(\n          'NetworkController:getEIP1559Compatibility',\n          networkClientId,\n        );\n        isEIP1559Compatible = result || false;\n      } catch {\n        isEIP1559Compatible = false;\n      }\n      ethQuery = new EthQuery(networkClient.provider);\n    }\n\n    ethQuery ??= this.ethQuery;\n\n    isLegacyGasAPICompatible ??=\n      this.getCurrentNetworkLegacyGasAPICompatibility();\n\n    decimalChainId ??= convertHexToDecimal(this.currentChainId);\n\n    try {\n      isEIP1559Compatible ??= await this.getEIP1559Compatibility();\n    } catch (e) {\n      console.error(e);\n      isEIP1559Compatible ??= false;\n    }\n\n    const gasFeeCalculations = await determineGasFeeCalculations({\n      isEIP1559Compatible,\n      isLegacyGasAPICompatible,\n      fetchGasEstimates,\n      fetchGasEstimatesUrl: this.EIP1559APIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchLegacyGasPriceEstimates,\n      fetchLegacyGasPriceEstimatesUrl: this.legacyAPIEndpoint.replace(\n        '<chain_id>',\n        `${decimalChainId}`,\n      ),\n      fetchEthGasPriceEstimate,\n      calculateTimeEstimate,\n      clientId: this.clientId,\n      ethQuery,\n      nonRPCGasFeeApisDisabled: this.state.nonRPCGasFeeApisDisabled,\n    });\n\n    if (shouldUpdateState) {\n      const chainId = toHex(decimalChainId);\n      this.update((state) => {\n        if (this.currentChainId === chainId) {\n          state.gasFeeEstimates = gasFeeCalculations.gasFeeEstimates;\n          state.estimatedGasFeeTimeBounds =\n            gasFeeCalculations.estimatedGasFeeTimeBounds;\n          state.gasEstimateType = gasFeeCalculations.gasEstimateType;\n        }\n        state.gasFeeEstimatesByChainId ??= {};\n        state.gasFeeEstimatesByChainId[chainId] = {\n          gasFeeEstimates: gasFeeCalculations.gasFeeEstimates,\n          estimatedGasFeeTimeBounds:\n            gasFeeCalculations.estimatedGasFeeTimeBounds,\n          gasEstimateType: gasFeeCalculations.gasEstimateType,\n        } as SingleChainGasFeeState;\n      });\n    }\n\n    return gasFeeCalculations;\n  }\n\n  /**\n   * Remove the poll token, and stop polling if the set of poll tokens is empty.\n   *\n   * @param pollToken - The poll token to disconnect.\n   */\n  disconnectPoller(pollToken: string) {\n    this.pollTokens.delete(pollToken);\n    if (this.pollTokens.size === 0) {\n      this.stopPolling();\n    }\n  }\n\n  stopPolling() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n    this.pollTokens.clear();\n    this.resetState();\n  }\n\n  /**\n   * Prepare to discard this controller.\n   *\n   * This stops any active polling.\n   */\n  override destroy() {\n    super.destroy();\n    this.stopPolling();\n  }\n\n  private _poll() {\n    if (this.intervalId) {\n      clearInterval(this.intervalId);\n    }\n\n    this.intervalId = setInterval(async () => {\n      await safelyExecute(() => this._fetchGasFeeEstimateData());\n    }, this.intervalDelay);\n  }\n\n  /**\n   * Fetching token list from the Token Service API.\n   *\n   * @private\n   * @param networkClientId - The ID of the network client triggering the fetch.\n   * @returns A promise that resolves when this operation completes.\n   */\n  async _executePoll(networkClientId: string): Promise<void> {\n    await this._fetchGasFeeEstimateData({ networkClientId });\n  }\n\n  private resetState() {\n    this.update(() => {\n      return defaultState;\n    });\n  }\n\n  private async getEIP1559Compatibility() {\n    const currentNetworkIsEIP1559Compatible =\n      await this.getCurrentNetworkEIP1559Compatibility();\n    const currentAccountIsEIP1559Compatible =\n      this.getCurrentAccountEIP1559Compatibility?.() ?? true;\n\n    return (\n      currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible\n    );\n  }\n\n  getTimeEstimate(\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n  ): EstimatedGasFeeTimeBounds | Record<string, never> {\n    if (\n      !this.state.gasFeeEstimates ||\n      this.state.gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET\n    ) {\n      return {};\n    }\n    return calculateTimeEstimate(\n      maxPriorityFeePerGas,\n      maxFeePerGas,\n      this.state.gasFeeEstimates,\n    );\n  }\n\n  async #onNetworkControllerDidChange(networkControllerState: NetworkState) {\n    const newChainId = networkControllerState.providerConfig.chainId;\n\n    if (newChainId !== this.currentChainId) {\n      this.ethQuery = new EthQuery(this.#getProvider());\n      await this.resetPolling();\n\n      this.currentChainId = newChainId;\n    }\n  }\n\n  enableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = false;\n    });\n  }\n\n  disableNonRPCGasFeeApis() {\n    this.update((state) => {\n      state.nonRPCGasFeeApisDisabled = true;\n    });\n  }\n}\n\nexport default GasFeeController;\n","import type {\n  EstimatedGasFeeTimeBounds,\n  EthGasPriceEstimate,\n  GasFeeEstimates,\n  GasFeeState as GasFeeCalculations,\n  LegacyGasPriceEstimate,\n} from './GasFeeController';\nimport { GAS_ESTIMATE_TYPES } from './GasFeeController';\n\ntype DetermineGasFeeCalculationsRequest = {\n  isEIP1559Compatible: boolean;\n  isLegacyGasAPICompatible: boolean;\n  fetchGasEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<GasFeeEstimates>;\n  fetchGasEstimatesUrl: string;\n  fetchLegacyGasPriceEstimates: (\n    url: string,\n    clientId?: string,\n  ) => Promise<LegacyGasPriceEstimate>;\n  fetchLegacyGasPriceEstimatesUrl: string;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;\n  calculateTimeEstimate: (\n    maxPriorityFeePerGas: string,\n    maxFeePerGas: string,\n    gasFeeEstimates: GasFeeEstimates,\n  ) => EstimatedGasFeeTimeBounds;\n  clientId: string | undefined;\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ethQuery: any;\n  nonRPCGasFeeApisDisabled?: boolean;\n};\n\n/**\n * Obtains a set of max base and priority fee estimates along with time estimates so that we\n * can present them to users when they are sending transactions or making swaps.\n *\n * @param args - The arguments.\n * @param args.isEIP1559Compatible - Governs whether or not we can use an EIP-1559-only method to\n * produce estimates.\n * @param args.isLegacyGasAPICompatible - Governs whether or not we can use a non-EIP-1559 method to\n * produce estimates (for instance, testnets do not support estimates altogether).\n * @param args.fetchGasEstimates - A function that fetches gas estimates using an EIP-1559-specific\n * API.\n * @param args.fetchGasEstimatesUrl - The URL for the API we can use to obtain EIP-1559-specific\n * estimates.\n * @param args.fetchLegacyGasPriceEstimates - A function that fetches gas estimates using an\n * non-EIP-1559-specific API.\n * @param args.fetchLegacyGasPriceEstimatesUrl - The URL for the API we can use to obtain\n * non-EIP-1559-specific estimates.\n * @param args.fetchEthGasPriceEstimate - A function that fetches gas estimates using\n * `eth_gasPrice`.\n * @param args.calculateTimeEstimate - A function that determine time estimate bounds.\n * @param args.clientId - An identifier that an API can use to know who is asking for estimates.\n * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.\n * @param args.nonRPCGasFeeApisDisabled - Whether to disable requests to the legacyAPIEndpoint and the EIP1559APIEndpoint\n * @returns The gas fee calculations.\n */\nexport default async function determineGasFeeCalculations(\n  args: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  try {\n    return await getEstimatesUsingFallbacks(args);\n  } catch (error) {\n    if (error instanceof Error) {\n      throw new Error(\n        `Gas fee/price estimation failed. Message: ${error.message}`,\n      );\n    }\n\n    throw error;\n  }\n}\n\n/**\n * Retrieve the gas fee estimates using a series of fallback mechanisms.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFallbacks(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    isEIP1559Compatible,\n    isLegacyGasAPICompatible,\n    nonRPCGasFeeApisDisabled,\n  } = request;\n\n  try {\n    if (isEIP1559Compatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingFeeMarketEndpoint(request);\n    }\n\n    if (isLegacyGasAPICompatible && !nonRPCGasFeeApisDisabled) {\n      return await getEstimatesUsingLegacyEndpoint(request);\n    }\n\n    throw new Error('Main gas fee/price estimation failed. Use fallback');\n  } catch {\n    return await getEstimatesUsingProvider(request);\n  }\n}\n\n/**\n * Retrieve gas fee estimates using the EIP-1559 endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingFeeMarketEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchGasEstimates,\n    fetchGasEstimatesUrl,\n    clientId,\n    calculateTimeEstimate,\n  } = request;\n\n  const estimates = await fetchGasEstimates(fetchGasEstimatesUrl, clientId);\n\n  const { suggestedMaxPriorityFeePerGas, suggestedMaxFeePerGas } =\n    estimates.medium;\n\n  const estimatedGasFeeTimeBounds = calculateTimeEstimate(\n    suggestedMaxPriorityFeePerGas,\n    suggestedMaxFeePerGas,\n    estimates,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds,\n    gasEstimateType: GAS_ESTIMATE_TYPES.FEE_MARKET,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using the legacy endpoint of the gas API.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingLegacyEndpoint(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const {\n    fetchLegacyGasPriceEstimates,\n    fetchLegacyGasPriceEstimatesUrl,\n    clientId,\n  } = request;\n\n  const estimates = await fetchLegacyGasPriceEstimates(\n    fetchLegacyGasPriceEstimatesUrl,\n    clientId,\n  );\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.LEGACY,\n  };\n}\n\n/**\n * Retrieve gas fee estimates using an `eth_gasPrice` call to the RPC provider.\n * @param request - The request object.\n * @returns The gas fee estimates.\n */\nasync function getEstimatesUsingProvider(\n  request: DetermineGasFeeCalculationsRequest,\n): Promise<GasFeeCalculations> {\n  const { ethQuery, fetchEthGasPriceEstimate } = request;\n\n  const estimates = await fetchEthGasPriceEstimate(ethQuery);\n\n  return {\n    gasFeeEstimates: estimates,\n    estimatedGasFeeTimeBounds: {},\n    gasEstimateType: GAS_ESTIMATE_TYPES.ETH_GASPRICE,\n  };\n}\n"]}
+\ No newline at end of file
+diff --git a/dist/determineGasFeeCalculations.js b/dist/determineGasFeeCalculations.js
+index 87f583d091e574fc81b84ce35ee4b9979dbabdf6..ccfd460054f0affdec3857d8ec0015fe5c0814cb 100644
+--- a/dist/determineGasFeeCalculations.js
++++ b/dist/determineGasFeeCalculations.js
+@@ -1,8 +1,8 @@
+ "use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+-var _chunkH5WHAYLIjs = require('./chunk-H5WHAYLI.js');
+-require('./chunk-Q2YPK5SL.js');
++var _chunkX74LQX2Yjs = require('./chunk-X74LQX2Y.js');
++require('./chunk-2MFVV2BX.js');
+
+
+-exports.default = _chunkH5WHAYLIjs.determineGasFeeCalculations;
++exports.default = _chunkX74LQX2Yjs.determineGasFeeCalculations;
+ //# sourceMappingURL=determineGasFeeCalculations.js.map
+\ No newline at end of file
+diff --git a/dist/determineGasFeeCalculations.mjs b/dist/determineGasFeeCalculations.mjs
+index b372041262f1d8372632922919f52aa2c6c5ee89..e5b349a8f349076b85481dceec5795b07aeb19ca 100644
+--- a/dist/determineGasFeeCalculations.mjs
++++ b/dist/determineGasFeeCalculations.mjs
+@@ -1,7 +1,7 @@
+ import {
+   determineGasFeeCalculations
+-} from "./chunk-BEVZS3YV.mjs";
+-import "./chunk-KORLXV32.mjs";
++} from "./chunk-A7NHJBXX.mjs";
++import "./chunk-R3IOI7AK.mjs";
+ export {
+   determineGasFeeCalculations as default
+ };
+diff --git a/dist/gas-util.js b/dist/gas-util.js
+index 74c93749878df29b40eea3d998d26d734112d75c..aad155e1a969ac01a09f8e18becac39a79860199 100644
+--- a/dist/gas-util.js
++++ b/dist/gas-util.js
+@@ -4,12 +4,12 @@
+
+
+
+-var _chunkQ2YPK5SLjs = require('./chunk-Q2YPK5SL.js');
++var _chunk2MFVV2BXjs = require('./chunk-2MFVV2BX.js');
+
+
+
+
+
+
+-exports.calculateTimeEstimate = _chunkQ2YPK5SLjs.calculateTimeEstimate; exports.fetchEthGasPriceEstimate = _chunkQ2YPK5SLjs.fetchEthGasPriceEstimate; exports.fetchGasEstimates = _chunkQ2YPK5SLjs.fetchGasEstimates; exports.fetchLegacyGasPriceEstimates = _chunkQ2YPK5SLjs.fetchLegacyGasPriceEstimates; exports.normalizeGWEIDecimalNumbers = _chunkQ2YPK5SLjs.normalizeGWEIDecimalNumbers;
++exports.calculateTimeEstimate = _chunk2MFVV2BXjs.calculateTimeEstimate; exports.fetchEthGasPriceEstimate = _chunk2MFVV2BXjs.fetchEthGasPriceEstimate; exports.fetchGasEstimates = _chunk2MFVV2BXjs.fetchGasEstimates; exports.fetchLegacyGasPriceEstimates = _chunk2MFVV2BXjs.fetchLegacyGasPriceEstimates; exports.normalizeGWEIDecimalNumbers = _chunk2MFVV2BXjs.normalizeGWEIDecimalNumbers;
+ //# sourceMappingURL=gas-util.js.map
+\ No newline at end of file
+diff --git a/dist/gas-util.mjs b/dist/gas-util.mjs
+index c0846d32a7fe2598691c5c0bcc19ce2b8af67bc3..60f38a1b3899f0223fa7651988e57fa659e713e8 100644
+--- a/dist/gas-util.mjs
++++ b/dist/gas-util.mjs
+@@ -4,7 +4,7 @@ import {
+   fetchGasEstimates,
+   fetchLegacyGasPriceEstimates,
+   normalizeGWEIDecimalNumbers
+-} from "./chunk-KORLXV32.mjs";
++} from "./chunk-R3IOI7AK.mjs";
+ export {
+   calculateTimeEstimate,
+   fetchEthGasPriceEstimate,
+diff --git a/dist/index.js b/dist/index.js
+index 499a7d57b68212db4402be72ab8d3384a841dba0..f172d463bef0093dd477dfad74ff50d30e42a7f0 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -2,11 +2,11 @@
+
+
+
+-var _chunkH5WHAYLIjs = require('./chunk-H5WHAYLI.js');
+-require('./chunk-Q2YPK5SL.js');
++var _chunkX74LQX2Yjs = require('./chunk-X74LQX2Y.js');
++require('./chunk-2MFVV2BX.js');
+
+
+
+
+-exports.GAS_API_BASE_URL = _chunkH5WHAYLIjs.GAS_API_BASE_URL; exports.GAS_ESTIMATE_TYPES = _chunkH5WHAYLIjs.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkH5WHAYLIjs.GasFeeController;
++exports.GAS_ESTIMATE_TYPES = _chunkX74LQX2Yjs.GAS_ESTIMATE_TYPES; exports.GasFeeController = _chunkX74LQX2Yjs.GasFeeController; exports.LEGACY_GAS_PRICES_API_URL = _chunkX74LQX2Yjs.LEGACY_GAS_PRICES_API_URL;
+ //# sourceMappingURL=index.js.map
+\ No newline at end of file
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 47fbe488932996ec192dd04a6b92d72c038681cc..71847186d44947ec3b2d75d142afbeede0aa64fc 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -1,12 +1,12 @@
+ import {
+-  GAS_API_BASE_URL,
+   GAS_ESTIMATE_TYPES,
+-  GasFeeController
+-} from "./chunk-BEVZS3YV.mjs";
+-import "./chunk-KORLXV32.mjs";
++  GasFeeController,
++  LEGACY_GAS_PRICES_API_URL
++} from "./chunk-A7NHJBXX.mjs";
++import "./chunk-R3IOI7AK.mjs";
+ export {
+-  GAS_API_BASE_URL,
+   GAS_ESTIMATE_TYPES,
+-  GasFeeController
++  GasFeeController,
++  LEGACY_GAS_PRICES_API_URL
+ };
+ //# sourceMappingURL=index.mjs.map
+\ No newline at end of file
+diff --git a/dist/tsconfig.build.tsbuildinfo b/dist/tsconfig.build.tsbuildinfo
+index c226cf271a32a00bf6054fba381ed5f846ed9752..008d925dcefc659662cbfa15bd507ce773b8fc56 100644
+--- a/dist/tsconfig.build.tsbuildinfo
++++ b/dist/tsconfig.build.tsbuildinfo
+@@ -1 +1 @@
+-{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createProvider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/BaseControllerV1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/assert.d.ts","../../../node_modules/@types/node/assert/strict.d.ts","../../../node_modules/@types/node/globals.d.ts","../../../node_modules/@types/node/async_hooks.d.ts","../../../node_modules/@types/node/buffer.d.ts","../../../node_modules/@types/node/child_process.d.ts","../../../node_modules/@types/node/cluster.d.ts","../../../node_modules/@types/node/console.d.ts","../../../node_modules/@types/node/constants.d.ts","../../../node_modules/@types/node/crypto.d.ts","../../../node_modules/@types/node/dgram.d.ts","../../../node_modules/@types/node/diagnostics_channel.d.ts","../../../node_modules/@types/node/dns.d.ts","../../../node_modules/@types/node/dns/promises.d.ts","../../../node_modules/@types/node/dom-events.d.ts","../../../node_modules/@types/node/domain.d.ts","../../../node_modules/@types/node/events.d.ts","../../../node_modules/@types/node/fs.d.ts","../../../node_modules/@types/node/fs/promises.d.ts","../../../node_modules/@types/node/http.d.ts","../../../node_modules/@types/node/http2.d.ts","../../../node_modules/@types/node/https.d.ts","../../../node_modules/@types/node/inspector.d.ts","../../../node_modules/@types/node/module.d.ts","../../../node_modules/@types/node/net.d.ts","../../../node_modules/@types/node/os.d.ts","../../../node_modules/@types/node/path.d.ts","../../../node_modules/@types/node/perf_hooks.d.ts","../../../node_modules/@types/node/process.d.ts","../../../node_modules/@types/node/punycode.d.ts","../../../node_modules/@types/node/querystring.d.ts","../../../node_modules/@types/node/readline.d.ts","../../../node_modules/@types/node/repl.d.ts","../../../node_modules/@types/node/stream.d.ts","../../../node_modules/@types/node/stream/promises.d.ts","../../../node_modules/@types/node/stream/consumers.d.ts","../../../node_modules/@types/node/stream/web.d.ts","../../../node_modules/@types/node/string_decoder.d.ts","../../../node_modules/@types/node/test.d.ts","../../../node_modules/@types/node/timers.d.ts","../../../node_modules/@types/node/timers/promises.d.ts","../../../node_modules/@types/node/tls.d.ts","../../../node_modules/@types/node/trace_events.d.ts","../../../node_modules/@types/node/tty.d.ts","../../../node_modules/@types/node/url.d.ts","../../../node_modules/@types/node/util.d.ts","../../../node_modules/@types/node/v8.d.ts","../../../node_modules/@types/node/vm.d.ts","../../../node_modules/@types/node/wasi.d.ts","../../../node_modules/@types/node/worker_threads.d.ts","../../../node_modules/@types/node/zlib.d.ts","../../../node_modules/@types/node/globals.global.d.ts","../../../node_modules/@types/node/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asyncEventEmitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacyTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/baseTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionFactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerClass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/RestrictedControllerMessenger.d.ts","../../base-controller/dist/types/ControllerMessenger.d.ts","../../base-controller/dist/types/BaseControllerV2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/utils.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createEventEmitterProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createSwappableProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../network-controller/dist/types/constants.d.ts","../../../node_modules/@metamask/safe-event-emitter/dist/cjs/index.d.ts","../../json-rpc-engine/dist/types/JsonRpcEngine.d.ts","../../json-rpc-engine/dist/types/createAsyncMiddleware.d.ts","../../json-rpc-engine/dist/types/createScaffoldMiddleware.d.ts","../../json-rpc-engine/dist/types/getUniqueId.d.ts","../../json-rpc-engine/dist/types/idRemapMiddleware.d.ts","../../json-rpc-engine/dist/types/mergeMiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/eth-block-tracker/dist/BlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/PollingBlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/SubscribeBlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/index.d.ts","../../network-controller/dist/types/types.d.ts","../../network-controller/dist/types/create-auto-managed-network-client.d.ts","../../network-controller/dist/types/NetworkController.d.ts","../../network-controller/dist/types/create-network-client.d.ts","../../network-controller/dist/types/index.d.ts","../../polling-controller/dist/types/types.d.ts","../../polling-controller/dist/types/BlockTrackerPollingController.d.ts","../../polling-controller/dist/types/StaticIntervalPollingController.d.ts","../../polling-controller/dist/types/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../src/determineGasFeeCalculations.ts","../src/gas-util.ts","../src/GasFeeController.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupSemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/diffLines.d.ts","../../../node_modules/jest-diff/build/printDiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","75b22c74010ba649de1a1676a4c4b8b5bb4294fecd05089e2094429b16d7840c","5615ccf831db2ffc82145243081ebdb60ea8e1005ee8f975d1c0c1401a9c894e","38682ed3630bb6ecdace80d5a9adc811fc20a419f1940446e306c3a020d083b9","cc182e6e4f691cd6f7bf7cb491247a4c7818f9f1cb2db1d45c65ff906e3f741b","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","e0eda929c6b9b628cdeb0e54cd3582cb97e64f28aab34612fc1431c545899584","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","b3d48529ae61dc27d0bfbfa2cb3e0dff8189644bd155bdf5df1e8e14669f7043","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","5b3cd03ae354ea96eff1f74d7c410fe4852e6382227e8b0ecf87ab5e3a5bbcd4","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"056097110efd16869ec118cedb44ecbac9a019576eee808d61304ca6d5cb2cbe","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"6fb8358e10ed92a7f515b7d79da3904c955a3ffd4e14aa9df6f0ea113041f1cf","affectsGlobalScope":true},"45c831238c6dac21c72da5f335747736a56a3847192bf03c84b958a7e9ec93e2","661a11d16ad2e3543a77c53bcd4017ee9a450f47ab7def3ab493a86eae4d550c",{"version":"8cdc646cec7819581ef343b83855b1bfe4fe674f2c84f4fb8dc90d82fb56bd3a","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","9dd56225cc2d8cb8fe5ceb0043ff386987637e12fecc6078896058a99deae284","2375ed4b439215aa3b6d0c6fd175c78a4384b30cb43cbadaecbf0a18954c98cb","7693b90b3075deaccafd5efb467bf9f2b747a3075be888652ef73e64396d8628","41231da15bb5e3e806a8395bd15c7befd2ec90f9f4e3c9d0ae1356bccb76dbb0","fccfef201d057cb407fa515311bd608549bab6c7b8adcf8f2df31f5d3b796478",{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true},"5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"464762c6213566d072f1ced5e8e9a954785ec5e53883b7397198abb5ef5b8f71","affectsGlobalScope":true},"6387920dc3e18927335b086deec75bf8e50f879a5e273d32ee7bb7a55ba50572","9bba37424094688c4663c177a1379b229f919b8912889a472f32fdc5f08ddb4d","29a4be13b3a30d3e66667b75c58ec61fb2df8fa0422534fdee3cfb30c5dbf450","83366d901beda79d6eb37aaaf6ca248dcd88946302b2a7d975590783be51e88e","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","43ec77c369473e92e2ecebf0554a0fdaa9c256644a6070f28228dfcceec77351",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"95ed02bacb4502c985b69742ec82a4576d4ff4a6620ecc91593f611d502ae546","bf755525c4e6f85a970b98c4755d98e8aa1b6dbd83a5d8fcc57d3d497351b936","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"28084e15b63e6211769db2fe646d8bc5c4c6776321e0deffe2d12eefd52cb6b9","affectsGlobalScope":true},{"version":"aed37dabf86c99d6c8508700576ecede86688397bc12523541858705a0c737c2","affectsGlobalScope":true},"cc6ef5733d4ea6d2e06310a32dffd2c16418b467c5033d49cecc4f3a25de7497","94768454c3348b6ebe48e45fbad8c92e2bb7af4a35243edbe2b90823d0bd7f9a","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","84da3c28344e621fd1d591f2c09e9595292d2b70018da28a553268ac122597d4","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","6e191fea1db6e9e4fa828259cf489e820ec9170effff57fb081a2f3295db4722","aed943465fbce1efe49ee16b5ea409050f15cd8eaf116f6fadb64ef0772e7d95","70d08483a67bf7050dbedace398ef3fee9f436fcd60517c97c4c1e22e3c6f3e8","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"e933de8143e1d12dd51d89b398760fd5a9081896be366dad88a922d0b29f3c69","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b38d55d08708c2410a3039687db70b4a5bfa69fc4845617c313b5a10d9c5c637","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"a05e2d784c9be7051c4ac87a407c66d2106e23490c18c038bbd0712bde7602fd","affectsGlobalScope":true},{"version":"df90b9d0e9980762da8daf8adf6ffa0c853e76bfd269c377be0d07a9ad87acd2","affectsGlobalScope":true},"cf434b5c04792f62d6f4bdd5e2c8673f36e638e910333c172614d5def9b17f98","1d65d4798df9c2df008884035c41d3e67731f29db5ecb64cd7378797c7c53a2f","0faee6b555890a1cb106e2adc5d3ffd89545b1da894d474e9d436596d654998f","c6c01ea1c42508edf11a36d13b70f6e35774f74355ba5d358354d4a77cc67ea1","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"b0297b09e607bec9698cac7cf55463d6731406efb1161ee4d448293b47397c84","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","68cc8d6fcc2f270d7108f02f3ebc59480a54615be3e09a47e14527f349e9d53e","3eb11dbf3489064a47a2e1cf9d261b1f100ef0b3b50ffca6c44dd99d6dd81ac1","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","277983d414aa99d78655186c3ee1e1c38c302e336aff1d77b47fcdc39d8273fe","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","ca3353cc82b1981f0d25d71d7432d583a6ef882ccdea82d65fbe49af37be51cb","50679a8e27aacf72f8c40bcab15d7ef5e83494089b4726b83eec4554344d5cdc","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","5d697a4b315cc5bb3042ae869abffd10c3b0d7b182cda0e4c45d8819937e5796","563fa27fdaec8f195b84f71a7af0ef48d30d5cc830575db86da86a63a470c8e6","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","299567f84bfedd1468dca2755a829cb19e607a6811673788807dc8921e211bc9","795d9fb85aad92221504db74dd179b506bd189bba0c104426f7e7bb8a66ffee5","1311bc194e0a69fe61031e852c1c0b439e2a2a3d1d5e2d8ff795499b9f283459","4b7ce19369d7e7fae76720c2c6c7f671bf3fa0f7093edb864f1ac358ca7c456c","c972ef44deca1fa8fab465915ffa00f82e126aacf3dfc8979c03b1b066ce5bb6","30285a1011c6d6b52f3ba3abb0a984be8148c05cdefb8eb6eb562335a3991f35","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","3f450762fd7c34ed545e738abccb0af6a703572a10521643cf8fc88e3724c99c","fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","d6e6620a30d582182acc3f0a992a0c311adc589f111096aea11ab83fc09a5ccc","6213b8f686f56beab22b59a0f468590fd3a4c5fa931236a017efeca91d7c9584","c451cec9a588b1f105a5ea2c6063d4fca112b9d70105cacdadda0e1ef67e9379","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","03460a54d0e0481d1e11097f66ad43f054bc95efdafe5f81bbc7a82be181af75","4070c2f1c3434fcf84886e04d30d82cd650ee443e53b82b404b144175cf8741e","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","8129a34006218a6f3cdc81bbd438d5429eb18b08b4338a26977ac3b4df129d75","30d2170e1a718b5035611af55e3618b4ba8f42f0749bb52ee593da6082c4e2ce","98ef38666d88ec9699a722053e07ede65d3042f693fe7ff8c786e53dbb6fd43b","a3b8b6be7620897d1e481e8650c980a210a138fceb6e710eaf95fd9dd0dfe94a","12c89d0e32758c120a569045f21cf5b77244f86792611ced8de7f86b37e77781","14bd47270e654c8eb3b1489fa8c095912ee62a0a29bb92743393203722347c53","3d9297165e67fd59d9821cc93a9808213e33c56a8ac1c4273171f6afaaa2d4d5","e7af7d288b89287ad031b19583c597fcd9f5edc0b0d579b7b492f06cf57e058c","92cb686a9ca5eb5dd7d5d8d43a3707194c1e91ea07a027b3bcb60b6011b24632","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e",{"version":"f3e418819a6765dc6715ab2a51771c798543815d8499e29a857229bbf74ff419","signature":"b146c2211fb74ff8f672aa026d3992562e1c9c0d282cc712708b740c8f4cfb1a"},{"version":"d320adcc9e016b24e5873a7efb081d684a7990fbe23fe49c1c5354ba89bd129b","signature":"56c727d4c937865b6e7b114f58aa30f7678d5a9d924c0adb42368c403efb337d"},{"version":"fd1051fabcbc5740a5b3db8582c0bfee17883217121619fd765fbdd171f5d068","signature":"e4a433dbb39db571df95fa9677c8dede9cc6e21eb91a5a23e89ce2725cbd97da"},"d021f18758b28bda32bdaf0a987e0804cec074a9a4cfab8232ed81d96e75dfae","4489c6a9fde8934733aa7df6f7911461ee6e9e4ad092736bd416f6b2cc20b2c6","2c8e55457aaf4902941dfdba4061935922e8ee6e120539c9801cd7b400fae050","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","670a76db379b27c8ff42f1ba927828a22862e2ab0b0908e38b671f0e912cc5ed","9d38964b57191567a14b396422c87488cecd48f405c642daa734159875ee81d9","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","8c95f96ccd4be0674944077aec1e4f2cccd515ca06d4327562dd017250e7d3fc",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","bc3cba7b0af2d52e7425299aee518db479d44004eff6fbbd206d1ee7e5ec3fb5","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","035a5df183489c2e22f3cf59fc1ed2b043d27f357eecc0eb8d8e840059d44245","a4809f4d92317535e6b22b01019437030077a76fec1d93b9881c9ed4738fcc54","5f53fa0bd22096d2a78533f94e02c899143b8f0f9891a46965294ee8b91a9434","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","b8442e9db28157344d1bc5d8a5a256f1692de213f0c0ddeb84359834015a008c","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","da2b6356b84a40111aaecb18304ea4e4fcb43d70efb1c13ca7d7a906445ee0d3","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","6f294731b495c65ecf46a5694f0082954b961cf05463bea823f8014098eaffa0","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","68a0d0c508e1b6d8d23a519a8a0a3303dc5baa4849ca049f21e5bad41945e3fc","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","b03afe4bec768ae333582915146f48b161e567a81b5ebc31c4d78af089770ac9","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9","4f6a12044ee6f458db11964153830abbc499e73d065c51c329ec97407f4b13dd","8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","916be7d770b0ae0406be9486ac12eb9825f21514961dd050594c4b250617d5a8","254d9fb8c872d73d34594be8a200fd7311dbfa10a4116bfc465fba408052f2b3","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","2ccea88888048bbfcacbc9531a5596ea48a3e7dcd0a25f531a81bb717903ba4f","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","d8f7109e14f20eb735225a62fd3f8366da1a8349e90331cdad57f4b04caf6c5a","cf3d384d082b933d987c4e2fe7bfb8710adfd9dc8155190056ed6695a25a559e","9871b7ee672bc16c78833bdab3052615834b08375cb144e4d2cba74473f4a589","c863198dae89420f3c552b5a03da6ed6d0acfa3807a64772b895db624b0de707","8b03a5e327d7db67112ebbc93b4f744133eda2c1743dbb0a990c61a8007823ef","86c73f2ee1752bac8eeeece234fd05dfcf0637a4fbd8032e4f5f43102faa8eec","42fad1f540271e35ca37cecda12c4ce2eef27f0f5cf0f8dd761d723c744d3159","ff3743a5de32bee10906aff63d1de726f6a7fd6ee2da4b8229054dfa69de2c34","83acd370f7f84f203e71ebba33ba61b7f1291ca027d7f9a662c6307d74e4ac22","1445cec898f90bdd18b2949b9590b3c012f5b7e1804e6e329fb0fe053946d5ec","0e5318ec2275d8da858b541920d9306650ae6ac8012f0e872fe66eb50321a669","cf530297c3fb3a92ec9591dd4fa229d58b5981e45fe6702a0bd2bea53a5e59be","c1f6f7d08d42148ddfe164d36d7aba91f467dbcb3caa715966ff95f55048b3a4","f4e9bf9103191ef3b3612d3ec0044ca4044ca5be27711fe648ada06fad4bcc85","0c1ee27b8f6a00097c2d6d91a21ee4d096ab52c1e28350f6362542b55380059a","7677d5b0db9e020d3017720f853ba18f415219fb3a9597343b1b1012cfd699f7","bc1c6bc119c1784b1a2be6d9c47addec0d83ef0d52c8fbe1f14a51b4dfffc675","52cf2ce99c2a23de70225e252e9822a22b4e0adb82643ab0b710858810e00bf1","770625067bb27a20b9826255a8d47b6b5b0a2d3dfcbd21f89904c731f671ba77","d1ed6765f4d7906a05968fb5cd6d1db8afa14dbe512a4884e8ea5c0f5e142c80","799c0f1b07c092626cf1efd71d459997635911bb5f7fc1196efe449bba87e965","2a184e4462b9914a30b1b5c41cf80c6d3428f17b20d3afb711fff3f0644001fd","9eabde32a3aa5d80de34af2c2206cdc3ee094c6504a8d0c2d6d20c7c179503cc","397c8051b6cfcb48aa22656f0faca2553c5f56187262135162ee79d2b2f6c966","a8ead142e0c87dcd5dc130eba1f8eeed506b08952d905c47621dc2f583b1bff9","a02f10ea5f73130efca046429254a4e3c06b5475baecc8f7b99a0014731be8b3","c2576a4083232b0e2d9bd06875dd43d371dee2e090325a9eac0133fd5650c1cb","4c9a0564bb317349de6a24eb4efea8bb79898fa72ad63a1809165f5bd42970dd","f40ac11d8859092d20f953aae14ba967282c3bb056431a37fced1866ec7a2681","cc11e9e79d4746cc59e0e17473a59d6f104692fd0eeea1bdb2e206eabed83b03","b444a410d34fb5e98aa5ee2b381362044f4884652e8bc8a11c8fe14bbd85518e","c35808c1f5e16d2c571aa65067e3cb95afeff843b259ecfa2fc107a9519b5392","14d5dc055143e941c8743c6a21fa459f961cbc3deedf1bfe47b11587ca4b3ef5","a3ad4e1fc542751005267d50a6298e6765928c0c3a8dce1572f2ba6ca518661c","f237e7c97a3a89f4591afd49ecb3bd8d14f51a1c4adc8fcae3430febedff5eb6","3ffdfbec93b7aed71082af62b8c3e0cc71261cc68d796665faa1e91604fbae8f","662201f943ed45b1ad600d03a90dffe20841e725203ced8b708c91fcd7f9379a","c9ef74c64ed051ea5b958621e7fb853fe3b56e8787c1587aefc6ea988b3c7e79","2462ccfac5f3375794b861abaa81da380f1bbd9401de59ffa43119a0b644253d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","7d8ddf0f021c53099e34ee831a06c394d50371816caa98684812f089b4c6b3d4","7d2a0ba1297be385a89b5515b88cd31b4a1eeef5236f710166dc1b36b1741e1b","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","ab82804a14454734010dcdcd43f564ff7b0389bee4c5692eec76ff5b30d4cf66","bae8d023ef6b23df7da26f51cea44321f95817c190342a36882e93b80d07a960","ae271d475b632ce7b03fea6d9cf6da72439e57a109672671cbc79f54e1386938"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[234],[92,128,129,130,145],[129,130,146,147],[128,129],[128,145,148,151],[128,148,151,152],[149,150,151,153,154],[128,151],[128,145,148,149,150,153],[128,136],[128],[92,128],[80,128],[132,133,134,135,136,137,138,139,140,141,142,143,144],[128,134,135],[128,134,136],[199],[199,200,201],[64],[67],[64,67],[65,66,67,68,69,70,71,72,73,74,75,156,159,160,161,162,163,164,165,166],[58,64,65],[67,73,75,155],[158],[67,68],[64,162],[194,195],[234,235,236,237,238],[234,236],[157],[241,242,243],[93,128],[246],[247],[258],[252,257],[261,263,264,265,266,267,268,269,270,271,272,273],[261,262,264,265,266,267,268,269,270,271,272,273],[262,263,264,265,266,267,268,269,270,271,272,273],[261,262,263,265,266,267,268,269,270,271,272,273],[261,262,263,264,266,267,268,269,270,271,272,273],[261,262,263,264,265,267,268,269,270,271,272,273],[261,262,263,264,265,266,268,269,270,271,272,273],[261,262,263,264,265,266,267,269,270,271,272,273],[261,262,263,264,265,266,267,268,270,271,272,273],[261,262,263,264,265,266,267,268,269,271,272,273],[261,262,263,264,265,266,267,268,269,270,272,273],[261,262,263,264,265,266,267,268,269,270,271,273],[261,262,263,264,265,266,267,268,269,270,271,272],[76],[79],[80,85,112],[81,92,93,100,109,120],[81,82,92,100],[83,121],[84,85,93,101],[85,109,117],[86,88,92,100],[87],[88,89],[92],[91,92],[79,92],[92,93,94,109,120],[92,93,94,109],[92,95,100,109,120],[92,93,95,96,100,109,117,120],[95,97,109,117,120],[76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127],[92,98],[99,120,125],[88,92,100,109],[101],[102],[79,103],[104,119,125],[105],[106],[92,107],[107,108,121,123],[80,92,109,110,111],[80,109,111],[109,110],[112],[113],[92,115,116],[115,116],[85,100,109,117],[118],[100,119],[80,95,106,120],[85,121],[109,122],[123],[124],[80,85,92,94,103,109,120,123,125],[109,126],[128,279],[282,321],[282,306,321],[321],[282],[282,307,321],[282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320],[307,321],[322],[325],[204],[204,215,216],[216,217,218],[179],[179,180,181,182,183],[168,169,170,171,172,173,174,175,176,177,178],[250,253],[250,253,254,255],[252],[249,256],[251],[57,59,60,61,62,63],[57,58],[59],[58,59],[57,59],[167,184,185,186],[185],[186],[56,185,186,187],[189],[189,190,193,197],[196],[167,191,192],[212,213,214],[211,212],[167,211,212],[167,204,211],[167,188,191,198,224,228,229,230,231],[232],[191,192,198,232],[167,204],[167,205],[205,206,207,208,209,210],[167,188,191,198,202,203,220,221],[220],[203,220,222,223],[167,198,215,219],[167,188,224,225],[128,167,188,224,225],[225,226,227],[167,224],[167,188,224,228],[191,232]],"referencedMap":[[236,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[204,12],[200,17],[201,17],[202,18],[65,19],[66,19],[68,20],[69,19],[70,19],[71,21],[67,19],[167,22],[75,23],[156,24],[159,25],[165,26],[166,27],[196,28],[239,29],[235,1],[237,30],[238,1],[192,11],[158,31],[244,32],[245,33],[247,34],[248,35],[259,36],[258,37],[262,38],[263,39],[261,40],[264,41],[265,42],[266,43],[267,44],[268,45],[269,46],[270,47],[271,48],[272,49],[273,50],[76,51],[77,51],[79,52],[80,53],[81,54],[82,55],[83,56],[84,57],[85,58],[86,59],[87,60],[88,61],[89,61],[90,62],[91,63],[92,64],[93,65],[94,66],[95,67],[96,68],[97,69],[128,70],[98,71],[99,72],[100,73],[101,74],[102,75],[103,76],[104,77],[105,78],[106,79],[107,80],[108,81],[109,82],[111,83],[110,84],[112,85],[113,86],[115,87],[116,88],[117,89],[118,90],[119,91],[120,92],[121,93],[122,94],[123,95],[124,96],[125,97],[126,98],[276,11],[280,99],[281,11],[306,100],[307,101],[282,102],[285,102],[304,100],[305,100],[295,100],[294,103],[292,100],[287,100],[300,100],[298,100],[302,100],[286,100],[299,100],[303,100],[288,100],[289,100],[301,100],[283,100],[290,100],[291,100],[293,100],[297,100],[308,104],[296,100],[284,100],[321,105],[315,104],[317,106],[316,104],[309,104],[310,104],[312,104],[314,104],[318,106],[319,106],[311,106],[313,106],[323,107],[326,108],[216,109],[217,110],[218,110],[219,111],[175,112],[177,112],[176,112],[174,112],[184,113],[179,114],[170,112],[171,112],[172,112],[173,112],[254,115],[256,116],[255,115],[253,117],[257,118],[252,119],[64,120],[59,121],[60,122],[61,122],[62,123],[63,123],[58,124],[187,125],[186,126],[185,127],[188,128],[190,129],[198,130],[197,131],[193,132],[215,133],[213,134],[214,135],[212,136],[232,137],[230,138],[231,139],[233,138],[205,140],[206,141],[207,141],[209,141],[211,142],[210,141],[222,143],[221,144],[223,144],[224,145],[220,146],[226,147],[227,148],[228,149],[225,150]],"exportedModulesMap":[[236,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[204,12],[200,17],[201,17],[202,18],[65,19],[66,19],[68,20],[69,19],[70,19],[71,21],[67,19],[167,22],[75,23],[156,24],[159,25],[165,26],[166,27],[196,28],[239,29],[235,1],[237,30],[238,1],[192,11],[158,31],[244,32],[245,33],[247,34],[248,35],[259,36],[258,37],[262,38],[263,39],[261,40],[264,41],[265,42],[266,43],[267,44],[268,45],[269,46],[270,47],[271,48],[272,49],[273,50],[76,51],[77,51],[79,52],[80,53],[81,54],[82,55],[83,56],[84,57],[85,58],[86,59],[87,60],[88,61],[89,61],[90,62],[91,63],[92,64],[93,65],[94,66],[95,67],[96,68],[97,69],[128,70],[98,71],[99,72],[100,73],[101,74],[102,75],[103,76],[104,77],[105,78],[106,79],[107,80],[108,81],[109,82],[111,83],[110,84],[112,85],[113,86],[115,87],[116,88],[117,89],[118,90],[119,91],[120,92],[121,93],[122,94],[123,95],[124,96],[125,97],[126,98],[276,11],[280,99],[281,11],[306,100],[307,101],[282,102],[285,102],[304,100],[305,100],[295,100],[294,103],[292,100],[287,100],[300,100],[298,100],[302,100],[286,100],[299,100],[303,100],[288,100],[289,100],[301,100],[283,100],[290,100],[291,100],[293,100],[297,100],[308,104],[296,100],[284,100],[321,105],[315,104],[317,106],[316,104],[309,104],[310,104],[312,104],[314,104],[318,106],[319,106],[311,106],[313,106],[323,107],[326,108],[216,109],[217,110],[218,110],[219,111],[175,112],[177,112],[176,112],[174,112],[184,113],[179,114],[170,112],[171,112],[172,112],[173,112],[254,115],[256,116],[255,115],[253,117],[257,118],[252,119],[64,120],[59,121],[60,122],[61,122],[62,123],[63,123],[58,124],[187,125],[186,126],[185,127],[188,128],[190,129],[198,130],[197,131],[193,132],[215,133],[213,134],[214,135],[212,136],[232,151],[230,138],[231,152],[233,138],[205,140],[206,141],[207,141],[209,141],[211,142],[210,141],[222,143],[221,144],[223,144],[224,145],[220,146],[226,147],[227,148],[228,149],[225,150]],"semanticDiagnosticsPerFile":[236,234,146,129,148,130,147,152,153,149,155,150,154,151,137,134,141,135,132,140,145,142,143,144,139,136,133,138,191,204,200,201,202,199,65,66,68,69,70,71,72,73,74,67,167,75,156,159,160,161,162,163,164,165,166,194,196,195,239,235,237,238,192,158,240,241,244,242,245,246,247,248,259,258,243,260,262,263,261,264,265,266,267,268,269,270,271,272,273,274,157,76,77,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,78,127,95,96,97,128,98,99,100,101,102,103,104,105,106,107,108,109,111,110,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,275,276,277,278,280,279,281,306,307,282,285,304,305,295,294,292,287,300,298,302,286,299,303,288,289,301,283,290,291,293,297,308,296,284,321,320,315,317,316,309,310,312,314,318,319,311,313,323,322,324,229,325,326,131,249,216,217,218,219,178,175,177,176,174,184,179,183,180,182,181,170,171,172,168,169,173,250,254,256,255,253,257,252,251,57,64,59,60,61,62,63,58,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,33,30,31,32,34,7,35,40,41,36,37,38,39,1,42,56,187,186,185,188,190,198,197,189,193,215,213,214,212,232,230,231,233,205,206,207,208,209,211,210,222,203,221,223,224,220,226,227,228,225,47,48,49,50,51,52,43,53,54,55,44,45,46],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.9.5"}
+\ No newline at end of file
++{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createprovider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/basecontrollerv1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/assert.d.ts","../../../node_modules/@types/node/assert/strict.d.ts","../../../node_modules/@types/node/globals.d.ts","../../../node_modules/@types/node/async_hooks.d.ts","../../../node_modules/@types/node/buffer.d.ts","../../../node_modules/@types/node/child_process.d.ts","../../../node_modules/@types/node/cluster.d.ts","../../../node_modules/@types/node/console.d.ts","../../../node_modules/@types/node/constants.d.ts","../../../node_modules/@types/node/crypto.d.ts","../../../node_modules/@types/node/dgram.d.ts","../../../node_modules/@types/node/diagnostics_channel.d.ts","../../../node_modules/@types/node/dns.d.ts","../../../node_modules/@types/node/dns/promises.d.ts","../../../node_modules/@types/node/dom-events.d.ts","../../../node_modules/@types/node/domain.d.ts","../../../node_modules/@types/node/events.d.ts","../../../node_modules/@types/node/fs.d.ts","../../../node_modules/@types/node/fs/promises.d.ts","../../../node_modules/@types/node/http.d.ts","../../../node_modules/@types/node/http2.d.ts","../../../node_modules/@types/node/https.d.ts","../../../node_modules/@types/node/inspector.d.ts","../../../node_modules/@types/node/module.d.ts","../../../node_modules/@types/node/net.d.ts","../../../node_modules/@types/node/os.d.ts","../../../node_modules/@types/node/path.d.ts","../../../node_modules/@types/node/perf_hooks.d.ts","../../../node_modules/@types/node/process.d.ts","../../../node_modules/@types/node/punycode.d.ts","../../../node_modules/@types/node/querystring.d.ts","../../../node_modules/@types/node/readline.d.ts","../../../node_modules/@types/node/repl.d.ts","../../../node_modules/@types/node/stream.d.ts","../../../node_modules/@types/node/stream/promises.d.ts","../../../node_modules/@types/node/stream/consumers.d.ts","../../../node_modules/@types/node/stream/web.d.ts","../../../node_modules/@types/node/string_decoder.d.ts","../../../node_modules/@types/node/test.d.ts","../../../node_modules/@types/node/timers.d.ts","../../../node_modules/@types/node/timers/promises.d.ts","../../../node_modules/@types/node/tls.d.ts","../../../node_modules/@types/node/trace_events.d.ts","../../../node_modules/@types/node/tty.d.ts","../../../node_modules/@types/node/url.d.ts","../../../node_modules/@types/node/util.d.ts","../../../node_modules/@types/node/v8.d.ts","../../../node_modules/@types/node/vm.d.ts","../../../node_modules/@types/node/wasi.d.ts","../../../node_modules/@types/node/worker_threads.d.ts","../../../node_modules/@types/node/zlib.d.ts","../../../node_modules/@types/node/globals.global.d.ts","../../../node_modules/@types/node/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asynceventemitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacytransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/basetransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionfactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerclass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/restrictedcontrollermessenger.d.ts","../../base-controller/dist/types/controllermessenger.d.ts","../../base-controller/dist/types/basecontrollerv2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/utils.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createeventemitterproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createswappableproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../network-controller/dist/types/constants.d.ts","../../../node_modules/@metamask/safe-event-emitter/dist/cjs/index.d.ts","../../json-rpc-engine/dist/types/jsonrpcengine.d.ts","../../json-rpc-engine/dist/types/createasyncmiddleware.d.ts","../../json-rpc-engine/dist/types/createscaffoldmiddleware.d.ts","../../json-rpc-engine/dist/types/getuniqueid.d.ts","../../json-rpc-engine/dist/types/idremapmiddleware.d.ts","../../json-rpc-engine/dist/types/mergemiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/eth-block-tracker/dist/blocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/pollingblocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/subscribeblocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/index.d.ts","../../network-controller/dist/types/types.d.ts","../../network-controller/dist/types/create-auto-managed-network-client.d.ts","../../network-controller/dist/types/networkcontroller.d.ts","../../network-controller/dist/types/create-network-client.d.ts","../../network-controller/dist/types/index.d.ts","../../polling-controller/dist/types/types.d.ts","../../polling-controller/dist/types/blocktrackerpollingcontroller.d.ts","../../polling-controller/dist/types/staticintervalpollingcontroller.d.ts","../../polling-controller/dist/types/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../src/determinegasfeecalculations.ts","../src/gas-util.ts","../src/gasfeecontroller.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupsemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/difflines.d.ts","../../../node_modules/jest-diff/build/printdiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","75b22c74010ba649de1a1676a4c4b8b5bb4294fecd05089e2094429b16d7840c","5615ccf831db2ffc82145243081ebdb60ea8e1005ee8f975d1c0c1401a9c894e","38682ed3630bb6ecdace80d5a9adc811fc20a419f1940446e306c3a020d083b9","cc182e6e4f691cd6f7bf7cb491247a4c7818f9f1cb2db1d45c65ff906e3f741b","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","e0eda929c6b9b628cdeb0e54cd3582cb97e64f28aab34612fc1431c545899584","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","b3d48529ae61dc27d0bfbfa2cb3e0dff8189644bd155bdf5df1e8e14669f7043","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","5b3cd03ae354ea96eff1f74d7c410fe4852e6382227e8b0ecf87ab5e3a5bbcd4","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"056097110efd16869ec118cedb44ecbac9a019576eee808d61304ca6d5cb2cbe","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"6fb8358e10ed92a7f515b7d79da3904c955a3ffd4e14aa9df6f0ea113041f1cf","affectsGlobalScope":true},"45c831238c6dac21c72da5f335747736a56a3847192bf03c84b958a7e9ec93e2","661a11d16ad2e3543a77c53bcd4017ee9a450f47ab7def3ab493a86eae4d550c",{"version":"8cdc646cec7819581ef343b83855b1bfe4fe674f2c84f4fb8dc90d82fb56bd3a","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","9dd56225cc2d8cb8fe5ceb0043ff386987637e12fecc6078896058a99deae284","2375ed4b439215aa3b6d0c6fd175c78a4384b30cb43cbadaecbf0a18954c98cb","7693b90b3075deaccafd5efb467bf9f2b747a3075be888652ef73e64396d8628","41231da15bb5e3e806a8395bd15c7befd2ec90f9f4e3c9d0ae1356bccb76dbb0","fccfef201d057cb407fa515311bd608549bab6c7b8adcf8f2df31f5d3b796478",{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true},"5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"464762c6213566d072f1ced5e8e9a954785ec5e53883b7397198abb5ef5b8f71","affectsGlobalScope":true},"6387920dc3e18927335b086deec75bf8e50f879a5e273d32ee7bb7a55ba50572","9bba37424094688c4663c177a1379b229f919b8912889a472f32fdc5f08ddb4d","29a4be13b3a30d3e66667b75c58ec61fb2df8fa0422534fdee3cfb30c5dbf450","83366d901beda79d6eb37aaaf6ca248dcd88946302b2a7d975590783be51e88e","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","43ec77c369473e92e2ecebf0554a0fdaa9c256644a6070f28228dfcceec77351",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"95ed02bacb4502c985b69742ec82a4576d4ff4a6620ecc91593f611d502ae546","bf755525c4e6f85a970b98c4755d98e8aa1b6dbd83a5d8fcc57d3d497351b936","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"28084e15b63e6211769db2fe646d8bc5c4c6776321e0deffe2d12eefd52cb6b9","affectsGlobalScope":true},{"version":"aed37dabf86c99d6c8508700576ecede86688397bc12523541858705a0c737c2","affectsGlobalScope":true},"cc6ef5733d4ea6d2e06310a32dffd2c16418b467c5033d49cecc4f3a25de7497","94768454c3348b6ebe48e45fbad8c92e2bb7af4a35243edbe2b90823d0bd7f9a","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","84da3c28344e621fd1d591f2c09e9595292d2b70018da28a553268ac122597d4","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","6e191fea1db6e9e4fa828259cf489e820ec9170effff57fb081a2f3295db4722","aed943465fbce1efe49ee16b5ea409050f15cd8eaf116f6fadb64ef0772e7d95","70d08483a67bf7050dbedace398ef3fee9f436fcd60517c97c4c1e22e3c6f3e8","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"e933de8143e1d12dd51d89b398760fd5a9081896be366dad88a922d0b29f3c69","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b38d55d08708c2410a3039687db70b4a5bfa69fc4845617c313b5a10d9c5c637","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"a05e2d784c9be7051c4ac87a407c66d2106e23490c18c038bbd0712bde7602fd","affectsGlobalScope":true},{"version":"df90b9d0e9980762da8daf8adf6ffa0c853e76bfd269c377be0d07a9ad87acd2","affectsGlobalScope":true},"cf434b5c04792f62d6f4bdd5e2c8673f36e638e910333c172614d5def9b17f98","1d65d4798df9c2df008884035c41d3e67731f29db5ecb64cd7378797c7c53a2f","0faee6b555890a1cb106e2adc5d3ffd89545b1da894d474e9d436596d654998f","c6c01ea1c42508edf11a36d13b70f6e35774f74355ba5d358354d4a77cc67ea1","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"b0297b09e607bec9698cac7cf55463d6731406efb1161ee4d448293b47397c84","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","68cc8d6fcc2f270d7108f02f3ebc59480a54615be3e09a47e14527f349e9d53e","3eb11dbf3489064a47a2e1cf9d261b1f100ef0b3b50ffca6c44dd99d6dd81ac1","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","277983d414aa99d78655186c3ee1e1c38c302e336aff1d77b47fcdc39d8273fe","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","ca3353cc82b1981f0d25d71d7432d583a6ef882ccdea82d65fbe49af37be51cb","50679a8e27aacf72f8c40bcab15d7ef5e83494089b4726b83eec4554344d5cdc","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","5d697a4b315cc5bb3042ae869abffd10c3b0d7b182cda0e4c45d8819937e5796","563fa27fdaec8f195b84f71a7af0ef48d30d5cc830575db86da86a63a470c8e6","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","299567f84bfedd1468dca2755a829cb19e607a6811673788807dc8921e211bc9","795d9fb85aad92221504db74dd179b506bd189bba0c104426f7e7bb8a66ffee5","1311bc194e0a69fe61031e852c1c0b439e2a2a3d1d5e2d8ff795499b9f283459","4b7ce19369d7e7fae76720c2c6c7f671bf3fa0f7093edb864f1ac358ca7c456c","c972ef44deca1fa8fab465915ffa00f82e126aacf3dfc8979c03b1b066ce5bb6","30285a1011c6d6b52f3ba3abb0a984be8148c05cdefb8eb6eb562335a3991f35","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","3f450762fd7c34ed545e738abccb0af6a703572a10521643cf8fc88e3724c99c","fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","d6e6620a30d582182acc3f0a992a0c311adc589f111096aea11ab83fc09a5ccc","6213b8f686f56beab22b59a0f468590fd3a4c5fa931236a017efeca91d7c9584","c451cec9a588b1f105a5ea2c6063d4fca112b9d70105cacdadda0e1ef67e9379","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","03460a54d0e0481d1e11097f66ad43f054bc95efdafe5f81bbc7a82be181af75","4070c2f1c3434fcf84886e04d30d82cd650ee443e53b82b404b144175cf8741e","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","8129a34006218a6f3cdc81bbd438d5429eb18b08b4338a26977ac3b4df129d75","30d2170e1a718b5035611af55e3618b4ba8f42f0749bb52ee593da6082c4e2ce","98ef38666d88ec9699a722053e07ede65d3042f693fe7ff8c786e53dbb6fd43b","a3b8b6be7620897d1e481e8650c980a210a138fceb6e710eaf95fd9dd0dfe94a","12c89d0e32758c120a569045f21cf5b77244f86792611ced8de7f86b37e77781","14bd47270e654c8eb3b1489fa8c095912ee62a0a29bb92743393203722347c53","3d9297165e67fd59d9821cc93a9808213e33c56a8ac1c4273171f6afaaa2d4d5","e7af7d288b89287ad031b19583c597fcd9f5edc0b0d579b7b492f06cf57e058c","92cb686a9ca5eb5dd7d5d8d43a3707194c1e91ea07a027b3bcb60b6011b24632","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e",{"version":"d1a5f486914e3ead50534f48742c4e5e885d28909bec274017189d3284bcb833","signature":"b943b90c649678cec7987a6d56f4917db1712079294cffdf650699235ff9f37d"},{"version":"15433a2e97dcee760d97f8e56afe908fe932611ef00711aed9b246ba058ce0be","signature":"c5fc52cba80e6ba6fde33b0f9370b8ba6866831070cbc84b20a7c6e9e1163160"},{"version":"674d97345e4d79afd1248bdf3a032c9280f2ef163b1a074d14a1a927d93397a4","signature":"6991b558e53d59bb2160b64ee154678e069bd9bfe5131c628dcb6ac0363ca00d"},"d021f18758b28bda32bdaf0a987e0804cec074a9a4cfab8232ed81d96e75dfae","4489c6a9fde8934733aa7df6f7911461ee6e9e4ad092736bd416f6b2cc20b2c6","2c8e55457aaf4902941dfdba4061935922e8ee6e120539c9801cd7b400fae050","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","670a76db379b27c8ff42f1ba927828a22862e2ab0b0908e38b671f0e912cc5ed","9d38964b57191567a14b396422c87488cecd48f405c642daa734159875ee81d9","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","8c95f96ccd4be0674944077aec1e4f2cccd515ca06d4327562dd017250e7d3fc",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","bc3cba7b0af2d52e7425299aee518db479d44004eff6fbbd206d1ee7e5ec3fb5","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","035a5df183489c2e22f3cf59fc1ed2b043d27f357eecc0eb8d8e840059d44245","a4809f4d92317535e6b22b01019437030077a76fec1d93b9881c9ed4738fcc54","5f53fa0bd22096d2a78533f94e02c899143b8f0f9891a46965294ee8b91a9434","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","b8442e9db28157344d1bc5d8a5a256f1692de213f0c0ddeb84359834015a008c","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","da2b6356b84a40111aaecb18304ea4e4fcb43d70efb1c13ca7d7a906445ee0d3","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","6f294731b495c65ecf46a5694f0082954b961cf05463bea823f8014098eaffa0","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","68a0d0c508e1b6d8d23a519a8a0a3303dc5baa4849ca049f21e5bad41945e3fc","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","b03afe4bec768ae333582915146f48b161e567a81b5ebc31c4d78af089770ac9","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9","4f6a12044ee6f458db11964153830abbc499e73d065c51c329ec97407f4b13dd","8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","916be7d770b0ae0406be9486ac12eb9825f21514961dd050594c4b250617d5a8","254d9fb8c872d73d34594be8a200fd7311dbfa10a4116bfc465fba408052f2b3","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","2ccea88888048bbfcacbc9531a5596ea48a3e7dcd0a25f531a81bb717903ba4f","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","d8f7109e14f20eb735225a62fd3f8366da1a8349e90331cdad57f4b04caf6c5a","cf3d384d082b933d987c4e2fe7bfb8710adfd9dc8155190056ed6695a25a559e","9871b7ee672bc16c78833bdab3052615834b08375cb144e4d2cba74473f4a589","c863198dae89420f3c552b5a03da6ed6d0acfa3807a64772b895db624b0de707","8b03a5e327d7db67112ebbc93b4f744133eda2c1743dbb0a990c61a8007823ef","86c73f2ee1752bac8eeeece234fd05dfcf0637a4fbd8032e4f5f43102faa8eec","42fad1f540271e35ca37cecda12c4ce2eef27f0f5cf0f8dd761d723c744d3159","ff3743a5de32bee10906aff63d1de726f6a7fd6ee2da4b8229054dfa69de2c34","83acd370f7f84f203e71ebba33ba61b7f1291ca027d7f9a662c6307d74e4ac22","1445cec898f90bdd18b2949b9590b3c012f5b7e1804e6e329fb0fe053946d5ec","0e5318ec2275d8da858b541920d9306650ae6ac8012f0e872fe66eb50321a669","cf530297c3fb3a92ec9591dd4fa229d58b5981e45fe6702a0bd2bea53a5e59be","c1f6f7d08d42148ddfe164d36d7aba91f467dbcb3caa715966ff95f55048b3a4","f4e9bf9103191ef3b3612d3ec0044ca4044ca5be27711fe648ada06fad4bcc85","0c1ee27b8f6a00097c2d6d91a21ee4d096ab52c1e28350f6362542b55380059a","7677d5b0db9e020d3017720f853ba18f415219fb3a9597343b1b1012cfd699f7","bc1c6bc119c1784b1a2be6d9c47addec0d83ef0d52c8fbe1f14a51b4dfffc675","52cf2ce99c2a23de70225e252e9822a22b4e0adb82643ab0b710858810e00bf1","770625067bb27a20b9826255a8d47b6b5b0a2d3dfcbd21f89904c731f671ba77","d1ed6765f4d7906a05968fb5cd6d1db8afa14dbe512a4884e8ea5c0f5e142c80","799c0f1b07c092626cf1efd71d459997635911bb5f7fc1196efe449bba87e965","2a184e4462b9914a30b1b5c41cf80c6d3428f17b20d3afb711fff3f0644001fd","9eabde32a3aa5d80de34af2c2206cdc3ee094c6504a8d0c2d6d20c7c179503cc","397c8051b6cfcb48aa22656f0faca2553c5f56187262135162ee79d2b2f6c966","a8ead142e0c87dcd5dc130eba1f8eeed506b08952d905c47621dc2f583b1bff9","a02f10ea5f73130efca046429254a4e3c06b5475baecc8f7b99a0014731be8b3","c2576a4083232b0e2d9bd06875dd43d371dee2e090325a9eac0133fd5650c1cb","4c9a0564bb317349de6a24eb4efea8bb79898fa72ad63a1809165f5bd42970dd","f40ac11d8859092d20f953aae14ba967282c3bb056431a37fced1866ec7a2681","cc11e9e79d4746cc59e0e17473a59d6f104692fd0eeea1bdb2e206eabed83b03","b444a410d34fb5e98aa5ee2b381362044f4884652e8bc8a11c8fe14bbd85518e","c35808c1f5e16d2c571aa65067e3cb95afeff843b259ecfa2fc107a9519b5392","14d5dc055143e941c8743c6a21fa459f961cbc3deedf1bfe47b11587ca4b3ef5","a3ad4e1fc542751005267d50a6298e6765928c0c3a8dce1572f2ba6ca518661c","f237e7c97a3a89f4591afd49ecb3bd8d14f51a1c4adc8fcae3430febedff5eb6","3ffdfbec93b7aed71082af62b8c3e0cc71261cc68d796665faa1e91604fbae8f","662201f943ed45b1ad600d03a90dffe20841e725203ced8b708c91fcd7f9379a","c9ef74c64ed051ea5b958621e7fb853fe3b56e8787c1587aefc6ea988b3c7e79","2462ccfac5f3375794b861abaa81da380f1bbd9401de59ffa43119a0b644253d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","7d8ddf0f021c53099e34ee831a06c394d50371816caa98684812f089b4c6b3d4","7d2a0ba1297be385a89b5515b88cd31b4a1eeef5236f710166dc1b36b1741e1b","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","ab82804a14454734010dcdcd43f564ff7b0389bee4c5692eec76ff5b30d4cf66","bae8d023ef6b23df7da26f51cea44321f95817c190342a36882e93b80d07a960","ae271d475b632ce7b03fea6d9cf6da72439e57a109672671cbc79f54e1386938"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[234],[92,128,129,130,145],[129,130,146,147],[128,129],[128,145,148,151],[128,148,151,152],[149,150,151,153,154],[128,151],[128,145,148,149,150,153],[128,136],[128],[92,128],[80,128],[132,133,134,135,136,137,138,139,140,141,142,143,144],[128,134,135],[128,134,136],[199],[199,200,201],[64],[67],[64,67],[65,66,67,68,69,70,71,72,73,74,75,156,159,160,161,162,163,164,165,166],[58,64,65],[67,73,75,155],[158],[67,68],[64,162],[194,195],[234,235,236,237,238],[234,236],[157],[241,242,243],[93,128],[246],[247],[258],[252,257],[261,263,264,265,266,267,268,269,270,271,272,273],[261,262,264,265,266,267,268,269,270,271,272,273],[262,263,264,265,266,267,268,269,270,271,272,273],[261,262,263,265,266,267,268,269,270,271,272,273],[261,262,263,264,266,267,268,269,270,271,272,273],[261,262,263,264,265,267,268,269,270,271,272,273],[261,262,263,264,265,266,268,269,270,271,272,273],[261,262,263,264,265,266,267,269,270,271,272,273],[261,262,263,264,265,266,267,268,270,271,272,273],[261,262,263,264,265,266,267,268,269,271,272,273],[261,262,263,264,265,266,267,268,269,270,272,273],[261,262,263,264,265,266,267,268,269,270,271,273],[261,262,263,264,265,266,267,268,269,270,271,272],[76],[79],[80,85,112],[81,92,93,100,109,120],[81,82,92,100],[83,121],[84,85,93,101],[85,109,117],[86,88,92,100],[87],[88,89],[92],[91,92],[79,92],[92,93,94,109,120],[92,93,94,109],[92,95,100,109,120],[92,93,95,96,100,109,117,120],[95,97,109,117,120],[76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127],[92,98],[99,120,125],[88,92,100,109],[101],[102],[79,103],[104,119,125],[105],[106],[92,107],[107,108,121,123],[80,92,109,110,111],[80,109,111],[109,110],[112],[113],[92,115,116],[115,116],[85,100,109,117],[118],[100,119],[80,95,106,120],[85,121],[109,122],[123],[124],[80,85,92,94,103,109,120,123,125],[109,126],[128,279],[282,321],[282,306,321],[321],[282],[282,307,321],[282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320],[307,321],[322],[325],[204],[216,217,218],[204,215,216],[179],[179,180,181,182,183],[168,169,170,171,172,173,174,175,176,177,178],[250,253],[250,253,254,255],[252],[249,256],[251],[57,59,60,61,62,63],[57,58],[59],[58,59],[57,59],[167,184,185,186],[185],[56,185,186,187],[186],[189],[189,190,193,197],[196],[167,191,192],[212,213,214],[211,212],[167,211,212],[167,204,211],[232],[191,192,198,232],[167,188,191,198,224,228,229,230,231],[167,205],[205,206,207,208,209,210],[167,204],[220],[203,220,222,223],[167,188,191,198,202,203,220,221],[167,198,215,219],[167,188,224,225],[225,226,227],[128,167,188,224,225],[167,224],[191,232],[167,188,224,228]],"referencedMap":[[236,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[204,12],[200,17],[201,17],[202,18],[65,19],[66,19],[68,20],[69,19],[70,19],[71,21],[67,19],[167,22],[75,23],[156,24],[159,25],[165,26],[166,27],[196,28],[239,29],[235,1],[237,30],[238,1],[192,11],[158,31],[244,32],[245,33],[247,34],[248,35],[259,36],[258,37],[262,38],[263,39],[261,40],[264,41],[265,42],[266,43],[267,44],[268,45],[269,46],[270,47],[271,48],[272,49],[273,50],[76,51],[77,51],[79,52],[80,53],[81,54],[82,55],[83,56],[84,57],[85,58],[86,59],[87,60],[88,61],[89,61],[90,62],[91,63],[92,64],[93,65],[94,66],[95,67],[96,68],[97,69],[128,70],[98,71],[99,72],[100,73],[101,74],[102,75],[103,76],[104,77],[105,78],[106,79],[107,80],[108,81],[109,82],[111,83],[110,84],[112,85],[113,86],[115,87],[116,88],[117,89],[118,90],[119,91],[120,92],[121,93],[122,94],[123,95],[124,96],[125,97],[126,98],[276,11],[280,99],[281,11],[306,100],[307,101],[282,102],[285,102],[304,100],[305,100],[295,100],[294,103],[292,100],[287,100],[300,100],[298,100],[302,100],[286,100],[299,100],[303,100],[288,100],[289,100],[301,100],[283,100],[290,100],[291,100],[293,100],[297,100],[308,104],[296,100],[284,100],[321,105],[315,104],[317,106],[316,104],[309,104],[310,104],[312,104],[314,104],[318,106],[319,106],[311,106],[313,106],[323,107],[326,108],[216,109],[219,110],[217,111],[218,111],[175,112],[177,112],[176,112],[174,112],[184,113],[179,114],[170,112],[171,112],[172,112],[173,112],[254,115],[256,116],[255,115],[253,117],[257,118],[252,119],[64,120],[59,121],[60,122],[61,122],[62,123],[63,123],[58,124],[187,125],[186,126],[188,127],[185,128],[190,129],[198,130],[197,131],[193,132],[215,133],[213,134],[214,135],[212,136],[230,137],[231,138],[232,139],[233,137],[206,140],[207,140],[209,140],[211,141],[205,142],[210,140],[221,143],[223,143],[224,144],[222,145],[220,146],[226,147],[228,148],[227,149],[225,150]],"exportedModulesMap":[[236,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[204,12],[200,17],[201,17],[202,18],[65,19],[66,19],[68,20],[69,19],[70,19],[71,21],[67,19],[167,22],[75,23],[156,24],[159,25],[165,26],[166,27],[196,28],[239,29],[235,1],[237,30],[238,1],[192,11],[158,31],[244,32],[245,33],[247,34],[248,35],[259,36],[258,37],[262,38],[263,39],[261,40],[264,41],[265,42],[266,43],[267,44],[268,45],[269,46],[270,47],[271,48],[272,49],[273,50],[76,51],[77,51],[79,52],[80,53],[81,54],[82,55],[83,56],[84,57],[85,58],[86,59],[87,60],[88,61],[89,61],[90,62],[91,63],[92,64],[93,65],[94,66],[95,67],[96,68],[97,69],[128,70],[98,71],[99,72],[100,73],[101,74],[102,75],[103,76],[104,77],[105,78],[106,79],[107,80],[108,81],[109,82],[111,83],[110,84],[112,85],[113,86],[115,87],[116,88],[117,89],[118,90],[119,91],[120,92],[121,93],[122,94],[123,95],[124,96],[125,97],[126,98],[276,11],[280,99],[281,11],[306,100],[307,101],[282,102],[285,102],[304,100],[305,100],[295,100],[294,103],[292,100],[287,100],[300,100],[298,100],[302,100],[286,100],[299,100],[303,100],[288,100],[289,100],[301,100],[283,100],[290,100],[291,100],[293,100],[297,100],[308,104],[296,100],[284,100],[321,105],[315,104],[317,106],[316,104],[309,104],[310,104],[312,104],[314,104],[318,106],[319,106],[311,106],[313,106],[323,107],[326,108],[216,109],[219,110],[217,111],[218,111],[175,112],[177,112],[176,112],[174,112],[184,113],[179,114],[170,112],[171,112],[172,112],[173,112],[254,115],[256,116],[255,115],[253,117],[257,118],[252,119],[64,120],[59,121],[60,122],[61,122],[62,123],[63,123],[58,124],[187,125],[186,126],[188,127],[185,128],[190,129],[198,130],[197,131],[193,132],[215,133],[213,134],[214,135],[212,136],[230,137],[231,151],[232,152],[233,137],[206,140],[207,140],[209,140],[211,141],[205,142],[210,140],[221,143],[223,143],[224,144],[222,145],[220,146],[226,147],[228,148],[227,149],[225,150]],"semanticDiagnosticsPerFile":[236,234,146,129,148,130,147,152,153,149,155,150,154,151,137,134,141,135,132,140,145,142,143,144,139,136,133,138,191,204,200,201,202,199,65,66,68,69,70,71,72,73,74,67,167,75,156,159,160,161,162,163,164,165,166,194,196,195,239,235,237,238,192,158,240,241,244,242,245,246,247,248,259,258,243,260,262,263,261,264,265,266,267,268,269,270,271,272,273,274,157,76,77,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,78,127,95,96,97,128,98,99,100,101,102,103,104,105,106,107,108,109,111,110,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,275,276,277,278,280,279,281,306,307,282,285,304,305,295,294,292,287,300,298,302,286,299,303,288,289,301,283,290,291,293,297,308,296,284,321,320,315,317,316,309,310,312,314,318,319,311,313,323,322,324,229,325,326,131,249,216,219,217,218,178,175,177,176,174,184,179,183,180,182,181,170,171,172,168,169,173,250,254,256,255,253,257,252,251,57,64,59,60,61,62,63,58,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,33,30,31,32,34,7,35,40,41,36,37,38,39,1,42,56,187,186,188,185,190,198,197,189,193,215,213,214,212,230,231,232,233,206,207,208,209,211,205,210,203,221,223,224,222,220,226,228,227,225,47,48,49,50,51,52,43,53,54,55,44,45,46],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.9.5"}
+\ No newline at end of file
+diff --git a/dist/types/GasFeeController.d.ts b/dist/types/GasFeeController.d.ts
+index b6ffa7cd5b356ef6c5df6a79876308d21749bd06..56d9420b539cc8d98b8aeb0a84ba541fc3beae1b 100644
+--- a/dist/types/GasFeeController.d.ts
++++ b/dist/types/GasFeeController.d.ts
+@@ -2,7 +2,7 @@ import type { ControllerGetStateAction, ControllerStateChangeEvent, RestrictedCo
+ import type { NetworkClientId, NetworkControllerGetEIP1559CompatibilityAction, NetworkControllerGetNetworkClientByIdAction, NetworkControllerGetStateAction, NetworkControllerNetworkDidChangeEvent, NetworkState, ProviderProxy } from '@metamask/network-controller';
+ import { StaticIntervalPollingController } from '@metamask/polling-controller';
+ import type { Hex } from '@metamask/utils';
+-export declare const GAS_API_BASE_URL = "https://gas.api.infura.io";
++export declare const LEGACY_GAS_PRICES_API_URL = "https://api.metaswap.codefi.network/gasPrices";
+ export type unknownString = 'unknown';
+ export type FeeMarketEstimateType = 'fee-market';
+ export type LegacyEstimateType = 'legacy';
+@@ -160,7 +160,6 @@ export declare class GasFeeController extends StaticIntervalPollingController<ty
+     private readonly getCurrentNetworkEIP1559Compatibility;
+     private readonly getCurrentNetworkLegacyGasAPICompatibility;
+     private readonly getCurrentAccountEIP1559Compatibility;
+-    private readonly infuraAPIKey;
+     private currentChainId;
+     private ethQuery?;
+     private readonly clientId?;
+@@ -181,11 +180,13 @@ export declare class GasFeeController extends StaticIntervalPollingController<ty
+      * @param options.getProvider - Returns a network provider for the current network.
+      * @param options.onNetworkDidChange - A function for registering an event handler for the
+      * network state change event.
++     * @param options.legacyAPIEndpoint - The legacy gas price API URL. This option is primarily for
++     * testing purposes.
++     * @param options.EIP1559APIEndpoint - The EIP-1559 gas price API URL.
+      * @param options.clientId - The client ID used to identify to the gas estimation API who is
+      * asking for estimates.
+-     * @param options.infuraAPIKey - The Infura API key used for infura API requests.
+      */
+-    constructor({ interval, messenger, state, getCurrentNetworkEIP1559Compatibility, getCurrentAccountEIP1559Compatibility, getChainId, getCurrentNetworkLegacyGasAPICompatibility, getProvider, onNetworkDidChange, clientId, infuraAPIKey, }: {
++    constructor({ interval, messenger, state, getCurrentNetworkEIP1559Compatibility, getCurrentAccountEIP1559Compatibility, getChainId, getCurrentNetworkLegacyGasAPICompatibility, getProvider, onNetworkDidChange, legacyAPIEndpoint, EIP1559APIEndpoint, clientId, }: {
+         interval?: number;
+         messenger: GasFeeMessenger;
+         state?: GasFeeState;
+@@ -195,8 +196,9 @@ export declare class GasFeeController extends StaticIntervalPollingController<ty
+         getChainId?: () => Hex;
+         getProvider: () => ProviderProxy;
+         onNetworkDidChange?: (listener: (state: NetworkState) => void) => void;
++        legacyAPIEndpoint?: string;
++        EIP1559APIEndpoint: string;
+         clientId?: string;
+-        infuraAPIKey: string;
+     });
+     resetPolling(): Promise<void>;
+     fetchGasFeeEstimates(options?: FetchGasFeeEstimateOptions): Promise<GasFeeState>;
+diff --git a/dist/types/GasFeeController.d.ts.map b/dist/types/GasFeeController.d.ts.map
+index 0dd80816d0083029fcc5ef3a85a47f188a5b4c02..127cdbe0c0fbfb37938403190c49d2a5687cf9c4 100644
+--- a/dist/types/GasFeeController.d.ts.map
++++ b/dist/types/GasFeeController.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"GasFeeController.d.ts","sourceRoot":"","sources":["../../src/GasFeeController.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
++{"version":3,"file":"GasFeeController.d.ts","sourceRoot":"","sources":["../../src/GasFeeController.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
+diff --git a/dist/types/determineGasFeeCalculations.d.ts b/dist/types/determineGasFeeCalculations.d.ts
+index 8091a4d4290d6a3ca9ecbecc9ab8c6764a58cac9..6f4b2758a99e4d0d3fd2c8dce4064a2a2fc69c0a 100644
+--- a/dist/types/determineGasFeeCalculations.d.ts
++++ b/dist/types/determineGasFeeCalculations.d.ts
+@@ -2,15 +2,14 @@ import type { EstimatedGasFeeTimeBounds, EthGasPriceEstimate, GasFeeEstimates, G
+ type DetermineGasFeeCalculationsRequest = {
+     isEIP1559Compatible: boolean;
+     isLegacyGasAPICompatible: boolean;
+-    fetchGasEstimates: (url: string, infuraAPIKey: string, clientId?: string) => Promise<GasFeeEstimates>;
++    fetchGasEstimates: (url: string, clientId?: string) => Promise<GasFeeEstimates>;
+     fetchGasEstimatesUrl: string;
+-    fetchLegacyGasPriceEstimates: (url: string, infuraAPIKey: string, clientId?: string) => Promise<LegacyGasPriceEstimate>;
++    fetchLegacyGasPriceEstimates: (url: string, clientId?: string) => Promise<LegacyGasPriceEstimate>;
+     fetchLegacyGasPriceEstimatesUrl: string;
+     fetchEthGasPriceEstimate: (ethQuery: any) => Promise<EthGasPriceEstimate>;
+     calculateTimeEstimate: (maxPriorityFeePerGas: string, maxFeePerGas: string, gasFeeEstimates: GasFeeEstimates) => EstimatedGasFeeTimeBounds;
+     clientId: string | undefined;
+     ethQuery: any;
+-    infuraAPIKey: string;
+     nonRPCGasFeeApisDisabled?: boolean;
+ };
+ /**
+@@ -35,7 +34,6 @@ type DetermineGasFeeCalculationsRequest = {
+  * @param args.calculateTimeEstimate - A function that determine time estimate bounds.
+  * @param args.clientId - An identifier that an API can use to know who is asking for estimates.
+  * @param args.ethQuery - An EthQuery instance we can use to talk to Ethereum directly.
+- * @param args.infuraAPIKey - Infura API key to use for requests to Infura.
+  * @param args.nonRPCGasFeeApisDisabled - Whether to disable requests to the legacyAPIEndpoint and the EIP1559APIEndpoint
+  * @returns The gas fee calculations.
+  */
+diff --git a/dist/types/determineGasFeeCalculations.d.ts.map b/dist/types/determineGasFeeCalculations.d.ts.map
+index 44ce4dc7b691ea0316163952f99d426d417afd1a..17cec260fc0836f59929a053270164e5c10e4b89 100644
+--- a/dist/types/determineGasFeeCalculations.d.ts.map
++++ b/dist/types/determineGasFeeCalculations.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"determineGasFeeCalculations.d.ts","sourceRoot":"","sources":["../../src/determineGasFeeCalculations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,eAAe,EACf,WAAW,IAAI,kBAAkB,EACjC,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAG5B,KAAK,kCAAkC,GAAG;IACxC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;IAClC,iBAAiB,EAAE,CACjB,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,eAAe,CAAC,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,4BAA4B,EAAE,CAC5B,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACrC,+BAA+B,EAAE,MAAM,CAAC;IAGxC,wBAAwB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1E,qBAAqB,EAAE,CACrB,oBAAoB,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,eAAe,KAC7B,yBAAyB,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAG7B,QAAQ,EAAE,GAAG,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAA8B,2BAA2B,CACvD,IAAI,EAAE,kCAAkC,GACvC,OAAO,CAAC,kBAAkB,CAAC,CAY7B"}
+\ No newline at end of file
++{"version":3,"file":"determineGasFeeCalculations.d.ts","sourceRoot":"","sources":["../../src/determineGasFeeCalculations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACnB,eAAe,EACf,WAAW,IAAI,kBAAkB,EACjC,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAG5B,KAAK,kCAAkC,GAAG;IACxC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;IAClC,iBAAiB,EAAE,CACjB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,eAAe,CAAC,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,4BAA4B,EAAE,CAC5B,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM,KACd,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACrC,+BAA+B,EAAE,MAAM,CAAC;IAGxC,wBAAwB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1E,qBAAqB,EAAE,CACrB,oBAAoB,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,eAAe,KAC7B,yBAAyB,CAAC;IAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAG7B,QAAQ,EAAE,GAAG,CAAC;IACd,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAA8B,2BAA2B,CACvD,IAAI,EAAE,kCAAkC,GACvC,OAAO,CAAC,kBAAkB,CAAC,CAY7B"}
+\ No newline at end of file
+diff --git a/dist/types/gas-util.d.ts b/dist/types/gas-util.d.ts
+index 3739e0ffc0f895d20b5ab1e706b893e8606ef62b..661c3a87fbb2160075801e676d216809b01ecf6e 100644
+--- a/dist/types/gas-util.d.ts
++++ b/dist/types/gas-util.d.ts
+@@ -11,21 +11,19 @@ export declare function normalizeGWEIDecimalNumbers(n: string | number): any;
+  * Fetch gas estimates from the given URL.
+  *
+  * @param url - The gas estimate URL.
+- * @param infuraAPIKey - The Infura API key used for infura API requests.
+  * @param clientId - The client ID used to identify to the API who is asking for estimates.
+  * @returns The gas estimates.
+  */
+-export declare function fetchGasEstimates(url: string, infuraAPIKey: string, clientId?: string): Promise<GasFeeEstimates>;
++export declare function fetchGasEstimates(url: string, clientId?: string): Promise<GasFeeEstimates>;
+ /**
+  * Hit the legacy MetaSwaps gasPrices estimate api and return the low, medium
+  * high values from that API.
+  *
+  * @param url - The URL to fetch gas price estimates from.
+- * @param infuraAPIKey - The Infura API key used for infura API requests.
+  * @param clientId - The client ID used to identify to the API who is asking for estimates.
+  * @returns The gas price estimates.
+  */
+-export declare function fetchLegacyGasPriceEstimates(url: string, infuraAPIKey: string, clientId?: string): Promise<LegacyGasPriceEstimate>;
++export declare function fetchLegacyGasPriceEstimates(url: string, clientId?: string): Promise<LegacyGasPriceEstimate>;
+ /**
+  * Get a gas price estimate from the network using the `eth_gasPrice` method.
+  *
+diff --git a/dist/types/gas-util.d.ts.map b/dist/types/gas-util.d.ts.map
+index 8a24af1980fc16f7ecbe97222cab534b3c0f6c2c..ab417991781db0ad097218682c264d7aa738bf12 100644
+--- a/dist/types/gas-util.d.ts.map
++++ b/dist/types/gas-util.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"gas-util.d.ts","sourceRoot":"","sources":["../../src/gas-util.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EAEzB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAI5B;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,OAI7D;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,CAAC,CAyC1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,CAAC,CAcjC;AAED;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,mBAAmB,CAAC,CAK9B;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,eAAe,GAC/B,yBAAyB,CAoD3B"}
+\ No newline at end of file
++{"version":3,"file":"gas-util.d.ts","sourceRoot":"","sources":["../../src/gas-util.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EAEzB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAI5B;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,OAI7D;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,CAAC,CAyC1B;AAED;;;;;;;GAOG;AACH,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,CAAC,CAgBjC;AAED;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,mBAAmB,CAAC,CAK9B;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,eAAe,GAC/B,yBAAyB,CAoD3B"}
+\ No newline at end of file
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b283e96dca30..dcc761386ac7 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -165,7 +165,11 @@ import {
   TokenStandard,
   SIGNING_METHODS,
 } from '../../shared/constants/transaction';
-import { SWAPS_CLIENT_ID } from '../../shared/constants/swaps';
+import {
+  GAS_API_BASE_URL,
+  GAS_DEV_API_BASE_URL,
+  SWAPS_CLIENT_ID,
+} from '../../shared/constants/swaps';
 import {
   CHAIN_IDS,
   NETWORK_TYPES,
@@ -747,6 +751,10 @@ export default class MetamaskController extends EventEmitter {
       allowedEvents: ['NetworkController:stateChange'],
     });
 
+    const gasApiBaseUrl = process.env.SWAPS_USE_DEV_APIS
+      ? GAS_DEV_API_BASE_URL
+      : GAS_API_BASE_URL;
+
     this.gasFeeController = new GasFeeController({
       state: initState.GasFeeController,
       interval: 10000,
@@ -766,12 +774,13 @@ export default class MetamaskController extends EventEmitter {
         ),
       getCurrentAccountEIP1559Compatibility:
         this.getCurrentAccountEIP1559Compatibility.bind(this),
+      legacyAPIEndpoint: `${gasApiBaseUrl}/networks/<chain_id>/gasPrices`,
+      EIP1559APIEndpoint: `${gasApiBaseUrl}/networks/<chain_id>/suggestedGasFees`,
       getCurrentNetworkLegacyGasAPICompatibility: () => {
         const { chainId } = this.networkController.state.providerConfig;
         return chainId === CHAIN_IDS.BSC;
       },
       getChainId: () => this.networkController.state.providerConfig.chainId,
-      infuraAPIKey: opts.infuraProjectId,
     });
 
     this.appStateController = new AppStateController({
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 0d79a15d8602..ff3cffcfe251 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1450,7 +1450,6 @@
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "bn.js": true,
-        "browserify>buffer": true,
         "uuid": true
       }
     },
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 4112d0a992f5..1d25b7dcf44a 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1535,7 +1535,6 @@
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "bn.js": true,
-        "browserify>buffer": true,
         "uuid": true
       }
     },
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 8f658fc7d31c..1062fe4c5345 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1535,7 +1535,6 @@
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "bn.js": true,
-        "browserify>buffer": true,
         "uuid": true
       }
     },
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 8aaad9ea07c6..9b77c0221177 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1450,7 +1450,6 @@
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "bn.js": true,
-        "browserify>buffer": true,
         "uuid": true
       }
     },
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index d0eec498aeee..91e5cd60f2b8 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -1543,7 +1543,6 @@
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller>@metamask/polling-controller": true,
         "bn.js": true,
-        "browserify>buffer": true,
         "uuid": true
       }
     },
diff --git a/package.json b/package.json
index 8f33f48cb6c7..529fddaa57bb 100644
--- a/package.json
+++ b/package.json
@@ -252,7 +252,8 @@
     "sucrase@npm:3.34.0": "^3.35.0",
     "@expo/config/glob": "^10.3.10",
     "@expo/config-plugins/glob": "^10.3.10",
-    "@solana/web3.js/rpc-websockets": "^8.0.1"
+    "@solana/web3.js/rpc-websockets": "^8.0.1",
+    "@metamask/gas-fee-controller@npm:^15.1.1": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
@@ -305,7 +306,7 @@
     "@metamask/ethjs": "^0.6.0",
     "@metamask/ethjs-contract": "^0.4.1",
     "@metamask/ethjs-query": "^0.7.1",
-    "@metamask/gas-fee-controller": "^15.1.2",
+    "@metamask/gas-fee-controller": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch",
     "@metamask/jazzicon": "^2.0.0",
     "@metamask/keyring-api": "^3.0.0",
     "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch",
diff --git a/privacy-snapshot.json b/privacy-snapshot.json
index 2fdcc5f22a95..fd33b28b3cc2 100644
--- a/privacy-snapshot.json
+++ b/privacy-snapshot.json
@@ -18,7 +18,7 @@
   "etherscan.io",
   "execution.metamask.io",
   "fonts.gstatic.com",
-  "gas.api.infura.io",
+  "gas.api.cx.metamask.io",
   "github.com",
   "goerli.infura.io",
   "localhost:8000",
diff --git a/shared/constants/swaps.ts b/shared/constants/swaps.ts
index 04e3b0a31cd6..b2882b88d07c 100644
--- a/shared/constants/swaps.ts
+++ b/shared/constants/swaps.ts
@@ -170,7 +170,7 @@ const SWAPS_TESTNET_CHAIN_ID = '0x539';
 
 export const SWAPS_API_V2_BASE_URL = 'https://swap.metaswap.codefi.network';
 export const SWAPS_DEV_API_V2_BASE_URL = 'https://swap.dev-api.cx.metamask.io';
-export const GAS_API_BASE_URL = 'https://gas.api.infura.io';
+export const GAS_API_BASE_URL = 'https://gas.api.cx.metamask.io';
 export const GAS_DEV_API_BASE_URL = 'https://gas.uat-api.cx.metamask.io';
 
 const BSC_DEFAULT_BLOCK_EXPLORER_URL = 'https://bscscan.com/';
diff --git a/shared/lib/swaps-utils.js b/shared/lib/swaps-utils.js
index 67223bfddf80..5b5107b4495d 100644
--- a/shared/lib/swaps-utils.js
+++ b/shared/lib/swaps-utils.js
@@ -3,6 +3,7 @@ import log from 'loglevel';
 import { CHAIN_IDS } from '../constants/network';
 import {
   GAS_API_BASE_URL,
+  GAS_DEV_API_BASE_URL,
   SWAPS_API_V2_BASE_URL,
   SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
   SWAPS_CLIENT_ID,
@@ -129,7 +130,7 @@ const getBaseUrlForNewSwapsApi = (type, chainId) => {
   const v2ApiBaseUrl = useDevApis
     ? SWAPS_DEV_API_V2_BASE_URL
     : SWAPS_API_V2_BASE_URL;
-  const gasApiBaseUrl = GAS_API_BASE_URL;
+  const gasApiBaseUrl = useDevApis ? GAS_DEV_API_BASE_URL : GAS_API_BASE_URL;
   const noNetworkSpecificTypes = ['refreshTime']; // These types don't need network info in the URL.
   if (noNetworkSpecificTypes.includes(type)) {
     return v2ApiBaseUrl;
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index 8a7f54b0e4fb..bfd95f416787 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -177,60 +177,18 @@ async function setupMocking(server, testSpecificMock, { chainId }) {
       };
     });
 
-  const gasPricesCallbackMock = () => ({
-    statusCode: 200,
-    json: {
-      SafeGasPrice: '1',
-      ProposeGasPrice: '2',
-      FastGasPrice: '3',
-    },
-  });
-  const suggestedGasFeesCallbackMock = () => ({
-    statusCode: 200,
-    json: {
-      low: {
-        suggestedMaxPriorityFeePerGas: '1',
-        suggestedMaxFeePerGas: '20.44436136',
-        minWaitTimeEstimate: 15000,
-        maxWaitTimeEstimate: 30000,
-      },
-      medium: {
-        suggestedMaxPriorityFeePerGas: '1.5',
-        suggestedMaxFeePerGas: '25.80554517',
-        minWaitTimeEstimate: 15000,
-        maxWaitTimeEstimate: 45000,
-      },
-      high: {
-        suggestedMaxPriorityFeePerGas: '2',
-        suggestedMaxFeePerGas: '27.277766977',
-        minWaitTimeEstimate: 15000,
-        maxWaitTimeEstimate: 60000,
-      },
-      estimatedBaseFee: '19.444436136',
-      networkCongestion: 0.14685,
-      latestPriorityFeeRange: ['0.378818859', '6.555563864'],
-      historicalPriorityFeeRange: ['0.1', '248.262969261'],
-      historicalBaseFeeRange: ['14.146999781', '28.825256275'],
-      priorityFeeTrend: 'down',
-      baseFeeTrend: 'up',
-    },
-  });
-
   await server
     .forGet(`${GAS_API_BASE_URL}/networks/${chainId}/gasPrices`)
-    .thenCallback(gasPricesCallbackMock);
-
-  await server
-    .forGet(`${GAS_API_BASE_URL}/networks/1/gasPrices`)
-    .thenCallback(gasPricesCallbackMock);
-
-  await server
-    .forGet(`${GAS_API_BASE_URL}/networks/1/suggestedGasFees`)
-    .thenCallback(suggestedGasFeesCallbackMock);
-
-  await server
-    .forGet(`${GAS_API_BASE_URL}/networks/${chainId}/suggestedGasFees`)
-    .thenCallback(suggestedGasFeesCallbackMock);
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          SafeGasPrice: '1',
+          ProposeGasPrice: '2',
+          FastGasPrice: '3',
+        },
+      };
+    });
 
   await server
     .forGet('https://swap.metaswap.codefi.network/networks/1/token')
@@ -249,6 +207,41 @@ async function setupMocking(server, testSpecificMock, { chainId }) {
       };
     });
 
+  await server
+    .forGet(`${GAS_API_BASE_URL}/networks/${chainId}/suggestedGasFees`)
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          low: {
+            suggestedMaxPriorityFeePerGas: '1',
+            suggestedMaxFeePerGas: '20.44436136',
+            minWaitTimeEstimate: 15000,
+            maxWaitTimeEstimate: 30000,
+          },
+          medium: {
+            suggestedMaxPriorityFeePerGas: '1.5',
+            suggestedMaxFeePerGas: '25.80554517',
+            minWaitTimeEstimate: 15000,
+            maxWaitTimeEstimate: 45000,
+          },
+          high: {
+            suggestedMaxPriorityFeePerGas: '2',
+            suggestedMaxFeePerGas: '27.277766977',
+            minWaitTimeEstimate: 15000,
+            maxWaitTimeEstimate: 60000,
+          },
+          estimatedBaseFee: '19.444436136',
+          networkCongestion: 0.14685,
+          latestPriorityFeeRange: ['0.378818859', '6.555563864'],
+          historicalPriorityFeeRange: ['0.1', '248.262969261'],
+          historicalBaseFeeRange: ['14.146999781', '28.825256275'],
+          priorityFeeTrend: 'down',
+          baseFeeTrend: 'up',
+        },
+      };
+    });
+
   await server
     .forGet('https://swap.metaswap.codefi.network/featureFlags')
     .thenCallback(() => {
diff --git a/test/jest/constants.js b/test/jest/constants.js
index 6f15a9d24d7e..89a6b33357fc 100644
--- a/test/jest/constants.js
+++ b/test/jest/constants.js
@@ -1,2 +1,2 @@
 export const METASWAP_BASE_URL = 'https://swap.metaswap.codefi.network';
-export const GAS_API_URL = 'https://gas.api.infura.io';
+export const GAS_API_URL = 'https://gas.api.cx.metamask.io';
diff --git a/ui/pages/swaps/swaps.util.ts b/ui/pages/swaps/swaps.util.ts
index 1006cf2846be..66343cfb0d44 100644
--- a/ui/pages/swaps/swaps.util.ts
+++ b/ui/pages/swaps/swaps.util.ts
@@ -49,11 +49,6 @@ const CACHE_REFRESH_FIVE_MINUTES = 300000;
 const USD_CURRENCY_CODE = 'usd';
 
 const clientIdHeader = { 'X-Client-Id': SWAPS_CLIENT_ID };
-const infuraAuthHeader = {
-  Authorization: `Basic ${Buffer.from(
-    `${process.env.INFURA_PROJECT_ID}:`,
-  ).toString('base64')}`,
-};
 
 type Validator = {
   property: string;
@@ -263,13 +258,7 @@ export async function fetchSwapsGasPrices(chainId: any): Promise<
   const gasPricesUrl = getBaseApi('gasPrices', chainId);
   const response = await fetchWithCache({
     url: gasPricesUrl,
-    fetchOptions: {
-      method: 'GET',
-      headers: {
-        ...clientIdHeader,
-        ...infuraAuthHeader,
-      },
-    },
+    fetchOptions: { method: 'GET', headers: clientIdHeader },
     cacheOptions: { cacheRefreshTime: 30000 },
     functionName: 'fetchSwapsGasPrices',
   });
diff --git a/yarn.lock b/yarn.lock
index 75ed417c17b9..a742de0a9979 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4936,16 +4936,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/gas-fee-controller@npm:^14.0.1":
-  version: 14.0.1
-  resolution: "@metamask/gas-fee-controller@npm:14.0.1"
+"@metamask/gas-fee-controller@npm:15.1.2, @metamask/gas-fee-controller@npm:^15.1.2":
+  version: 15.1.2
+  resolution: "@metamask/gas-fee-controller@npm:15.1.2"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.1"
-    "@metamask/controller-utils": "npm:^9.0.1"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/ethjs-unit": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^18.0.1"
-    "@metamask/polling-controller": "npm:^6.0.1"
+    "@metamask/network-controller": "npm:^18.1.0"
+    "@metamask/polling-controller": "npm:^6.0.2"
     "@metamask/utils": "npm:^8.3.0"
     "@types/bn.js": "npm:^5.1.5"
     "@types/uuid": "npm:^8.3.0"
@@ -4953,20 +4953,20 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/network-controller": ^18.0.0
-  checksum: 1d26deb26003346976e427d240a2fc0281cb03358859ea8dcddc65a58f6b1b9611d610470cd882a8a8caf82870c3425b18dc7393ef0a9955ba26321479d3feb2
+  checksum: bc876e444142fffddcf8f6409eab0f87dd406879d11c49f0f37fdb0ea14723e1d436516ab28c90ab50c8d72c7b29d746f0cb70dff36cd59ce4c3932e8d753014
   languageName: node
   linkType: hard
 
-"@metamask/gas-fee-controller@npm:^15.1.2":
-  version: 15.1.2
-  resolution: "@metamask/gas-fee-controller@npm:15.1.2"
+"@metamask/gas-fee-controller@npm:^14.0.1":
+  version: 14.0.1
+  resolution: "@metamask/gas-fee-controller@npm:14.0.1"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.2"
-    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/base-controller": "npm:^5.0.1"
+    "@metamask/controller-utils": "npm:^9.0.1"
     "@metamask/eth-query": "npm:^4.0.0"
     "@metamask/ethjs-unit": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^18.1.0"
-    "@metamask/polling-controller": "npm:^6.0.2"
+    "@metamask/network-controller": "npm:^18.0.1"
+    "@metamask/polling-controller": "npm:^6.0.1"
     "@metamask/utils": "npm:^8.3.0"
     "@types/bn.js": "npm:^5.1.5"
     "@types/uuid": "npm:^8.3.0"
@@ -4974,7 +4974,7 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@metamask/network-controller": ^18.0.0
-  checksum: bc876e444142fffddcf8f6409eab0f87dd406879d11c49f0f37fdb0ea14723e1d436516ab28c90ab50c8d72c7b29d746f0cb70dff36cd59ce4c3932e8d753014
+  checksum: 1d26deb26003346976e427d240a2fc0281cb03358859ea8dcddc65a58f6b1b9611d610470cd882a8a8caf82870c3425b18dc7393ef0a9955ba26321479d3feb2
   languageName: node
   linkType: hard
 
@@ -4999,6 +4999,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/gas-fee-controller@patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch":
+  version: 15.1.2
+  resolution: "@metamask/gas-fee-controller@patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch::version=15.1.2&hash=c5be0a"
+  dependencies:
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/ethjs-unit": "npm:^0.3.0"
+    "@metamask/network-controller": "npm:^18.1.0"
+    "@metamask/polling-controller": "npm:^6.0.2"
+    "@metamask/utils": "npm:^8.3.0"
+    "@types/bn.js": "npm:^5.1.5"
+    "@types/uuid": "npm:^8.3.0"
+    bn.js: "npm:^5.2.1"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@metamask/network-controller": ^18.0.0
+  checksum: 4785ff26e541911ffc5a280a9e1a9a648fb3d89e672afeedcd4951a8f176d8e6ae91192afe56fa943f6b4eeff3ce0dba7ec05228a62a8fee1664bb82642fcc15
+  languageName: node
+  linkType: hard
+
 "@metamask/jazzicon@npm:^2.0.0":
   version: 2.0.0
   resolution: "@metamask/jazzicon@npm:2.0.0"
@@ -25341,7 +25362,7 @@ __metadata:
     "@metamask/ethjs-contract": "npm:^0.4.1"
     "@metamask/ethjs-query": "npm:^0.7.1"
     "@metamask/forwarder": "npm:^1.1.0"
-    "@metamask/gas-fee-controller": "npm:^15.1.2"
+    "@metamask/gas-fee-controller": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch"
     "@metamask/jazzicon": "npm:^2.0.0"
     "@metamask/keyring-api": "npm:^3.0.0"
     "@metamask/keyring-controller": "patch:@metamask/keyring-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-13.0.0-d94816a680.patch"

From 46ea799117510e42c1951ed999b2c0f31548c5c6 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 14 Jun 2024 13:09:15 -0230
Subject: [PATCH 036/236] Update changelog for v11.16.11

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a5a2c7e8f15..4ecdfdf7025d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [11.16.11]
+### Fixed
+- Ensure network requests for phishing lists are not sent if the Basic Functionality Toggle is off ([#25306](https://github.com/MetaMask/metamask-extension/pull/25306))
 
 ## [11.16.10]
 ### Fixed
@@ -4810,7 +4812,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.11...HEAD
+[11.16.11]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...v11.16.11
 [11.16.10]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...v11.16.10
 [11.16.9]: https://github.com/MetaMask/metamask-extension/compare/v11.16.8...v11.16.9
 [11.16.8]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v11.16.8

From a115615e29471b161aab0fe7ea2767288e730c37 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 14 Jun 2024 14:40:58 -0230
Subject: [PATCH 037/236] Cherry pick 743f5ec pr25306 to v11.16.11 (#25333)

Cherry-picks #25306 (743f5ec) to v11.16.11
---
 app/scripts/metamask-controller.js                  |  8 ++++++--
 test/e2e/tests/privacy/basic-functionality.spec.js  |  7 +++++++
 .../privacy-settings/privacy-settings.js            | 13 ++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index dcc761386ac7..61a24aabc839 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -834,8 +834,6 @@ export default class MetamaskController extends EventEmitter {
       stalelistRefreshInterval: process.env.IN_TEST ? 30 * SECOND : undefined,
     });
 
-    this.phishingController.maybeUpdateState();
-
     ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
     this.ppomController = new PPOMController({
       messenger: this.controllerMessenger.getRestricted({
@@ -2270,7 +2268,13 @@ export default class MetamaskController extends EventEmitter {
   }
 
   postOnboardingInitialization() {
+    const { usePhishDetect } = this.preferencesController.store.getState();
+
     this.networkController.lookupNetwork();
+
+    if (usePhishDetect) {
+      this.phishingController.maybeUpdateState();
+    }
   }
 
   triggerNetworkrequests() {
diff --git a/test/e2e/tests/privacy/basic-functionality.spec.js b/test/e2e/tests/privacy/basic-functionality.spec.js
index eea5e02229a4..99ee75b46c0b 100644
--- a/test/e2e/tests/privacy/basic-functionality.spec.js
+++ b/test/e2e/tests/privacy/basic-functionality.spec.js
@@ -7,10 +7,17 @@ const {
   tinyDelayMs,
   defaultGanacheOptions,
 } = require('../../helpers');
+const { METAMASK_STALELIST_URL } = require('../phishing-controller/helpers');
 const FixtureBuilder = require('../../fixture-builder');
 
 async function mockApis(mockServer) {
   return [
+    await mockServer.forGet(METAMASK_STALELIST_URL).thenCallback(() => {
+      return {
+        statusCode: 200,
+        body: [{ fakedata: true }],
+      };
+    }),
     await mockServer
       .forGet('https://token-api.metaswap.codefi.network/tokens/1')
       .thenCallback(() => {
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index f4597bdc81d6..8613011028e7 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -66,7 +66,6 @@ export default function PrivacySettings() {
   const defaultState = useSelector((state) => state.metamask);
   const {
     incomingTransactionsPreferences,
-    usePhishDetect,
     use4ByteResolution,
     useTokenDetection,
     useCurrencyRateCheck,
@@ -77,8 +76,7 @@ export default function PrivacySettings() {
   } = defaultState;
   const petnamesEnabled = useSelector(getPetnamesEnabled);
 
-  const [usePhishingDetection, setUsePhishingDetection] =
-    useState(usePhishDetect);
+  const [usePhishingDetection, setUsePhishingDetection] = useState(null);
   const [turnOn4ByteResolution, setTurnOn4ByteResolution] =
     useState(use4ByteResolution);
   const [turnOnTokenDetection, setTurnOnTokenDetection] =
@@ -107,9 +105,14 @@ export default function PrivacySettings() {
     getExternalServicesOnboardingToggleState,
   );
 
+  const phishingToggleState =
+    usePhishingDetection === null
+      ? externalServicesOnboardingToggleState
+      : usePhishingDetection;
+
   const handleSubmit = () => {
     dispatch(toggleExternalServices(externalServicesOnboardingToggleState));
-    dispatch(setUsePhishDetect(usePhishingDetection));
+    dispatch(setUsePhishDetect(phishingToggleState));
     dispatch(setUse4ByteResolution(turnOn4ByteResolution));
     dispatch(setUseTokenDetection(turnOnTokenDetection));
     dispatch(
@@ -198,7 +201,7 @@ export default function PrivacySettings() {
             incomingTransactionsPreferences={incomingTransactionsPreferences}
           />
           <Setting
-            value={usePhishingDetection}
+            value={phishingToggleState}
             setValue={setUsePhishingDetection}
             title={t('usePhishingDetection')}
             description={t('onboardingUsePhishingDetectionDescription', [

From 7253f7811b308826711366b052506ed98a2388f8 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 14 Jun 2024 13:17:43 -0230
Subject: [PATCH 038/236] v11.16.12

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ecdfdf7025d..e80a262e0a34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.12]
+
 ## [11.16.11]
 ### Fixed
 - Ensure network requests for phishing lists are not sent if the Basic Functionality Toggle is off ([#25306](https://github.com/MetaMask/metamask-extension/pull/25306))
@@ -4812,7 +4814,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.11...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...HEAD
+[11.16.12]: https://github.com/MetaMask/metamask-extension/compare/v11.16.11...v11.16.12
 [11.16.11]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...v11.16.11
 [11.16.10]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...v11.16.10
 [11.16.9]: https://github.com/MetaMask/metamask-extension/compare/v11.16.8...v11.16.9
diff --git a/package.json b/package.json
index 529fddaa57bb..42277b241088 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.11",
+  "version": "11.16.12",
   "private": true,
   "repository": {
     "type": "git",

From 7e33b3948a35a73b864dbd1ed72f30eac1a7d68e Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Fri, 14 Jun 2024 21:47:10 +0100
Subject: [PATCH 039/236] v12.0.0 fix: notification detail network fee broke
 application (#25315) (#25318)
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**

Ensures that the notification modal screen does not crash due to bad
inputs.
This was due to some bad type assertions, and we did not receive the
correct value expected for a function. A crash was caused due to trying
to `.split()` on an undefined.
This adds some safer logic and also fixes the area that call the
function with the wrong inputs.

PR: https://github.com/MetaMask/metamask-extension/pull/25315
Commit Hash:
[0d32814de1c31f49d00088359c84a6d54a496c5a](https://github.com/MetaMask/metamask-extension/commit/0d32814de1c31f49d00088359c84a6d54a496c5a)

There were no merge conflicts when picking these commits.

<!--
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/25315?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Create a MATIC send/receive notification
2. Open details
3. See crash

## **Screenshots/Recordings**

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

### **Before**

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


![image](https://github.com/MetaMask/metamask-extension/assets/17534261/5708ddee-ad6c-4470-98c2-244d5caf7a04)

### **After**

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

![Screenshot 2024-06-14 at 12 34
11](https://github.com/MetaMask/metamask-extension/assets/17534261/4ee28636-9ef8-4f7e-9270-570940ebbe29)


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 ...ification-detail-block-explorer-button.tsx |  2 +-
 ui/helpers/utils/notification.util.ts         | 33 +++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
index 572762578d4b..23237a70a0c7 100644
--- a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
+++ b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
@@ -27,7 +27,7 @@ export const NotificationDetailBlockExplorerButton = ({
 
   const chainIdHex = decimalToHex(chainId);
   const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
-    `0x${chainId}` as keyof typeof CHAIN_IDS,
+    `0x${chainIdHex}` as keyof typeof CHAIN_IDS,
   );
 
   const defaultNetworks: NetworkConfiguration[] = useSelector(getAllNetworks);
diff --git a/ui/helpers/utils/notification.util.ts b/ui/helpers/utils/notification.util.ts
index 31be80d4d8de..0ecafa5f0bcb 100644
--- a/ui/helpers/utils/notification.util.ts
+++ b/ui/helpers/utils/notification.util.ts
@@ -267,8 +267,8 @@ export function getNetworkDetailsByChainId(chainId?: keyof typeof CHAIN_IDS): {
   nativeBlockExplorerUrl?: string;
 } {
   const fullNativeCurrencyName =
-    NETWORK_TO_NAME_MAP[chainId as keyof typeof NETWORK_TO_NAME_MAP];
-  const nativeCurrencyName = fullNativeCurrencyName.split(' ')[0];
+    NETWORK_TO_NAME_MAP[chainId as keyof typeof NETWORK_TO_NAME_MAP] ?? '';
+  const nativeCurrencyName = fullNativeCurrencyName.split(' ')[0] ?? '';
   const nativeCurrencySymbol =
     CHAIN_ID_TO_CURRENCY_SYMBOL_MAP[
       chainId as keyof typeof CHAIN_ID_TO_CURRENCY_SYMBOL_MAP
@@ -320,6 +320,8 @@ export function formatIsoDateString(isoDateString: string) {
   return formattedDate;
 }
 
+export type HexChainId = (typeof CHAIN_IDS)[keyof typeof CHAIN_IDS];
+
 /**
  * Retrieves the RPC URL associated with a given chain ID.
  *
@@ -329,10 +331,8 @@ export function formatIsoDateString(isoDateString: string) {
  * @param chainId - The chain ID for which the RPC URL is required.
  * @returns The RPC URL associated with the given chain ID, or undefined if no match is found.
  */
-export function getRpcUrlByChainId(chainId: keyof typeof CHAIN_IDS): string {
-  const rpc = FEATURED_RPCS.find(
-    (rpcItem) => rpcItem.chainId === CHAIN_IDS[chainId],
-  );
+export function getRpcUrlByChainId(chainId: HexChainId): string {
+  const rpc = FEATURED_RPCS.find((rpcItem) => rpcItem.chainId === chainId);
 
   // If rpc is found, return its URL. Otherwise, return a default URL based on the chainId.
   if (rpc) {
@@ -340,19 +340,19 @@ export function getRpcUrlByChainId(chainId: keyof typeof CHAIN_IDS): string {
   }
   // Fallback RPC URLs based on the chainId
   switch (chainId) {
-    case 'MAINNET':
+    case CHAIN_IDS.MAINNET:
       return MAINNET_RPC_URL;
-    case 'GOERLI':
+    case CHAIN_IDS.GOERLI:
       return GOERLI_RPC_URL;
-    case 'SEPOLIA':
+    case CHAIN_IDS.SEPOLIA:
       return SEPOLIA_RPC_URL;
-    case 'LINEA_GOERLI':
+    case CHAIN_IDS.LINEA_GOERLI:
       return LINEA_GOERLI_RPC_URL;
-    case 'LINEA_SEPOLIA':
+    case CHAIN_IDS.LINEA_SEPOLIA:
       return LINEA_SEPOLIA_RPC_URL;
-    case 'LINEA_MAINNET':
+    case CHAIN_IDS.LINEA_MAINNET:
       return LINEA_MAINNET_RPC_URL;
-    case 'LOCALHOST':
+    case CHAIN_IDS.LOCALHOST:
       return LOCALHOST_RPC_URL;
     default:
       // Default to MAINNET if no match is found
@@ -371,12 +371,9 @@ export const getNetworkFees = async (notification: OnChainRawNotification) => {
     throw new Error('Invalid notification type');
   }
 
-  // eslint-disable-next-line camelcase
-  const { chain_id } = notification;
-  const chainId = decimalToHex(chain_id);
-
+  const chainId = decimalToHex(notification.chain_id);
   const provider = new JsonRpcProvider(
-    getRpcUrlByChainId(`0x${chainId}` as keyof typeof CHAIN_IDS),
+    getRpcUrlByChainId(`0x${chainId}` as HexChainId),
   );
 
   if (!provider) {

From c788598e345e4c7b0fa348982368c70c7d8810b4 Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Fri, 14 Jun 2024 15:54:13 -0500
Subject: [PATCH 040/236] fix(cherry-pick): Fix
 `wallet_addEthereumChain`/`wallet_switchEthereumChain` error handling bug
 (#25339)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
A bug was introduced in
https://github.com/MetaMask/metamask-extension/pull/24415, where user
rejected request errors are not correctly handled in either
`wallet_switchEthereumChain` nor `wallet_addEthereumChain` calls.

At first we thought his just resulted in incorrect errors being returned
to dapps when users clicked cancel on `wallet_switchEthereumChain` calls
but it turns out this incorrect error handling results in very strange
and severe bugs when subsequent requests are enqueued in the
`QueuedRequestController` - the functionality of which is turned on by
default in release v12.0.0. See the `Before` video below.

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

## **Related issues**

See:
https://consensys.slack.com/archives/CTQAGKY5V/p1718385169900809?thread_ts=1718140104.578969&cid=CTQAGKY5V

## **Manual testing steps**
(have gnosis chain added to the wallet)
1. Go to https://metamask.github.io/test-dapp/ and connect
2. Go to
https://docs.metamask.io/wallet/reference/wallet_switchethereumchain/
3. Submit the switch chain request on the dapp but do not confirm or
reject the confirmation
4. Go back to https://metamask.github.io/test-dapp/
5. Click `Send EIP-1559 Transaction`, see that the badge number in the
MM tray icon increments
6. Open the pop up and cancel the still pending switchChain confirmation
7. You should see the transactions you initiated on
https://metamask.github.io/test-dapp/ pop up now

## **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/34557516/a1e355d3-b39f-4670-975c-99beb878e75b

### **After**


https://github.com/MetaMask/metamask-extension/assets/34557516/60fb422b-cb63-4e6f-9be7-0065f9a52143

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../handlers/ethereum-chain-utils.js           | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js b/app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js
index 38e35897d53f..8b10cbb9cd6f 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js
@@ -230,11 +230,19 @@ export async function switchChain(
     await setActiveNetwork(networkClientId);
     res.result = null;
   } catch (error) {
-    return end(
-      error.code === errorCodes.provider.userRejectedRequest
-        ? undefined
-        : error,
-    );
+    // We don't want to return an error if user rejects the request
+    // and this is a chained switch request after wallet_addEthereumChain.
+    // approvalFlowId is only defined when this call is of a
+    // wallet_addEthereumChain request so we can use it to determine
+    // if we should return an error
+    if (
+      error.code === errorCodes.provider.userRejectedRequest &&
+      approvalFlowId
+    ) {
+      res.result = null;
+      return end();
+    }
+    return end(error);
   } finally {
     if (approvalFlowId) {
       endApprovalFlow({ id: approvalFlowId });

From aba68fdbfba0951fa0703c6e60afbcdf2ecc9d0f Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 14 Jun 2024 15:58:10 -0500
Subject: [PATCH 041/236] fix (cherry-pick): UX: NetworkList: Ensure
 setNetworkClientIdForDomain is called for test networks (#25184) (#25260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Cuts down the duplication of the NetworkListItem and ensures that
`setNetworkClientIdForDomain` is called for test networks so that
manually choosing a test network sends a signal to the dapp to change
chain.

PR: #25195
Commit Hash:
[c67aa3f](c67aa3f)

There were no merge conflicts when picking these commits.

<!--
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/25070?quickstart=1)

## **Related issues**

Fixes: The current Profile Syncing Feature doesn't fully respect Basic
Functionality when turned off. This ensures that the notifications
feature and profile syncing are actually turned off when Basic
Functionality if off.

## **Manual testing steps**

1. Go to a given dapp, connect using Ethereum Mainnet
2. Manually open MetaMask, click the network picker, choose Sepolia
3. See dapp change to sepolia

## **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.


<!--
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?
4. What is the improvement/solution?
-->

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25184?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
5.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.<!--
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/25260?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Brian Bergeron <brian.e.bergeron@gmail.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
---
 .../network-list-menu/network-list-menu.js    | 163 ++++++++----------
 1 file changed, 68 insertions(+), 95 deletions(-)

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 26e6e3d94007..33832a0a9f88 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.js
+++ b/ui/components/multichain/network-list-menu/network-list-menu.js
@@ -173,6 +173,62 @@ export const NetworkListMenu = ({ onClose }) => {
     );
   }
 
+  const generateNetworkListItem = ({
+    network,
+    isCurrentNetwork,
+    canDeleteNetwork,
+  }) => {
+    return (
+      <NetworkListItem
+        name={network.nickname}
+        iconSrc={network?.rpcPrefs?.imageUrl}
+        key={network.id}
+        selected={isCurrentNetwork}
+        focus={isCurrentNetwork && !showSearch}
+        onClick={() => {
+          dispatch(toggleNetworkMenu());
+          if (network.providerType) {
+            dispatch(setProviderType(network.providerType));
+          } 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 (useRequestQueue && selectedTabOrigin) {
+            setNetworkClientIdForDomain(selectedTabOrigin, network.id);
+          }
+
+          trackEvent({
+            event: MetaMetricsEventName.NavNetworkSwitched,
+            category: MetaMetricsEventCategory.Network,
+            properties: {
+              location: 'Network Menu',
+              chain_id: currentChainId,
+              from_network: currentChainId,
+              to_network: network.chainId,
+            },
+          });
+        }}
+        onDeleteClick={
+          canDeleteNetwork
+            ? () => {
+                dispatch(toggleNetworkMenu());
+                dispatch(
+                  showModal({
+                    name: 'CONFIRM_DELETE_NETWORK',
+                    target: network.id,
+                    onConfirm: () => undefined,
+                  }),
+                );
+              }
+            : null
+        }
+      />
+    );
+  };
+
   const generateMenuItems = (desiredNetworks) => {
     return desiredNetworks.map((network) => {
       const isCurrentNetwork =
@@ -182,47 +238,11 @@ export const NetworkListMenu = ({ onClose }) => {
       const canDeleteNetwork =
         isUnlocked && !isCurrentNetwork && network.removable;
 
-      return (
-        <NetworkListItem
-          name={network.nickname}
-          iconSrc={network?.rpcPrefs?.imageUrl}
-          key={network.id}
-          selected={isCurrentNetwork}
-          focus={isCurrentNetwork && !showSearch}
-          onClick={() => {
-            dispatch(toggleNetworkMenu());
-            if (network.providerType) {
-              dispatch(setProviderType(network.providerType));
-            } else {
-              dispatch(setActiveNetwork(network.id));
-            }
-            trackEvent({
-              event: MetaMetricsEventName.NavNetworkSwitched,
-              category: MetaMetricsEventCategory.Network,
-              properties: {
-                location: 'Network Menu',
-                chain_id: currentChainId,
-                from_network: currentChainId,
-                to_network: network.chainId,
-              },
-            });
-          }}
-          onDeleteClick={
-            canDeleteNetwork
-              ? () => {
-                  dispatch(toggleNetworkMenu());
-                  dispatch(
-                    showModal({
-                      name: 'CONFIRM_DELETE_NETWORK',
-                      target: network.id,
-                      onConfirm: () => undefined,
-                    }),
-                  );
-                }
-              : null
-          }
-        />
-      );
+      return generateNetworkListItem({
+        network,
+        isCurrentNetwork,
+        canDeleteNetwork,
+      });
     });
   };
 
@@ -328,6 +348,12 @@ export const NetworkListMenu = ({ onClose }) => {
                         const canDeleteNetwork =
                           isUnlocked && !isCurrentNetwork && network.removable;
 
+                        const networkListItem = generateNetworkListItem({
+                          network,
+                          isCurrentNetwork,
+                          canDeleteNetwork,
+                        });
+
                         return (
                           <Draggable
                             key={network.id}
@@ -340,60 +366,7 @@ export const NetworkListMenu = ({ onClose }) => {
                                 {...providedDrag.draggableProps}
                                 {...providedDrag.dragHandleProps}
                               >
-                                <NetworkListItem
-                                  name={network.nickname}
-                                  iconSrc={network?.rpcPrefs?.imageUrl}
-                                  key={network.id}
-                                  selected={isCurrentNetwork}
-                                  focus={isCurrentNetwork && !showSearch}
-                                  onClick={() => {
-                                    dispatch(toggleNetworkMenu());
-                                    if (network.providerType) {
-                                      dispatch(
-                                        setProviderType(network.providerType),
-                                      );
-                                    } 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 (useRequestQueue && selectedTabOrigin) {
-                                      setNetworkClientIdForDomain(
-                                        selectedTabOrigin,
-                                        network.id,
-                                      );
-                                    }
-
-                                    trackEvent({
-                                      event:
-                                        MetaMetricsEventName.NavNetworkSwitched,
-                                      category:
-                                        MetaMetricsEventCategory.Network,
-                                      properties: {
-                                        location: 'Network Menu',
-                                        chain_id: currentChainId,
-                                        from_network: currentChainId,
-                                        to_network: network.chainId,
-                                      },
-                                    });
-                                  }}
-                                  onDeleteClick={
-                                    canDeleteNetwork
-                                      ? () => {
-                                          dispatch(toggleNetworkMenu());
-                                          dispatch(
-                                            showModal({
-                                              name: 'CONFIRM_DELETE_NETWORK',
-                                              target: network.id,
-                                              onConfirm: () => undefined,
-                                            }),
-                                          );
-                                        }
-                                      : null
-                                  }
-                                />
+                                {networkListItem}
                               </Box>
                             )}
                           </Draggable>

From c6dbd721be12fdfd242c4b36acb1c0900e864a2f Mon Sep 17 00:00:00 2001
From: Jony Bursztyn <jony.bursztyn@consensys.net>
Date: Wed, 12 Jun 2024 16:38:05 +0200
Subject: [PATCH 042/236] feat: adds "data collection for marketing" toggles
 (#24605)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds data collection for marketing toggles (and toasts/warnings) on:
- Onboarding
- Toast in Wallet
- Settings page

<!--
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.
-->

<!--
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/24605?quickstart=1)

Fixes:
https://github.com/MetaMask/MetaMask-planning/issues/2437
https://github.com/MetaMask/MetaMask-planning/issues/2438
https://github.com/MetaMask/MetaMask-planning/issues/2526

Onboarding checkbox:
Make the `metametrics.js` to return `renderOnboarding` instead of
`renderLegacyOnboarding`
1. Start a new account
2. There should be a new checkbox that asks for marketing consent
3. Checking it should set the marketing consent to true (check at
Settings, Securty tab page)

Security tab:
1. Go to Security tab
2. When checking the "Data collection for marketing" to `true`, the
"Participate in MetaMetrics" toggle should turn to `true`
3. When checking "Participate in MetaMetrics" to `false`, "Data
collection for marketing" should be set to `false`
4. When "Participate in Metametrics" is `true` and "Data collection for
marketing" is `true`, and the latter is set to `false`, a warning
message should appear.

Toast:
An already onboarded user will have the "dataCollectionForMarketing"
value as `null` (neither `true` or `false`). This will trigger the
toast.
1. By clicking on "I accept", it should set the "Data collection for
marketing" to `true`.
2. By closing the toast or clicking on "No thanks", it should set the
"Data collection for marketing" to `false`.

All of these actions should trigger subsequent Segment events.

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

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

<img width="646" alt="Screenshot 2024-05-20 at 14 19 53"
src="https://github.com/MetaMask/metamask-extension/assets/11148144/a13b70ec-1d89-4e9f-8df1-2096dd56e642">

https://github.com/MetaMask/metamask-extension/assets/11148144/5eb59902-768d-4d07-a112-5aeb5471587d

- [ ] 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.

- [ ] 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: Mircea Nistor <mirceanis@gmail.com>
Co-authored-by: NidhiKJha <menidhikjha@gmail.com>
Co-authored-by: David Walsh <davidwalsh83@gmail.com>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
---
 app/_locales/en/messages.json                 |  46 +++
 app/scripts/controllers/metametrics.js        |  11 +
 app/scripts/lib/setupSentry.js                |   1 +
 app/scripts/metamask-controller.js            |   4 +
 shared/constants/metametrics.ts               |   9 +
 test/e2e/default-fixture.js                   | 265 ++++++++++++++++++
 ...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 +
 ui/components/ui/popover/index.scss           |   4 +
 ui/components/ui/popover/popover.component.js |   6 +
 ui/ducks/metamask/metamask.js                 |   7 +
 ui/helpers/constants/common.ts                |   3 +
 ui/pages/home/home.component.js               | 117 +++++++-
 ui/pages/home/home.container.js               |   7 +
 ui/pages/home/index.scss                      |   8 +
 .../__snapshots__/metametrics.test.js.snap    | 151 ++++++++++
 .../metametrics/metametrics.js                |  42 ++-
 .../metametrics/metametrics.test.js           |  40 ++-
 .../__snapshots__/security-tab.test.js.snap   |  68 +++++
 .../metametrics-toggle.test.tsx               |  88 ++++++
 .../metametrics-toggle/metametrics-toggle.tsx | 130 +++++++++
 .../security-tab/security-tab.component.js    | 148 +++++++++-
 .../security-tab/security-tab.container.js    |   5 +
 ui/selectors/metametrics.js                   |   6 +
 ui/store/actionConstants.ts                   |   2 +
 ui/store/actions.ts                           |  20 ++
 28 files changed, 1183 insertions(+), 9 deletions(-)
 create mode 100644 test/e2e/default-fixture.js
 create mode 100644 ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
 create mode 100644 ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 4e932f8a21e4..16ee36ce2b0e 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1217,6 +1217,18 @@
   "dataBackupSeemsCorrupt": {
     "message": "Can not restore your data. The file appears to be corrupt."
   },
+  "dataCollectionForMarketing": {
+    "message": "Data collection for marketing"
+  },
+  "dataCollectionForMarketingDescription": {
+    "message": "We'll use MetaMetrics to learn how you interact with our marketing communications. We may share relevant news (like product features and other materials)."
+  },
+  "dataCollectionWarningPopoverButton": {
+    "message": "Okay"
+  },
+  "dataCollectionWarningPopoverDescription": {
+    "message": "You turned off data collection for our marketing purposes. This only applies to this device. If you use MetaMask on other devices, make sure to opt out there as well."
+  },
   "dataHex": {
     "message": "Hex"
   },
@@ -3209,6 +3221,37 @@
   "on": {
     "message": "On"
   },
+  "onboardedMetametricsAccept": {
+    "message": "I agree"
+  },
+  "onboardedMetametricsDisagree": {
+    "message": "No thanks"
+  },
+  "onboardedMetametricsKey1": {
+    "message": "Latest developments"
+  },
+  "onboardedMetametricsKey2": {
+    "message": "Product features"
+  },
+  "onboardedMetametricsKey3": {
+    "message": "Other relevant promotional materials"
+  },
+  "onboardedMetametricsLink": {
+    "message": "MetaMetrics"
+  },
+  "onboardedMetametricsParagraph1": {
+    "message": "In addition to $1, we'd like to use data to understand how you interact with marketing communications.",
+    "description": "$1 represents the 'onboardedMetametricsLink' locale string"
+  },
+  "onboardedMetametricsParagraph2": {
+    "message": "This helps us personalize what we share with you, like:"
+  },
+  "onboardedMetametricsParagraph3": {
+    "message": "Remember, we never sell the data you provide and you can opt out any time."
+  },
+  "onboardedMetametricsTitle": {
+    "message": "Help us enhance your experience"
+  },
   "onboarding": {
     "message": "Onboarding"
   },
@@ -3326,6 +3369,9 @@
   "onboardingMetametricsTitle": {
     "message": "Help us improve MetaMask"
   },
+  "onboardingMetametricsUseDataCheckbox": {
+    "message": "We’ll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features)."
+  },
   "onboardingPinExtensionBillboardAccess": {
     "message": "Full access"
   },
diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index c79733e0b0bd..2e8b09e46582 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -154,6 +154,7 @@ export default class MetaMetricsController {
     this.store = new ObservableStore({
       participateInMetaMetrics: null,
       metaMetricsId: null,
+      dataCollectionForMarketing: null,
       eventsBeforeMetricsOptIn: [],
       traits: {},
       previousUserTraits: {},
@@ -475,6 +476,12 @@ export default class MetaMetricsController {
     return metaMetricsId;
   }
 
+  setDataCollectionForMarketing(dataCollectionForMarketing) {
+    const { metaMetricsId } = this.state;
+    this.store.updateState({ dataCollectionForMarketing });
+    return metaMetricsId;
+  }
+
   get state() {
     return this.store.getState();
   }
@@ -818,6 +825,10 @@ export default class MetaMetricsController {
         metamaskState.securityAlertsEnabled ? ['blockaid'] : [],
       [MetaMetricsUserTrait.PetnameAddressCount]:
         this._getPetnameAddressCount(metamaskState),
+      [MetaMetricsUserTrait.IsMetricsOptedIn]:
+        metamaskState.participateInMetaMetrics,
+      [MetaMetricsUserTrait.HasMarketingConsent]:
+        metamaskState.dataCollectionForMarketing,
     };
 
     if (!previousUserTraits) {
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index acefee2d2825..1e6f82042a4f 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -154,6 +154,7 @@ export const SENTRY_BACKGROUND_STATE = {
     previousUserTraits: false,
     segmentApiCalls: false,
     traits: false,
+    dataCollectionForMarketing: false,
   },
   NameController: {
     names: false,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 61a24aabc839..b42b8c208bbb 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2990,6 +2990,10 @@ export default class MetamaskController extends EventEmitter {
         metaMetricsController.setParticipateInMetaMetrics.bind(
           metaMetricsController,
         ),
+      setDataCollectionForMarketing:
+        metaMetricsController.setDataCollectionForMarketing.bind(
+          metaMetricsController,
+        ),
       setCurrentLocale: preferencesController.setCurrentLocale.bind(
         preferencesController,
       ),
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index fc722c42ccc5..f913ed946063 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -383,6 +383,14 @@ export type MetaMetricsUserTraits = {
 };
 
 export enum MetaMetricsUserTrait {
+  /**
+   * Identifies if the user has opted in for MetaMetrics
+   */
+  IsMetricsOptedIn = 'is_metrics_opted_in',
+  /**
+   * Identifies is the user has given marketing consent
+   */
+  HasMarketingConsent = 'has_marketing_consent',
   /**
    * Identified when the user adds or modifies addresses in the address book.
    */
@@ -505,6 +513,7 @@ export enum MetaMetricsEventName {
   AccountRenamed = 'Account Renamed',
   ActivityDetailsOpened = 'Activity Details Opened',
   ActivityDetailsClosed = 'Activity Details Closed',
+  AnalyticsPreferenceSelected = 'Analytics Preference Selected',
   AppInstalled = 'App Installed',
   AppUnlocked = 'App Unlocked',
   AppUnlockedFailed = 'App Unlocked Failed',
diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
new file mode 100644
index 000000000000..98413671caca
--- /dev/null
+++ b/test/e2e/default-fixture.js
@@ -0,0 +1,265 @@
+const { NetworkStatus } = require('@metamask/network-controller');
+const { CHAIN_IDS } = require('../../shared/constants/network');
+const { FirstTimeFlowType } = require('../../shared/constants/onboarding');
+
+const FIXTURE_STATE_METADATA_VERSION = 74;
+
+const E2E_SRP =
+  'spread raise short crane omit tent fringe mandate neglect detail suspect cradle';
+
+function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
+  return {
+    data: {
+      AuthenticationController: {
+        isSignedIn: true,
+      },
+      UserStorageController: {
+        isProfileSyncingEnabled: true,
+      },
+      MetamaskNotificationsController: {
+        subscriptionAccountsSeen: [],
+        isFeatureAnnouncementsEnabled: false,
+        isMetamaskNotificationsEnabled: false,
+        isMetamaskNotificationsFeatureSeen: false,
+        metamaskNotificationsList: [],
+        metamaskNotificationsReadList: [],
+      },
+      AccountsController: {
+        internalAccounts: {
+          selectedAccount: 'd5e45e4a-3b04-4a09-a5e1-39762e5c6be4',
+          accounts: {
+            'd5e45e4a-3b04-4a09-a5e1-39762e5c6be4': {
+              id: 'd5e45e4a-3b04-4a09-a5e1-39762e5c6be4',
+              address: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+              metadata: {
+                name: 'Account 1',
+                lastSelected: 1665507600000,
+                keyring: {
+                  type: 'HD Key Tree',
+                },
+              },
+              options: {},
+              methods: [
+                'personal_sign',
+                'eth_sign',
+                'eth_signTransaction',
+                'eth_signTypedData_v1',
+                'eth_signTypedData_v3',
+                'eth_signTypedData_v4',
+              ],
+              type: 'eip155:eoa',
+            },
+          },
+        },
+      },
+      AlertController: {
+        alertEnabledness: {
+          unconnectedAccount: true,
+          web3ShimUsage: true,
+        },
+        unconnectedAccountAlertShownOrigins: {},
+        web3ShimUsageOrigins: {},
+      },
+      AnnouncementController: {
+        announcements: {
+          8: {
+            date: '2021-11-01',
+            id: 8,
+            isShown: false,
+          },
+        },
+      },
+      NetworkOrderController: {
+        orderedNetworkList: [
+          {
+            networkId: '0x1',
+            networkRpcUrl:
+              'https://mainnet.infura.io/v3/00000000000000000000000000000000',
+          },
+          {
+            networkId: '0xe708',
+            networkRpcUrl:
+              'https://linea-mainnet.infura.io/v3/00000000000000000000000000000000',
+          },
+          {
+            networkId: '0x539',
+            networkRpcUrl: 'http://localhost:8545',
+          },
+        ],
+      },
+      AccountOrderController: {
+        pinnedAccountList: [],
+        hiddenAccountList: [],
+      },
+      AppStateController: {
+        browserEnvironment: {},
+        nftsDropdownState: {},
+        connectedStatusPopoverHasBeenShown: true,
+        termsOfUseLastAgreed:
+          '__FIXTURE_SUBSTITUTION__currentDateInMilliseconds',
+        defaultHomeActiveTabName: null,
+        fullScreenGasPollTokens: [],
+        notificationGasPollTokens: [],
+        popupGasPollTokens: [],
+        qrHardware: {},
+        recoveryPhraseReminderHasBeenShown: true,
+        recoveryPhraseReminderLastShown:
+          '__FIXTURE_SUBSTITUTION__currentDateInMilliseconds',
+        showTestnetMessageInDropdown: true,
+        trezorModel: null,
+        usedNetworks: {
+          [CHAIN_IDS.MAINNET]: true,
+          [CHAIN_IDS.LINEA_MAINNET]: true,
+          [CHAIN_IDS.GOERLI]: true,
+          [CHAIN_IDS.LOCALHOST]: true,
+        },
+        snapsInstallPrivacyWarningShown: true,
+      },
+      CurrencyController: {
+        currentCurrency: 'usd',
+        currencyRates: {
+          ETH: {
+            conversionDate: 1665507600.0,
+            conversionRate: 1700.0,
+            usdConversionRate: 1700.0,
+          },
+        },
+      },
+      GasFeeController: {
+        estimatedGasFeeTimeBounds: {},
+        gasEstimateType: 'none',
+        gasFeeEstimates: {},
+      },
+      KeyringController: {
+        vault:
+          '{"data":"WHaP1FrrtV4zUonudIppDifsLHF39g6oPkVksAIdWAHBRzax1uy1asfAJprR7u72t4/HuYz5yPIFQrnNnv+hwQu9GRuty88VKMnvMy+sq8MNtoXI+C54bZpWa8r4iUQfa0Mj/cfJbpFpzOdF1ZYXahTfTcU5WsrHwvJew842CiJR4B2jmCHHXfm/DxLK3WazsVQwXJGx/U71UelGoOOrT8NI28EKrAwgPn+7Xmv0j92gmhau30N7Bo2fr6Zv","iv":"LfD8/tY1EjXzxuemSmDVdA==","keyMetadata":{"algorithm":"PBKDF2","params":{"iterations":600000}},"salt":"nk4xdpmMR+1s5BYe4Vnk++XAQwrISI2bCtbMg7V1wUA="}',
+      },
+      MetaMetricsController: {
+        eventsBeforeMetricsOptIn: [],
+        fragments: {},
+        metaMetricsId: null,
+        participateInMetaMetrics: false,
+        dataCollectionForMarketing: false,
+        traits: {},
+      },
+      NetworkController: {
+        selectedNetworkClientId: 'networkConfigurationId',
+        networksMetadata: {
+          networkConfigurationId: {
+            EIPS: {},
+            status: NetworkStatus.Available,
+          },
+        },
+        providerConfig: {
+          chainId: inputChainId,
+          nickname: 'Localhost 8545',
+          rpcPrefs: {},
+          rpcUrl: 'http://localhost:8545',
+          ticker: 'ETH',
+          type: 'rpc',
+          id: 'networkConfigurationId',
+        },
+        networkConfigurations: {
+          networkConfigurationId: {
+            chainId: inputChainId,
+            nickname: 'Localhost 8545',
+            rpcPrefs: {},
+            rpcUrl: 'http://localhost:8545',
+            ticker: 'ETH',
+            networkConfigurationId: 'networkConfigurationId',
+          },
+        },
+      },
+      OnboardingController: {
+        completedOnboarding: true,
+        firstTimeFlowType: FirstTimeFlowType.import,
+        onboardingTabs: {},
+        seedPhraseBackedUp: true,
+      },
+      PermissionController: {
+        subjects: {},
+      },
+      PreferencesController: {
+        advancedGasFee: null,
+        currentLocale: 'en',
+        useExternalServices: true,
+        dismissSeedBackUpReminder: true,
+        featureFlags: {},
+        forgottenPassword: false,
+        identities: {
+          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': {
+            address: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+            lastSelected: 1665507600000,
+            name: 'Account 1',
+          },
+        },
+        ipfsGateway: 'dweb.link',
+        knownMethodData: {},
+        ledgerTransportType: 'webhid',
+        lostIdentities: {},
+        openSeaEnabled: false,
+        preferences: {
+          hideZeroBalanceTokens: false,
+          showExtensionInFullSizeView: false,
+          showFiatInTestnets: false,
+          showTestNetworks: false,
+          smartTransactionsOptInStatus: false,
+          useNativeCurrencyAsPrimaryCurrency: true,
+          petnamesEnabled: true,
+          showTokenAutodetectModal: false,
+        },
+        selectedAddress: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+        theme: 'light',
+        useBlockie: false,
+        useNftDetection: false,
+        useNonceField: false,
+        usePhishDetect: true,
+        useTokenDetection: false,
+        useCurrencyRateCheck: true,
+        useMultiAccountBalanceChecker: true,
+        useRequestQueue: true,
+      },
+      SelectedNetworkController: {
+        domains: {},
+      },
+      SmartTransactionsController: {
+        smartTransactionsState: {
+          fees: {},
+          liveness: true,
+          smartTransactions: {
+            [CHAIN_IDS.MAINNET]: [],
+          },
+        },
+      },
+      SubjectMetadataController: {
+        subjectMetadata: {
+          'https://metamask.github.io': {
+            extensionId: null,
+            iconUrl: null,
+            name: 'MetaMask < = > Ledger Bridge',
+            origin: 'https://metamask.github.io',
+            subjectType: 'website',
+          },
+        },
+      },
+      TokensController: {
+        allDetectedTokens: {},
+        allIgnoredTokens: {},
+        allTokens: {},
+        detectedTokens: [],
+        ignoredTokens: [],
+        tokens: [],
+      },
+      TransactionController: {
+        transactions: {},
+      },
+      config: {},
+      firstTimeInfo: {
+        date: 1665507600000,
+        version: '10.21.0',
+      },
+    },
+  };
+}
+
+module.exports = { defaultFixture, FIXTURE_STATE_METADATA_VERSION, E2E_SRP };
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index cd57263d9184..834d3a8b40c9 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -100,6 +100,7 @@
     "traits": "object",
     "previousUserTraits": "object",
     "fragments": "object",
+    "dataCollectionForMarketing": "boolean",
     "segmentApiCalls": "object"
   },
   "NameController": { "names": "object", "nameSources": "object" },
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index d64cfbaad9bb..0a911d93e9e4 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -39,6 +39,7 @@
     "knownMethodData": "object",
     "use4ByteResolution": true,
     "participateInMetaMetrics": true,
+    "dataCollectionForMarketing": "boolean",
     "nextNonce": null,
     "currencyRates": {
       "ETH": {
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index 46abd96e24bf..c9f273d36453 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -57,6 +57,7 @@
       "fragments": "object",
       "metaMetricsId": "fake-metrics-id",
       "participateInMetaMetrics": true,
+      "dataCollectionForMarketing": "boolean",
       "traits": "object"
     },
     "NetworkController": {
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index 14d2c7ea9f74..47d7d4f9a536 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -57,6 +57,7 @@
       "fragments": "object",
       "metaMetricsId": "fake-metrics-id",
       "participateInMetaMetrics": true,
+      "dataCollectionForMarketing": "boolean",
       "traits": "object"
     },
     "NetworkController": {
diff --git a/ui/components/ui/popover/index.scss b/ui/components/ui/popover/index.scss
index c657ef2f3764..a935508e7476 100644
--- a/ui/components/ui/popover/index.scss
+++ b/ui/components/ui/popover/index.scss
@@ -28,6 +28,10 @@
     &__title--center {
       flex: 1;
     }
+
+    &__title-wrap {
+      white-space: normal;
+    }
   }
 
   &-bg {
diff --git a/ui/components/ui/popover/popover.component.js b/ui/components/ui/popover/popover.component.js
index 261883c5666c..385f2896bb15 100644
--- a/ui/components/ui/popover/popover.component.js
+++ b/ui/components/ui/popover/popover.component.js
@@ -75,6 +75,7 @@ const Popover = ({
   showScrollDown,
   onScrollDownButtonClick,
   centerTitle,
+  wrapTitle,
   headerProps = defaultHeaderProps,
   contentProps = defaultContentProps,
   footerProps = defaultFooterProps,
@@ -106,6 +107,7 @@ const Popover = ({
         ) : null}
         <Text
           textAlign={centerTitle ? TextAlign.Center : TextAlign.Start}
+          className={wrapTitle ? 'popover-header__title-wrap' : null}
           ellipsis
           variant={TextVariant.headingSm}
           as="h2"
@@ -184,6 +186,10 @@ const Popover = ({
 };
 
 Popover.propTypes = {
+  /**
+   * Avoid wrapping title
+   */
+  wrapTitle: PropTypes.bool,
   /**
    * Show title of the popover
    */
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index 37b759b8334c..b8c17feb99a9 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -56,6 +56,7 @@ const initialState = {
   knownMethodData: {},
   use4ByteResolution: true,
   participateInMetaMetrics: null,
+  dataCollectionForMarketing: null,
   nextNonce: null,
   currencyRates: {
     ETH: {
@@ -162,6 +163,12 @@ export default function reduceMetamask(state = initialState, action) {
         participateInMetaMetrics: action.value,
       };
 
+    case actionConstants.SET_DATA_COLLECTION_FOR_MARKETING:
+      return {
+        ...metamaskState,
+        dataCollectionForMarketing: action.value,
+      };
+
     case actionConstants.CLOSE_WELCOME_SCREEN:
       return {
         ...metamaskState,
diff --git a/ui/helpers/constants/common.ts b/ui/helpers/constants/common.ts
index 0fcadbff3d6b..2b0d164b22c3 100644
--- a/ui/helpers/constants/common.ts
+++ b/ui/helpers/constants/common.ts
@@ -9,6 +9,9 @@ const _mmiWebSite = 'https://metamask.io/institutions/';
 export const MMI_WEB_SITE = _mmiWebSite;
 ///: END:ONLY_INCLUDE_IF
 
+// eslint-disable-next-line prefer-destructuring
+export const METAMETRICS_SETTINGS_LINK =
+  'https://support.metamask.io/privacy-and-security/how-to-manage-your-metametrics-settings';
 // eslint-disable-next-line prefer-destructuring
 export const SUPPORT_REQUEST_LINK = process.env.SUPPORT_REQUEST_LINK;
 export const CONTRACT_ADDRESS_LINK = _contractAddressLink;
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 62c584e46e4b..c5fadea188d9 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -21,6 +21,7 @@ import HomeNotification from '../../components/app/home-notification';
 import MultipleNotifications from '../../components/app/multiple-notifications';
 import TransactionList from '../../components/app/transaction-list';
 import Popover from '../../components/ui/popover';
+import Typography from '../../components/ui/typography/typography';
 import Button from '../../components/ui/button';
 import ConnectedSites from '../connected-sites';
 import ConnectedAccounts from '../connected-accounts';
@@ -37,10 +38,11 @@ import {
   ///: BEGIN:ONLY_INCLUDE_IF(build-main)
   Size,
   ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-mmi)
-  JustifyContent,
-  ///: END:ONLY_INCLUDE_IF
   Severity,
+  FlexDirection,
+  BlockSize,
+  AlignItems,
+  JustifyContent,
 } from '../../helpers/constants/design-system';
 import { SECOND } from '../../../shared/constants/time';
 import {
@@ -54,6 +56,12 @@ import {
   Text,
   Icon,
   BannerAlert,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
 } from '../../components/component-library';
 import {
   ASSET_ROUTE,
@@ -77,6 +85,7 @@ import {
   ///: END:ONLY_INCLUDE_IF
 } from '../../helpers/constants/routes';
 import ZENDESK_URLS from '../../helpers/constants/zendesk-url';
+import { METAMETRICS_SETTINGS_LINK } from '../../helpers/constants/common';
 import {
   ///: BEGIN:ONLY_INCLUDE_IF(build-main)
   SUPPORT_LINK,
@@ -163,9 +172,12 @@ export default class Home extends PureComponent {
     // eslint-disable-next-line react/no-unused-prop-types
     totalUnapprovedCount: PropTypes.number.isRequired,
     defaultHomeActiveTabName: PropTypes.string,
+    participateInMetaMetrics: PropTypes.bool.isRequired,
     onTabClick: PropTypes.func.isRequired,
     haveSwapsQuotes: PropTypes.bool.isRequired,
     showAwaitingSwapScreen: PropTypes.bool.isRequired,
+    setDataCollectionForMarketing: PropTypes.func.isRequired,
+    dataCollectionForMarketing: PropTypes.bool,
     swapsFetchParams: PropTypes.object,
     location: PropTypes.object,
     shouldShowWeb3ShimUsageNotification: PropTypes.bool.isRequired,
@@ -770,6 +782,99 @@ export default class Home extends PureComponent {
     );
   }
 
+  renderOnboardingPopover = () => {
+    const { t } = this.context;
+    const { setDataCollectionForMarketing } = this.props;
+
+    const handleClose = () => {
+      setDataCollectionForMarketing(false);
+      this.context.trackEvent({
+        category: MetaMetricsEventCategory.Home,
+        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        properties: {
+          has_marketing_consent: false,
+          location: 'marketing_consent_modal',
+        },
+      });
+    };
+
+    const handleConsent = (consent) => {
+      setDataCollectionForMarketing(consent);
+      this.context.trackEvent({
+        category: MetaMetricsEventCategory.Home,
+        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        properties: {
+          has_marketing_consent: consent,
+          location: 'marketing_consent_modal',
+        },
+      });
+    };
+
+    return (
+      <Modal isOpen onClose={handleClose}>
+        <ModalOverlay />
+        <ModalContent>
+          <ModalHeader
+            onClose={handleClose}
+            display={Display.Flex}
+            flexDirection={FlexDirection.Row}
+            fontWeight={FontWeight.Bold}
+            alignItems={AlignItems.center}
+            justifyContent={JustifyContent.center}
+            gap={4}
+            size={18}
+            paddingBottom={0}
+          >
+            {t('onboardedMetametricsTitle')}
+          </ModalHeader>
+          <ModalBody>
+            <Box
+              display={Display.Flex}
+              flexDirection={FlexDirection.Column}
+              gap={2}
+              margin={4}
+            >
+              <Typography>
+                {t('onboardedMetametricsParagraph1', [
+                  <a
+                    href={METAMETRICS_SETTINGS_LINK}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    key="retention-link"
+                  >
+                    {t('onboardedMetametricsLink')}
+                  </a>,
+                ])}
+              </Typography>
+              <Typography>{t('onboardedMetametricsParagraph2')}</Typography>
+              <ul className="home__onboarding_list">
+                <li>{t('onboardedMetametricsKey1')}</li>
+                <li>{t('onboardedMetametricsKey2')}</li>
+                <li>{t('onboardedMetametricsKey3')}</li>
+              </ul>
+              <Typography>{t('onboardedMetametricsParagraph3')}</Typography>
+            </Box>
+          </ModalBody>
+          <ModalFooter>
+            <Box
+              display={Display.Flex}
+              flexDirection={FlexDirection.Row}
+              gap={2}
+              width={BlockSize.Full}
+            >
+              <Button type="secondary" onClick={() => handleConsent(false)}>
+                {t('onboardedMetametricsDisagree')}
+              </Button>
+              <Button type="primary" onClick={() => handleConsent(true)}>
+                {t('onboardedMetametricsAccept')}
+              </Button>
+            </Box>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+    );
+  };
+
   renderPopover = () => {
     const { setConnectedStatusPopoverHasBeenShown } = this.props;
     const { t } = this.context;
@@ -825,6 +930,8 @@ export default class Home extends PureComponent {
       setBasicFunctionalityModalOpen,
       forgottenPassword,
       history,
+      participateInMetaMetrics,
+      dataCollectionForMarketing,
       ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
       connectedStatusPopoverHasBeenShown,
       isPopup,
@@ -899,6 +1006,10 @@ export default class Home extends PureComponent {
           exact
         />
         <div className="home__container">
+          {dataCollectionForMarketing === null &&
+          participateInMetaMetrics === true
+            ? this.renderOnboardingPopover()
+            : null}
           {
             ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
           }
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 125f1d985d24..7c27dbcc5759 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -69,6 +69,7 @@ import {
   setActiveNetwork,
   setNewTokensImportedError,
   toggleExternalServices,
+  setDataCollectionForMarketing,
 } from '../../store/actions';
 import {
   hideWhatsNewPopup,
@@ -99,6 +100,8 @@ const mapStateToProps = (state) => {
     connectedStatusPopoverHasBeenShown,
     defaultHomeActiveTabName,
     swapsState,
+    dataCollectionForMarketing,
+    participateInMetaMetrics,
     firstTimeFlowType,
     completedOnboarding,
   } = metamask;
@@ -157,9 +160,11 @@ const mapStateToProps = (state) => {
     shouldShowSeedPhraseReminder: getShouldShowSeedPhraseReminder(state),
     isPopup,
     isNotification,
+    dataCollectionForMarketing,
     selectedAddress,
     firstPermissionsRequestId,
     totalUnapprovedCount,
+    participateInMetaMetrics,
     hasApprovalFlows: getApprovalFlows(state)?.length > 0,
     connectedStatusPopoverHasBeenShown,
     defaultHomeActiveTabName,
@@ -210,6 +215,8 @@ const mapDispatchToProps = (dispatch) => {
   ///: END:ONLY_INCLUDE_IF
 
   return {
+    setDataCollectionForMarketing: (val) =>
+      dispatch(setDataCollectionForMarketing(val)),
     closeNotificationPopup: () => closeNotificationPopup(),
     setConnectedStatusPopoverHasBeenShown: () =>
       dispatch(setConnectedStatusPopoverHasBeenShown()),
diff --git a/ui/pages/home/index.scss b/ui/pages/home/index.scss
index c5d6db36ad36..61f17d1dcb7b 100644
--- a/ui/pages/home/index.scss
+++ b/ui/pages/home/index.scss
@@ -1,6 +1,14 @@
 @use "design-system";
 
 .home {
+  &__onboarding_list {
+    list-style: initial;
+    margin-inline-start: 20px;
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+  }
+
   &__container {
     display: flex;
     min-height: 100%;
diff --git a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
index 8425fda35aa4..f669f81f59d7 100644
--- a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
+++ b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
@@ -150,3 +150,154 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
   </div>
 </div>
 `;
+
+exports[`Onboarding Metametrics Component should match snapshot after new policy date 1`] = `
+<div>
+  <div
+    class="onboarding-metametrics"
+    data-testid="onboarding-legacy-metametrics"
+  >
+    <h2
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h2 typography--weight-bold typography--style-normal typography--align-center typography--color-text-default"
+    >
+      Help us improve MetaMask
+    </h2>
+    <p
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
+    >
+      MetaMask would like to gather usage data to better understand how our users interact with MetaMask. This data will be used to provide the service, which includes improving the service based on your use.
+    </p>
+    <p
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
+    >
+      MetaMask will...
+    </p>
+    <ul>
+      <li>
+        <span
+          class="mm-box mm-icon mm-icon--size-md mm-box--margin-inline-end-3 mm-box--display-inline-block mm-box--color-success-default"
+          style="mask-image: url('./images/icons/check.svg');"
+        />
+        Always allow you to opt-out via Settings
+      </li>
+      <li>
+        <span
+          class="mm-box mm-icon mm-icon--size-md mm-box--margin-inline-end-3 mm-box--display-inline-block mm-box--color-success-default"
+          style="mask-image: url('./images/icons/check.svg');"
+        />
+        Send anonymized click and pageview events
+      </li>
+      <li>
+        <div
+          class="box box--flex-direction-row"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/close.svg');"
+          />
+          <span>
+             
+            
+            <span
+              class="box box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              Never
+            </span>
+             collect information we don’t need to provide the service (such as keys, addresses, transaction hashes, or balances)
+             
+          </span>
+        </div>
+      </li>
+      <li>
+        <div
+          class="box box--flex-direction-row"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/close.svg');"
+          />
+          <span>
+             
+            
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              Never
+            </span>
+             collect your full IP address*
+             
+          </span>
+        </div>
+      </li>
+      <li>
+        <div
+          class="box box--flex-direction-row"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
+            style="mask-image: url('./images/icons/close.svg');"
+          />
+          <span>
+             
+            
+            <span
+              class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
+            >
+              Never
+            </span>
+             sell data.  Ever!
+             
+          </span>
+        </div>
+         
+      </li>
+    </ul>
+    <h6
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+    >
+      This data is aggregated and is therefore anonymous for the purposes of General Data Protection Regulation (EU) 2016/679.
+    </h6>
+    <h6
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+    >
+      <span>
+         
+        * When you use Infura as your default RPC provider in MetaMask, Infura will collect your IP address and your Ethereum wallet address when you send a transaction. We don’t store this information in a way that allows our systems to associate those two pieces of data. For more information on how MetaMask and Infura interact from a data collection perspective, see our update 
+        <a
+          href="https://consensys.io/blog/consensys-data-retention-update"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          here
+        </a>
+        . For more information on our privacy practices in general, see our 
+        <a
+          href="https://metamask.io/privacy.html"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Privacy Policy here
+        </a>
+        .
+         
+      </span>
+    </h6>
+    <div
+      class="onboarding-metametrics__buttons"
+    >
+      <button
+        class="button btn--rounded btn-primary btn--large"
+        data-testid="metametrics-i-agree"
+      >
+        I agree
+      </button>
+      <button
+        class="button btn--rounded btn-secondary btn--large"
+        data-testid="metametrics-no-thanks"
+      >
+        No thanks
+      </button>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index 60cc82975ae2..f874c99ca5e0 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -11,8 +11,13 @@ import {
 } from '../../../helpers/constants/design-system';
 import Button from '../../../components/ui/button';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { setParticipateInMetaMetrics } from '../../../store/actions';
 import {
+  setParticipateInMetaMetrics,
+  setDataCollectionForMarketing,
+} from '../../../store/actions';
+import {
+  getParticipateInMetaMetrics,
+  getDataCollectionForMarketing,
   getFirstTimeFlowType,
   getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn,
 } from '../../../selectors';
@@ -25,6 +30,7 @@ import {
 
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
+  Checkbox,
   Icon,
   IconName,
   IconSize,
@@ -45,9 +51,16 @@ export default function OnboardingMetametrics() {
   const nextRoute = useSelector(getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn);
   const firstTimeFlowType = useSelector(getFirstTimeFlowType);
 
+  const dataCollectionForMarketing = useSelector(getDataCollectionForMarketing);
+  const participateInMetaMetrics = useSelector(getParticipateInMetaMetrics);
+
   const trackEvent = useContext(MetaMetricsContext);
 
   const onConfirm = async () => {
+    if (dataCollectionForMarketing === null) {
+      await dispatch(setDataCollectionForMarketing(false));
+    }
+
     const [, metaMetricsId] = await dispatch(setParticipateInMetaMetrics(true));
     try {
       trackEvent(
@@ -67,6 +80,23 @@ export default function OnboardingMetametrics() {
           flushImmediately: true,
         },
       );
+
+      if (participateInMetaMetrics) {
+        trackEvent({
+          category: MetaMetricsEventCategory.Onboarding,
+          event: MetaMetricsEventName.AppInstalled,
+        });
+
+        trackEvent({
+          category: MetaMetricsEventCategory.Onboarding,
+          event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+          properties: {
+            is_metrics_opted_in: true,
+            has_marketing_consent: Boolean(dataCollectionForMarketing),
+            location: 'onboarding_metametrics',
+          },
+        });
+      }
     } finally {
       history.push(nextRoute);
     }
@@ -74,6 +104,7 @@ export default function OnboardingMetametrics() {
 
   const onCancel = async () => {
     await dispatch(setParticipateInMetaMetrics(false));
+    await dispatch(setDataCollectionForMarketing(false));
     history.push(nextRoute);
   };
 
@@ -319,6 +350,15 @@ export default function OnboardingMetametrics() {
             </Box>{' '}
           </li>
         </ul>
+        <Checkbox
+          id="metametrics-opt-in"
+          isChecked={dataCollectionForMarketing}
+          onClick={() =>
+            dispatch(setDataCollectionForMarketing(!dataCollectionForMarketing))
+          }
+          label={t('onboardingMetametricsUseDataCheckbox')}
+          paddingBottom={3}
+        />
         <Typography
           color={TextColor.textAlternative}
           align={TEXT_ALIGN.LEFT}
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.test.js b/ui/pages/onboarding-flow/metametrics/metametrics.test.js
index 25723361b8f5..487987a0f5f5 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.test.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.test.js
@@ -8,7 +8,10 @@ import {
   onboardingMetametricsAgree,
   onboardingMetametricsDisagree,
 } from '../../../../app/_locales/en/messages.json';
-import { setParticipateInMetaMetrics } from '../../../store/actions';
+import {
+  setParticipateInMetaMetrics,
+  setDataCollectionForMarketing,
+} from '../../../store/actions';
 import { FirstTimeFlowType } from '../../../../shared/constants/onboarding';
 import OnboardingMetametrics from './metametrics';
 
@@ -29,6 +32,9 @@ jest.mock('../../../store/actions.ts', () => ({
   setParticipateInMetaMetrics: jest
     .fn()
     .mockReturnValue(jest.fn((val) => Promise.resolve([val]))),
+  setDataCollectionForMarketing: jest
+    .fn()
+    .mockReturnValue(jest.fn((val) => Promise.resolve([val]))),
 }));
 
 describe('Onboarding Metametrics Component', () => {
@@ -58,6 +64,20 @@ describe('Onboarding Metametrics Component', () => {
     expect(container).toMatchSnapshot();
   });
 
+  it('should match snapshot after new policy date', () => {
+    // TODO: merge this with the previous test once this date is reached
+    jest.useFakeTimers().setSystemTime(new Date('2024-06-05'));
+
+    const { container } = renderWithProvider(
+      <OnboardingMetametrics />,
+      mockStore,
+    );
+
+    expect(container).toMatchSnapshot();
+
+    jest.useRealTimers();
+  });
+
   it('should set setParticipateInMetaMetrics to true when clicking agree', async () => {
     const { queryByText } = renderWithProvider(
       <OnboardingMetametrics />,
@@ -94,6 +114,24 @@ describe('Onboarding Metametrics Component', () => {
     });
   });
 
+  it('should set setDataCollectionForMarketing to false when clicking cancel', async () => {
+    const { queryByText } = renderWithProvider(
+      <OnboardingMetametrics />,
+      mockStore,
+    );
+
+    const confirmCancel = queryByText(onboardingMetametricsDisagree.message);
+
+    fireEvent.click(confirmCancel);
+
+    await waitFor(() => {
+      expect(setDataCollectionForMarketing).toHaveBeenCalledWith(false);
+      expect(mockPushHistory).toHaveBeenCalledWith(
+        ONBOARDING_CREATE_PASSWORD_ROUTE,
+      );
+    });
+  });
+
   it('should render the Onboarding component when the current date is after the new privacy policy date', () => {
     jest.useFakeTimers().setSystemTime(new Date('2099-11-11'));
     const { queryByTestId } = renderWithProvider(
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 79726f584e1a..fb9f56a04b7a 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
@@ -1739,6 +1739,74 @@ exports[`Security Tab should match snapshot 1`] = `
           </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"
+      >
+        <div
+          class="settings-page__content-item"
+        >
+          <span>
+            Data collection for marketing
+          </span>
+          <div
+            class="settings-page__content-description"
+          >
+            <span>
+              We'll use MetaMetrics to learn how you interact with our marketing communications. We may share relevant news (like product features and other materials).
+            </span>
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+          data-testid="dataCollectionForMarketing"
+        >
+          <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(159, 166, 174);"
+              >
+                <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: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
+                />
+              </div>
+              <input
+                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>
   </div>
 </div>
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
new file mode 100644
index 000000000000..5e93bc9feaab
--- /dev/null
+++ b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
@@ -0,0 +1,88 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureMockStore from 'redux-mock-store';
+import { render, fireEvent } from '@testing-library/react';
+import * as MetametricsHooks from '../../../../hooks/metamask-notifications/useMetametrics';
+import MetametricsToggle from './metametrics-toggle';
+
+let mockUseSelectorReturnValue = false;
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: jest.fn(() => mockUseSelectorReturnValue),
+}));
+
+const mockStore = configureMockStore();
+const initialState = {
+  metamask: {
+    isSignedIn: false,
+  },
+};
+const store = mockStore(initialState);
+
+describe('MetametricsToggle', () => {
+  const enableMetametricsMock = jest.fn(() => Promise.resolve());
+  const disableMetametricsMock = jest.fn(() => Promise.resolve());
+
+  beforeEach(() => {
+    jest.spyOn(MetametricsHooks, 'useEnableMetametrics').mockReturnValue({
+      enableMetametrics: enableMetametricsMock,
+      loading: false,
+      error: null,
+    });
+    jest.spyOn(MetametricsHooks, 'useDisableMetametrics').mockReturnValue({
+      disableMetametrics: disableMetametricsMock,
+      loading: false,
+      error: null,
+    });
+    jest.spyOn(store, 'dispatch').mockImplementation(jest.fn());
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders correctly', () => {
+    mockUseSelectorReturnValue = false;
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MetametricsToggle
+          dataCollectionForMarketing={false}
+          // eslint-disable-next-line no-empty-function
+          setDataCollectionForMarketing={() => {}}
+        />
+      </Provider>,
+    );
+    expect(getByTestId('profileSyncToggle')).toBeInTheDocument();
+  });
+
+  it('calls enableMetametrics when toggle is turned on and profile syncing is disabled', () => {
+    mockUseSelectorReturnValue = false;
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MetametricsToggle
+          dataCollectionForMarketing={false}
+          // eslint-disable-next-line no-empty-function
+          setDataCollectionForMarketing={() => {}}
+        />
+      </Provider>,
+    );
+    fireEvent.click(getByTestId('toggleButton'));
+    expect(enableMetametricsMock).toHaveBeenCalled();
+  });
+
+  it('calls disableMetametrics when toggle is turned off and profile syncing is enabled', () => {
+    mockUseSelectorReturnValue = true;
+    const { getByTestId } = render(
+      <Provider store={store}>
+        <MetametricsToggle
+          dataCollectionForMarketing={false}
+          // eslint-disable-next-line no-empty-function
+          setDataCollectionForMarketing={() => {}}
+        />
+      </Provider>,
+    );
+    fireEvent.click(getByTestId('toggleButton'));
+    expect(disableMetametricsMock).toHaveBeenCalled();
+  });
+});
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
new file mode 100644
index 000000000000..661dd7f974b4
--- /dev/null
+++ b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
@@ -0,0 +1,130 @@
+import React, { useContext } from 'react';
+import { useSelector } from 'react-redux';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import {
+  useEnableMetametrics,
+  useDisableMetametrics,
+} from '../../../../hooks/metamask-notifications/useMetametrics';
+import { selectIsProfileSyncingEnabled } from '../../../../selectors/metamask-notifications/profile-syncing';
+import { selectParticipateInMetaMetrics } from '../../../../selectors/metamask-notifications/authentication';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
+import { Box, Text } from '../../../../components/component-library';
+import ToggleButton from '../../../../components/ui/toggle-button';
+import {
+  Display,
+  FlexDirection,
+  JustifyContent,
+  TextColor,
+  TextVariant,
+} from '../../../../helpers/constants/design-system';
+
+const MetametricsToggle = ({
+  dataCollectionForMarketing,
+  setDataCollectionForMarketing,
+}: {
+  dataCollectionForMarketing: boolean;
+  setDataCollectionForMarketing: (value: boolean) => void;
+}) => {
+  const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
+  const { enableMetametrics, error: enableMetametricsError } =
+    useEnableMetametrics();
+  const { disableMetametrics, error: disableMetametricsError } =
+    useDisableMetametrics();
+
+  const error = enableMetametricsError || disableMetametricsError;
+
+  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
+  const participateInMetaMetrics = useSelector(selectParticipateInMetaMetrics);
+
+  const handleUseParticipateInMetaMetrics = async () => {
+    if (participateInMetaMetrics) {
+      await disableMetametrics();
+      trackEvent({
+        category: MetaMetricsEventCategory.Settings,
+        event: MetaMetricsEventName.TurnOffMetaMetrics,
+        properties: {
+          isProfileSyncingEnabled,
+          participateInMetaMetrics,
+        },
+      });
+
+      trackEvent({
+        category: MetaMetricsEventCategory.Settings,
+        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+        properties: {
+          is_metrics_opted_in: false,
+          has_marketing_consent: false,
+          location: 'Settings',
+        },
+      });
+    } else {
+      await enableMetametrics();
+      trackEvent({
+        category: MetaMetricsEventCategory.Settings,
+        event: MetaMetricsEventName.TurnOnMetaMetrics,
+        properties: {
+          isProfileSyncingEnabled,
+          participateInMetaMetrics,
+        },
+      });
+    }
+
+    if (dataCollectionForMarketing) {
+      setDataCollectionForMarketing(false);
+    }
+  };
+
+  return (
+    <Box>
+      <Box
+        className="settings-page__content-row"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+        data-testid="profileSyncToggle"
+      >
+        <div className="settings-page__content-item" id="profileSyncLabel">
+          <span>{t('participateInMetaMetrics')}</span>
+          <div
+            className="settings-page__content-description"
+            data-testid="profileSyncDescription"
+          >
+            {t('participateInMetaMetricsDescription')}
+          </div>
+        </div>
+
+        <div
+          className="settings-page__content-item-col"
+          data-testid="participateInMetaMetrics"
+        >
+          <ToggleButton
+            value={participateInMetaMetrics}
+            onToggle={handleUseParticipateInMetaMetrics}
+            offLabel={t('off')}
+            onLabel={t('on')}
+            dataTestId="toggleButton"
+          />
+        </div>
+      </Box>
+      {error && (
+        <Box paddingBottom={4}>
+          <Text
+            as="p"
+            color={TextColor.errorDefault}
+            variant={TextVariant.bodySm}
+          >
+            {t('notificationsSettingsBoxError')}
+          </Text>
+        </Box>
+      )}
+    </Box>
+  );
+};
+
+export default MetametricsToggle;
diff --git a/ui/pages/settings/security-tab/security-tab.component.js b/ui/pages/settings/security-tab/security-tab.component.js
index cb554d0495cf..fd5b163ad6e5 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -25,17 +25,23 @@ import SRPQuiz from '../../../components/app/srp-quiz-modal/SRPQuiz';
 import {
   Button,
   BUTTON_SIZES,
+  Icon,
+  IconSize,
+  IconName,
   Box,
   Text,
 } from '../../../components/component-library';
 import TextField from '../../../components/ui/text-field';
 import ToggleButton from '../../../components/ui/toggle-button';
+import Popover from '../../../components/ui/popover';
 import {
   Display,
+  BlockSize,
   FlexDirection,
   JustifyContent,
   TextColor,
   TextVariant,
+  IconColor,
 } from '../../../helpers/constants/design-system';
 import { ADD_POPULAR_CUSTOM_NETWORK } from '../../../helpers/constants/routes';
 import {
@@ -58,6 +64,8 @@ export default class SecurityTab extends PureComponent {
     setOpenSeaEnabled: PropTypes.func,
     useNftDetection: PropTypes.bool,
     setUseNftDetection: PropTypes.func,
+    dataCollectionForMarketing: PropTypes.bool,
+    setDataCollectionForMarketing: PropTypes.func.isRequired,
     participateInMetaMetrics: PropTypes.bool.isRequired,
     setParticipateInMetaMetrics: PropTypes.func.isRequired,
     incomingTransactionsPreferences: PropTypes.object.isRequired,
@@ -98,6 +106,7 @@ export default class SecurityTab extends PureComponent {
     ipfsGateway: this.props.ipfsGateway || IPFS_DEFAULT_GATEWAY_URL,
     ipfsGatewayError: '',
     srpQuizModalVisible: false,
+    showDataCollectionDisclaimer: false,
     ipfsToggle: this.props.ipfsGateway.length > 0,
   };
 
@@ -114,9 +123,17 @@ export default class SecurityTab extends PureComponent {
       return React.createRef();
     });
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps) {
     const { t } = this.context;
     handleSettingsRefs(t, t('securityAndPrivacy'), this.settingsRefs);
+
+    if (
+      prevProps.dataCollectionForMarketing === true &&
+      this.props.participateInMetaMetrics === true &&
+      this.props.dataCollectionForMarketing === false
+    ) {
+      this.setState({ showDataCollectionDisclaimer: true });
+    }
   }
 
   componentDidMount() {
@@ -327,7 +344,7 @@ export default class SecurityTab extends PureComponent {
 
   renderMetaMetricsOptIn() {
     const { t } = this.context;
-    const { participateInMetaMetrics, setParticipateInMetaMetrics } =
+    const { participateInMetaMetrics, setParticipateInMetaMetrics, dataCollectionForMarketing, setDataCollectionForMarketing } =
       this.props;
 
     return (
@@ -352,7 +369,81 @@ export default class SecurityTab extends PureComponent {
         >
           <ToggleButton
             value={participateInMetaMetrics}
-            onToggle={(value) => setParticipateInMetaMetrics(!value)}
+            onToggle={(value) => {
+              const newValue = !value;
+              setParticipateInMetaMetrics(newValue);
+
+              if (newValue) {
+                this.context.trackEvent({
+                  category: MetaMetricsEventCategory.Settings,
+                  event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+                  properties: {
+                    is_metrics_opted_in: false,
+                    has_marketing_consent: false,
+                    location: 'Settings',
+                  },
+                });
+              }
+
+              if (dataCollectionForMarketing) {
+                setDataCollectionForMarketing(false);
+              }
+            }}
+            offLabel={t('off')}
+            onLabel={t('on')}
+          />
+        </div>
+      </Box>
+    );
+  }
+
+  renderDataCollectionForMarketing() {
+    const { t } = this.context;
+    const {
+      dataCollectionForMarketing,
+      participateInMetaMetrics,
+      setDataCollectionForMarketing,
+      setParticipateInMetaMetrics,
+    } = this.props;
+
+    return (
+      <Box
+        ref={this.settingsRefs[4]}
+        className="settings-page__content-row"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div className="settings-page__content-item">
+          <span>{t('dataCollectionForMarketing')}</span>
+          <div className="settings-page__content-description">
+            <span>{t('dataCollectionForMarketingDescription')}</span>
+          </div>
+        </div>
+
+        <div
+          className="settings-page__content-item-col"
+          data-testid="dataCollectionForMarketing"
+        >
+          <ToggleButton
+            value={dataCollectionForMarketing}
+            onToggle={(value) => {
+              setDataCollectionForMarketing(!value);
+              if (participateInMetaMetrics) {
+                this.context.trackEvent({
+                  category: MetaMetricsEventCategory.Settings,
+                  event: MetaMetricsEventName.AnalyticsPreferenceSelected,
+                  properties: {
+                    is_metrics_opted_in: true,
+                    has_marketing_consent: false,
+                    location: 'Settings',
+                  },
+                });
+              } else {
+                setParticipateInMetaMetrics(true);
+              }
+            }}
             offLabel={t('off')}
             onLabel={t('on')}
           />
@@ -1034,12 +1125,60 @@ export default class SecurityTab extends PureComponent {
     );
   }
 
+  renderDataCollectionWarning = () => {
+    const { t } = this.context;
+
+    return (
+      <Popover
+        wrapTitle
+        centerTitle
+        onClose={() => this.setState({ showDataCollectionDisclaimer: false })}
+        title={
+          <Icon
+            size={IconSize.Xl}
+            name={IconName.Danger}
+            color={IconColor.warningDefault}
+          />
+        }
+        footer={
+          <Button
+            width={BlockSize.Full}
+            type="primary"
+            onClick={() =>
+              this.setState({ showDataCollectionDisclaimer: false })
+            }
+          >
+            {t('dataCollectionWarningPopoverButton')}
+          </Button>
+        }
+      >
+        <Box
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
+          gap={2}
+          margin={4}
+        >
+          <Text>{t('dataCollectionWarningPopoverDescription')}</Text>
+        </Box>
+      </Popover>
+    );
+  };
+
   render() {
-    const { warning, petnamesEnabled } = this.props;
+    const {
+      warning,
+      petnamesEnabled,
+      dataCollectionForMarketing,
+      setDataCollectionForMarketing,
+    } = this.props;
+    const { showDataCollectionDisclaimer } = this.state;
 
     return (
       <div className="settings-page__body">
         {this.renderUseExternalServices()}
+        {showDataCollectionDisclaimer
+          ? this.renderDataCollectionWarning()
+          : null}
 
         {warning && <div className="settings-tab__error">{warning}</div>}
         <span className="settings-page__security-tab-sub-header__bold">
@@ -1118,6 +1257,7 @@ export default class SecurityTab extends PureComponent {
         </span>
         <div className="settings-page__content-padded">
           {this.renderMetaMetricsOptIn()}
+          {this.renderDataCollectionForMarketing()}
         </div>
       </div>
     );
diff --git a/ui/pages/settings/security-tab/security-tab.container.js b/ui/pages/settings/security-tab/security-tab.container.js
index f411e1ceb1f2..98a2c7c9c3f5 100644
--- a/ui/pages/settings/security-tab/security-tab.container.js
+++ b/ui/pages/settings/security-tab/security-tab.container.js
@@ -6,6 +6,7 @@ import {
   setIpfsGateway,
   setIsIpfsGatewayEnabled,
   setParticipateInMetaMetrics,
+  setDataCollectionForMarketing,
   setUseCurrencyRateCheck,
   setUseMultiAccountBalanceChecker,
   setUsePhishDetect,
@@ -43,6 +44,7 @@ const mapStateToProps = (state) => {
   const {
     incomingTransactionsPreferences,
     participateInMetaMetrics,
+    dataCollectionForMarketing,
     usePhishDetect,
     useTokenDetection,
     ipfsGateway,
@@ -64,6 +66,7 @@ const mapStateToProps = (state) => {
     incomingTransactionsPreferences,
     allNetworks,
     participateInMetaMetrics,
+    dataCollectionForMarketing,
     usePhishDetect,
     useTokenDetection,
     ipfsGateway,
@@ -90,6 +93,8 @@ const mapDispatchToProps = (dispatch) => {
       dispatch(setIncomingTransactionsPreferences(chainId, value)),
     setParticipateInMetaMetrics: (val) =>
       dispatch(setParticipateInMetaMetrics(val)),
+    setDataCollectionForMarketing: (val) =>
+      dispatch(setDataCollectionForMarketing(val)),
     setUsePhishDetect: (val) => dispatch(setUsePhishDetect(val)),
     setUseCurrencyRateCheck: (val) => dispatch(setUseCurrencyRateCheck(val)),
     setUseTokenDetection: (val) => dispatch(setUseTokenDetection(val)),
diff --git a/ui/selectors/metametrics.js b/ui/selectors/metametrics.js
index 377181a3e6a8..c623e378c003 100644
--- a/ui/selectors/metametrics.js
+++ b/ui/selectors/metametrics.js
@@ -2,6 +2,12 @@ import { createSelector } from 'reselect';
 
 export const selectFragments = (state) => state.metamask.fragments;
 
+export const getDataCollectionForMarketing = (state) =>
+  state.metamask.dataCollectionForMarketing;
+
+export const getParticipateInMetaMetrics = (state) =>
+  Boolean(state.metamask.participateInMetaMetrics);
+
 export const selectFragmentBySuccessEvent = createSelector(
   selectFragments,
   (_, fragmentOptions) => fragmentOptions,
diff --git a/ui/store/actionConstants.ts b/ui/store/actionConstants.ts
index d89aa1d1bbb3..d1321d9b1bae 100644
--- a/ui/store/actionConstants.ts
+++ b/ui/store/actionConstants.ts
@@ -78,6 +78,8 @@ export const DEPRECATED_NETWORK_POPOVER_CLOSE =
 export const UPDATE_CUSTOM_NONCE = 'UPDATE_CUSTOM_NONCE';
 
 export const SET_PARTICIPATE_IN_METAMETRICS = 'SET_PARTICIPATE_IN_METAMETRICS';
+export const SET_DATA_COLLECTION_FOR_MARKETING =
+  'SET_DATA_COLLECTION_FOR_MARKETING';
 
 // locale
 export const SET_CURRENT_LOCALE = 'SET_CURRENT_LOCALE';
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 08ad588b8b30..dc538e9c8a9a 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -3265,6 +3265,26 @@ export function setParticipateInMetaMetrics(
   };
 }
 
+export function setDataCollectionForMarketing(
+  dataCollectionPreference: boolean,
+): ThunkAction<
+  Promise<[boolean, string]>,
+  MetaMaskReduxState,
+  unknown,
+  AnyAction
+> {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    log.debug(`background.setDataCollectionForMarketing`);
+    await submitRequestToBackground('setDataCollectionForMarketing', [
+      dataCollectionPreference,
+    ]);
+    dispatch({
+      type: actionConstants.SET_DATA_COLLECTION_FOR_MARKETING,
+      value: dataCollectionPreference,
+    });
+  };
+}
+
 export function setUseBlockie(
   val: boolean,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {

From 3e8ce0700cb6c964a3e86bec7d57a5c89675a86b Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 17 Jun 2024 17:21:33 -0230
Subject: [PATCH 043/236] Fix lint errors on commit 5892d7cdc (#25367)

Fixes lint errors and e2e failures on v11.16.12, which would have been
introduced during conflict resolution when cherry-picking #24605

Specifically:
- `test/e2e/default-fixture.js` is deleted as that file does not exist
on master yet and is not used. However, importantly, the change made in
`test/e2e/default-fixture.js` in #24605 is now applied to
`test/e2e/fixture-builder.js` (this was needed for e2e tests to pass)
- delete
`ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx`
and the associated test file, as these seem to be unused
- delete unused variables in
`ui/pages/settings/security-tab/security-tab.component.js`
---
 test/e2e/default-fixture.js                   | 265 ------------------
 test/e2e/fixture-builder.js                   |   1 +
 .../metametrics-toggle.test.tsx               |  88 ------
 .../metametrics-toggle/metametrics-toggle.tsx | 130 ---------
 .../security-tab/security-tab.component.js    |  15 +-
 5 files changed, 8 insertions(+), 491 deletions(-)
 delete mode 100644 test/e2e/default-fixture.js
 delete mode 100644 ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
 delete mode 100644 ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx

diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
deleted file mode 100644
index 98413671caca..000000000000
--- a/test/e2e/default-fixture.js
+++ /dev/null
@@ -1,265 +0,0 @@
-const { NetworkStatus } = require('@metamask/network-controller');
-const { CHAIN_IDS } = require('../../shared/constants/network');
-const { FirstTimeFlowType } = require('../../shared/constants/onboarding');
-
-const FIXTURE_STATE_METADATA_VERSION = 74;
-
-const E2E_SRP =
-  'spread raise short crane omit tent fringe mandate neglect detail suspect cradle';
-
-function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
-  return {
-    data: {
-      AuthenticationController: {
-        isSignedIn: true,
-      },
-      UserStorageController: {
-        isProfileSyncingEnabled: true,
-      },
-      MetamaskNotificationsController: {
-        subscriptionAccountsSeen: [],
-        isFeatureAnnouncementsEnabled: false,
-        isMetamaskNotificationsEnabled: false,
-        isMetamaskNotificationsFeatureSeen: false,
-        metamaskNotificationsList: [],
-        metamaskNotificationsReadList: [],
-      },
-      AccountsController: {
-        internalAccounts: {
-          selectedAccount: 'd5e45e4a-3b04-4a09-a5e1-39762e5c6be4',
-          accounts: {
-            'd5e45e4a-3b04-4a09-a5e1-39762e5c6be4': {
-              id: 'd5e45e4a-3b04-4a09-a5e1-39762e5c6be4',
-              address: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-              metadata: {
-                name: 'Account 1',
-                lastSelected: 1665507600000,
-                keyring: {
-                  type: 'HD Key Tree',
-                },
-              },
-              options: {},
-              methods: [
-                'personal_sign',
-                'eth_sign',
-                'eth_signTransaction',
-                'eth_signTypedData_v1',
-                'eth_signTypedData_v3',
-                'eth_signTypedData_v4',
-              ],
-              type: 'eip155:eoa',
-            },
-          },
-        },
-      },
-      AlertController: {
-        alertEnabledness: {
-          unconnectedAccount: true,
-          web3ShimUsage: true,
-        },
-        unconnectedAccountAlertShownOrigins: {},
-        web3ShimUsageOrigins: {},
-      },
-      AnnouncementController: {
-        announcements: {
-          8: {
-            date: '2021-11-01',
-            id: 8,
-            isShown: false,
-          },
-        },
-      },
-      NetworkOrderController: {
-        orderedNetworkList: [
-          {
-            networkId: '0x1',
-            networkRpcUrl:
-              'https://mainnet.infura.io/v3/00000000000000000000000000000000',
-          },
-          {
-            networkId: '0xe708',
-            networkRpcUrl:
-              'https://linea-mainnet.infura.io/v3/00000000000000000000000000000000',
-          },
-          {
-            networkId: '0x539',
-            networkRpcUrl: 'http://localhost:8545',
-          },
-        ],
-      },
-      AccountOrderController: {
-        pinnedAccountList: [],
-        hiddenAccountList: [],
-      },
-      AppStateController: {
-        browserEnvironment: {},
-        nftsDropdownState: {},
-        connectedStatusPopoverHasBeenShown: true,
-        termsOfUseLastAgreed:
-          '__FIXTURE_SUBSTITUTION__currentDateInMilliseconds',
-        defaultHomeActiveTabName: null,
-        fullScreenGasPollTokens: [],
-        notificationGasPollTokens: [],
-        popupGasPollTokens: [],
-        qrHardware: {},
-        recoveryPhraseReminderHasBeenShown: true,
-        recoveryPhraseReminderLastShown:
-          '__FIXTURE_SUBSTITUTION__currentDateInMilliseconds',
-        showTestnetMessageInDropdown: true,
-        trezorModel: null,
-        usedNetworks: {
-          [CHAIN_IDS.MAINNET]: true,
-          [CHAIN_IDS.LINEA_MAINNET]: true,
-          [CHAIN_IDS.GOERLI]: true,
-          [CHAIN_IDS.LOCALHOST]: true,
-        },
-        snapsInstallPrivacyWarningShown: true,
-      },
-      CurrencyController: {
-        currentCurrency: 'usd',
-        currencyRates: {
-          ETH: {
-            conversionDate: 1665507600.0,
-            conversionRate: 1700.0,
-            usdConversionRate: 1700.0,
-          },
-        },
-      },
-      GasFeeController: {
-        estimatedGasFeeTimeBounds: {},
-        gasEstimateType: 'none',
-        gasFeeEstimates: {},
-      },
-      KeyringController: {
-        vault:
-          '{"data":"WHaP1FrrtV4zUonudIppDifsLHF39g6oPkVksAIdWAHBRzax1uy1asfAJprR7u72t4/HuYz5yPIFQrnNnv+hwQu9GRuty88VKMnvMy+sq8MNtoXI+C54bZpWa8r4iUQfa0Mj/cfJbpFpzOdF1ZYXahTfTcU5WsrHwvJew842CiJR4B2jmCHHXfm/DxLK3WazsVQwXJGx/U71UelGoOOrT8NI28EKrAwgPn+7Xmv0j92gmhau30N7Bo2fr6Zv","iv":"LfD8/tY1EjXzxuemSmDVdA==","keyMetadata":{"algorithm":"PBKDF2","params":{"iterations":600000}},"salt":"nk4xdpmMR+1s5BYe4Vnk++XAQwrISI2bCtbMg7V1wUA="}',
-      },
-      MetaMetricsController: {
-        eventsBeforeMetricsOptIn: [],
-        fragments: {},
-        metaMetricsId: null,
-        participateInMetaMetrics: false,
-        dataCollectionForMarketing: false,
-        traits: {},
-      },
-      NetworkController: {
-        selectedNetworkClientId: 'networkConfigurationId',
-        networksMetadata: {
-          networkConfigurationId: {
-            EIPS: {},
-            status: NetworkStatus.Available,
-          },
-        },
-        providerConfig: {
-          chainId: inputChainId,
-          nickname: 'Localhost 8545',
-          rpcPrefs: {},
-          rpcUrl: 'http://localhost:8545',
-          ticker: 'ETH',
-          type: 'rpc',
-          id: 'networkConfigurationId',
-        },
-        networkConfigurations: {
-          networkConfigurationId: {
-            chainId: inputChainId,
-            nickname: 'Localhost 8545',
-            rpcPrefs: {},
-            rpcUrl: 'http://localhost:8545',
-            ticker: 'ETH',
-            networkConfigurationId: 'networkConfigurationId',
-          },
-        },
-      },
-      OnboardingController: {
-        completedOnboarding: true,
-        firstTimeFlowType: FirstTimeFlowType.import,
-        onboardingTabs: {},
-        seedPhraseBackedUp: true,
-      },
-      PermissionController: {
-        subjects: {},
-      },
-      PreferencesController: {
-        advancedGasFee: null,
-        currentLocale: 'en',
-        useExternalServices: true,
-        dismissSeedBackUpReminder: true,
-        featureFlags: {},
-        forgottenPassword: false,
-        identities: {
-          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1': {
-            address: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-            lastSelected: 1665507600000,
-            name: 'Account 1',
-          },
-        },
-        ipfsGateway: 'dweb.link',
-        knownMethodData: {},
-        ledgerTransportType: 'webhid',
-        lostIdentities: {},
-        openSeaEnabled: false,
-        preferences: {
-          hideZeroBalanceTokens: false,
-          showExtensionInFullSizeView: false,
-          showFiatInTestnets: false,
-          showTestNetworks: false,
-          smartTransactionsOptInStatus: false,
-          useNativeCurrencyAsPrimaryCurrency: true,
-          petnamesEnabled: true,
-          showTokenAutodetectModal: false,
-        },
-        selectedAddress: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-        theme: 'light',
-        useBlockie: false,
-        useNftDetection: false,
-        useNonceField: false,
-        usePhishDetect: true,
-        useTokenDetection: false,
-        useCurrencyRateCheck: true,
-        useMultiAccountBalanceChecker: true,
-        useRequestQueue: true,
-      },
-      SelectedNetworkController: {
-        domains: {},
-      },
-      SmartTransactionsController: {
-        smartTransactionsState: {
-          fees: {},
-          liveness: true,
-          smartTransactions: {
-            [CHAIN_IDS.MAINNET]: [],
-          },
-        },
-      },
-      SubjectMetadataController: {
-        subjectMetadata: {
-          'https://metamask.github.io': {
-            extensionId: null,
-            iconUrl: null,
-            name: 'MetaMask < = > Ledger Bridge',
-            origin: 'https://metamask.github.io',
-            subjectType: 'website',
-          },
-        },
-      },
-      TokensController: {
-        allDetectedTokens: {},
-        allIgnoredTokens: {},
-        allTokens: {},
-        detectedTokens: [],
-        ignoredTokens: [],
-        tokens: [],
-      },
-      TransactionController: {
-        transactions: {},
-      },
-      config: {},
-      firstTimeInfo: {
-        date: 1665507600000,
-        version: '10.21.0',
-      },
-    },
-  };
-}
-
-module.exports = { defaultFixture, FIXTURE_STATE_METADATA_VERSION, E2E_SRP };
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 6cec07fa3e81..b57bb64211f6 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -114,6 +114,7 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
         fragments: {},
         metaMetricsId: null,
         participateInMetaMetrics: false,
+        dataCollectionForMarketing: false,
         traits: {},
       },
       NetworkController: {
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
deleted file mode 100644
index 5e93bc9feaab..000000000000
--- a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.test.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import configureMockStore from 'redux-mock-store';
-import { render, fireEvent } from '@testing-library/react';
-import * as MetametricsHooks from '../../../../hooks/metamask-notifications/useMetametrics';
-import MetametricsToggle from './metametrics-toggle';
-
-let mockUseSelectorReturnValue = false;
-
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useSelector: jest.fn(() => mockUseSelectorReturnValue),
-}));
-
-const mockStore = configureMockStore();
-const initialState = {
-  metamask: {
-    isSignedIn: false,
-  },
-};
-const store = mockStore(initialState);
-
-describe('MetametricsToggle', () => {
-  const enableMetametricsMock = jest.fn(() => Promise.resolve());
-  const disableMetametricsMock = jest.fn(() => Promise.resolve());
-
-  beforeEach(() => {
-    jest.spyOn(MetametricsHooks, 'useEnableMetametrics').mockReturnValue({
-      enableMetametrics: enableMetametricsMock,
-      loading: false,
-      error: null,
-    });
-    jest.spyOn(MetametricsHooks, 'useDisableMetametrics').mockReturnValue({
-      disableMetametrics: disableMetametricsMock,
-      loading: false,
-      error: null,
-    });
-    jest.spyOn(store, 'dispatch').mockImplementation(jest.fn());
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('renders correctly', () => {
-    mockUseSelectorReturnValue = false;
-    const { getByTestId } = render(
-      <Provider store={store}>
-        <MetametricsToggle
-          dataCollectionForMarketing={false}
-          // eslint-disable-next-line no-empty-function
-          setDataCollectionForMarketing={() => {}}
-        />
-      </Provider>,
-    );
-    expect(getByTestId('profileSyncToggle')).toBeInTheDocument();
-  });
-
-  it('calls enableMetametrics when toggle is turned on and profile syncing is disabled', () => {
-    mockUseSelectorReturnValue = false;
-    const { getByTestId } = render(
-      <Provider store={store}>
-        <MetametricsToggle
-          dataCollectionForMarketing={false}
-          // eslint-disable-next-line no-empty-function
-          setDataCollectionForMarketing={() => {}}
-        />
-      </Provider>,
-    );
-    fireEvent.click(getByTestId('toggleButton'));
-    expect(enableMetametricsMock).toHaveBeenCalled();
-  });
-
-  it('calls disableMetametrics when toggle is turned off and profile syncing is enabled', () => {
-    mockUseSelectorReturnValue = true;
-    const { getByTestId } = render(
-      <Provider store={store}>
-        <MetametricsToggle
-          dataCollectionForMarketing={false}
-          // eslint-disable-next-line no-empty-function
-          setDataCollectionForMarketing={() => {}}
-        />
-      </Provider>,
-    );
-    fireEvent.click(getByTestId('toggleButton'));
-    expect(disableMetametricsMock).toHaveBeenCalled();
-  });
-});
diff --git a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx b/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
deleted file mode 100644
index 661dd7f974b4..000000000000
--- a/ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import React, { useContext } from 'react';
-import { useSelector } from 'react-redux';
-import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { MetaMetricsContext } from '../../../../contexts/metametrics';
-import {
-  useEnableMetametrics,
-  useDisableMetametrics,
-} from '../../../../hooks/metamask-notifications/useMetametrics';
-import { selectIsProfileSyncingEnabled } from '../../../../selectors/metamask-notifications/profile-syncing';
-import { selectParticipateInMetaMetrics } from '../../../../selectors/metamask-notifications/authentication';
-import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../../shared/constants/metametrics';
-import { Box, Text } from '../../../../components/component-library';
-import ToggleButton from '../../../../components/ui/toggle-button';
-import {
-  Display,
-  FlexDirection,
-  JustifyContent,
-  TextColor,
-  TextVariant,
-} from '../../../../helpers/constants/design-system';
-
-const MetametricsToggle = ({
-  dataCollectionForMarketing,
-  setDataCollectionForMarketing,
-}: {
-  dataCollectionForMarketing: boolean;
-  setDataCollectionForMarketing: (value: boolean) => void;
-}) => {
-  const t = useI18nContext();
-  const trackEvent = useContext(MetaMetricsContext);
-  const { enableMetametrics, error: enableMetametricsError } =
-    useEnableMetametrics();
-  const { disableMetametrics, error: disableMetametricsError } =
-    useDisableMetametrics();
-
-  const error = enableMetametricsError || disableMetametricsError;
-
-  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const participateInMetaMetrics = useSelector(selectParticipateInMetaMetrics);
-
-  const handleUseParticipateInMetaMetrics = async () => {
-    if (participateInMetaMetrics) {
-      await disableMetametrics();
-      trackEvent({
-        category: MetaMetricsEventCategory.Settings,
-        event: MetaMetricsEventName.TurnOffMetaMetrics,
-        properties: {
-          isProfileSyncingEnabled,
-          participateInMetaMetrics,
-        },
-      });
-
-      trackEvent({
-        category: MetaMetricsEventCategory.Settings,
-        event: MetaMetricsEventName.AnalyticsPreferenceSelected,
-        properties: {
-          is_metrics_opted_in: false,
-          has_marketing_consent: false,
-          location: 'Settings',
-        },
-      });
-    } else {
-      await enableMetametrics();
-      trackEvent({
-        category: MetaMetricsEventCategory.Settings,
-        event: MetaMetricsEventName.TurnOnMetaMetrics,
-        properties: {
-          isProfileSyncingEnabled,
-          participateInMetaMetrics,
-        },
-      });
-    }
-
-    if (dataCollectionForMarketing) {
-      setDataCollectionForMarketing(false);
-    }
-  };
-
-  return (
-    <Box>
-      <Box
-        className="settings-page__content-row"
-        display={Display.Flex}
-        flexDirection={FlexDirection.Row}
-        justifyContent={JustifyContent.spaceBetween}
-        gap={4}
-        data-testid="profileSyncToggle"
-      >
-        <div className="settings-page__content-item" id="profileSyncLabel">
-          <span>{t('participateInMetaMetrics')}</span>
-          <div
-            className="settings-page__content-description"
-            data-testid="profileSyncDescription"
-          >
-            {t('participateInMetaMetricsDescription')}
-          </div>
-        </div>
-
-        <div
-          className="settings-page__content-item-col"
-          data-testid="participateInMetaMetrics"
-        >
-          <ToggleButton
-            value={participateInMetaMetrics}
-            onToggle={handleUseParticipateInMetaMetrics}
-            offLabel={t('off')}
-            onLabel={t('on')}
-            dataTestId="toggleButton"
-          />
-        </div>
-      </Box>
-      {error && (
-        <Box paddingBottom={4}>
-          <Text
-            as="p"
-            color={TextColor.errorDefault}
-            variant={TextVariant.bodySm}
-          >
-            {t('notificationsSettingsBoxError')}
-          </Text>
-        </Box>
-      )}
-    </Box>
-  );
-};
-
-export default MetametricsToggle;
diff --git a/ui/pages/settings/security-tab/security-tab.component.js b/ui/pages/settings/security-tab/security-tab.component.js
index fd5b163ad6e5..5fe9c477ddeb 100644
--- a/ui/pages/settings/security-tab/security-tab.component.js
+++ b/ui/pages/settings/security-tab/security-tab.component.js
@@ -344,8 +344,12 @@ export default class SecurityTab extends PureComponent {
 
   renderMetaMetricsOptIn() {
     const { t } = this.context;
-    const { participateInMetaMetrics, setParticipateInMetaMetrics, dataCollectionForMarketing, setDataCollectionForMarketing } =
-      this.props;
+    const {
+      participateInMetaMetrics,
+      setParticipateInMetaMetrics,
+      dataCollectionForMarketing,
+      setDataCollectionForMarketing,
+    } = this.props;
 
     return (
       <Box
@@ -1165,12 +1169,7 @@ export default class SecurityTab extends PureComponent {
   };
 
   render() {
-    const {
-      warning,
-      petnamesEnabled,
-      dataCollectionForMarketing,
-      setDataCollectionForMarketing,
-    } = this.props;
+    const { warning, petnamesEnabled } = this.props;
     const { showDataCollectionDisclaimer } = this.state;
 
     return (

From d9de413df1ecfc91751ebc901f5c43520f55f449 Mon Sep 17 00:00:00 2001
From: Derek Brans <dbrans@gmail.com>
Date: Tue, 18 Jun 2024 07:25:54 -0400
Subject: [PATCH 044/236] cherry-pick fix: re-add patch to nonce-tracker that
 was incorrectly removed (#25342) into v12.0.0 (#25353)

cherry-pick fix: re-add patch to nonce-tracker that was incorrectly
removed 8b764fa (#25342) into v12.0.0

Merge conflict in package.json:
```json
    "@expo/config/glob": "^10.3.10",
    "@expo/config-plugins/glob": "^10.3.10",
<<<<<<< HEAD
    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch",
    "@solana/web3.js/rpc-websockets": "^8.0.1"
=======
    "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A19.0.0#~/.yarn/patches/@metamask-network-controller-npm-19.0.0-a5e0d1fe14.patch",
    "@solana/web3.js/rpc-websockets": "^8.0.1",
    "@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A19.0.0#~/.yarn/patches/@metamask-network-controller-npm-19.0.0-a5e0d1fe14.patch",
    "@metamask/gas-fee-controller@npm:^15.1.1": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch",
    "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch"
>>>>>>> 8b764fa4b0 (fix: re-add patch to nonce-tracker that was incorrectly removed (#25342))
  },
  "dependencies": {
    "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
```
---
 ...k-nonce-tracker-npm-5.0.0-d81478218e.patch | 30 +++++++++++++++++++
 package.json                                  |  3 +-
 yarn.lock                                     | 14 ++++++++-
 3 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 .yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch

diff --git a/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch b/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch
new file mode 100644
index 000000000000..fb9a5c1ef5f6
--- /dev/null
+++ b/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch
@@ -0,0 +1,30 @@
+diff --git a/dist/NonceTracker.js b/dist/NonceTracker.js
+index 7cfa1e1962c930a425b3dbf6e1520450f0bf1747..2f4ff77a678fe0501e96a92d16f63a8e5f299401 100644
+--- a/dist/NonceTracker.js
++++ b/dist/NonceTracker.js
+@@ -12,7 +12,6 @@ class NonceTracker {
+     constructor(opts) {
+         this.provider = opts.provider;
+         this.blockTracker = opts.blockTracker;
+-        this.web3 = new Web3Provider(opts.provider);
+         this.getPendingTransactions = opts.getPendingTransactions;
+         this.getConfirmedTransactions = opts.getConfirmedTransactions;
+         this.lockMap = {};
+@@ -96,7 +95,7 @@ class NonceTracker {
+         // we need to make sure our base count
+         // and pending count are from the same block
+         const blockNumber = await this.blockTracker.getLatestBlock();
+-        const baseCount = await this.web3.getTransactionCount(address, blockNumber);
++        const baseCount = await new Web3Provider(this.provider).getTransactionCount(address, blockNumber);
+         assert_1.default(Number.isInteger(baseCount), `nonce-tracker - baseCount is not an integer - got: (${typeof baseCount}) "${baseCount}"`);
+         return {
+             name: 'network',
+diff --git a/dist/NonceTracker.js.map b/dist/NonceTracker.js.map
+index 70e16afc468187dddb2ba1a6752e60c0aadb0f82..0e9d43aed1f7c5ccc2e16f91318aaab88da104ea 100644
+--- a/dist/NonceTracker.js.map
++++ b/dist/NonceTracker.js.map
+@@ -1 +1 @@
+-{"version":3,"file":"NonceTracker.js","sourceRoot":"","sources":["../src/NonceTracker.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
++{"version":3,"file":"NonceTracker.js","sourceRoot":"","sources":["../src/NonceTracker.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
diff --git a/package.json b/package.json
index e5d4671a35af..699dc1b55523 100644
--- a/package.json
+++ b/package.json
@@ -253,7 +253,8 @@
     "@expo/config/glob": "^10.3.10",
     "@expo/config-plugins/glob": "^10.3.10",
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch",
-    "@solana/web3.js/rpc-websockets": "^8.0.1"
+    "@solana/web3.js/rpc-websockets": "^8.0.1",
+    "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
diff --git a/yarn.lock b/yarn.lock
index 9c1e7619adc2..31d04b8c651b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5730,7 +5730,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/nonce-tracker@npm:^5.0.0":
+"@metamask/nonce-tracker@npm:5.0.0":
   version: 5.0.0
   resolution: "@metamask/nonce-tracker@npm:5.0.0"
   dependencies:
@@ -5742,6 +5742,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/nonce-tracker@patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch":
+  version: 5.0.0
+  resolution: "@metamask/nonce-tracker@patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch::version=5.0.0&hash=b362e2"
+  dependencies:
+    "@ethersproject/providers": "npm:^5.7.2"
+    async-mutex: "npm:^0.3.1"
+  peerDependencies:
+    "@metamask/eth-block-tracker": ">=9"
+  checksum: 10/89c3e5219edc104ecc5f7bfb81f818a0800f946c9dd11d54ac79558e4abdbc895032dc2d7fed400a2d46b03ee6370dc393d62ec15b6cc0f2d3b45bcba6240fe0
+  languageName: node
+  linkType: hard
+
 "@metamask/notification-controller@npm:^3.0.0":
   version: 3.0.0
   resolution: "@metamask/notification-controller@npm:3.0.0"

From 19c3eb4ce964bb2b97b167b9af25dd7786e80dd0 Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Tue, 18 Jun 2024 12:26:23 +0100
Subject: [PATCH 045/236] v12.0.0 fix: failing push notifications (#25379)
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 fixes push notifications so that they are not silent push
notifications. Some of our notifications we send through push, have a
different data shape. And since the shape was different (missing
polyfilled fields) it was not parsable and hence would only show the
default notification message

PR: https://github.com/MetaMask/metamask-extension/pull/25340
Commit Hash:
[68d35f0dc2d9edc2a67849f4f932fb2a189af33a](https://github.com/MetaMask/metamask-extension/commit/68d35f0dc2d9edc2a67849f4f932fb2a189af33a)

**There were no merge conflicts when picking these commits.**

<!--
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/25340?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Create a wallet notification
2. See push notification received

## **Screenshots/Recordings**

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

### **Before**



![image](https://github.com/MetaMask/metamask-extension/assets/17534261/672702a9-b8d1-40ba-970e-adca7fbfedfc)


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

### **After**

![Screenshot 2024-06-14 at 21 04

55](https://github.com/MetaMask/metamask-extension/assets/17534261/3fcf8792-04c2-4825-89dc-389006f0e4f9)



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

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../services/services.ts                          | 15 +++++++++------
 .../utils/get-notification-image.ts               |  6 ++++++
 .../utils/get-notification-message.ts             |  5 ++++-
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 app/scripts/controllers/push-platform-notifications/utils/get-notification-image.ts

diff --git a/app/scripts/controllers/push-platform-notifications/services/services.ts b/app/scripts/controllers/push-platform-notifications/services/services.ts
index da15be11c8d8..392cd22ad051 100644
--- a/app/scripts/controllers/push-platform-notifications/services/services.ts
+++ b/app/scripts/controllers/push-platform-notifications/services/services.ts
@@ -195,18 +195,21 @@ export async function listenToPushNotifications(
   const unsubscribePushNotifications = onBackgroundMessage(
     messaging,
     async (payload: MessagePayload): Promise<void> => {
-      const typedPayload = payload;
-
-      // if the payload does not contain data, do nothing
       try {
-        const notificationData: NotificationUnion = typedPayload?.data?.data
-          ? JSON.parse(typedPayload?.data?.data)
+        const data = payload?.data?.data
+          ? JSON.parse(payload?.data?.data)
           : undefined;
 
-        if (!notificationData) {
+        // if the payload does not contain data, do nothing
+        if (!data) {
           return;
         }
 
+        const notificationData = {
+          ...data,
+          type: data?.type ?? data?.data?.kind,
+        } as NotificationUnion;
+
         const notification = processNotification(notificationData);
         onNewNotification(notification);
 
diff --git a/app/scripts/controllers/push-platform-notifications/utils/get-notification-image.ts b/app/scripts/controllers/push-platform-notifications/utils/get-notification-image.ts
new file mode 100644
index 000000000000..3dbaf951b3d0
--- /dev/null
+++ b/app/scripts/controllers/push-platform-notifications/utils/get-notification-image.ts
@@ -0,0 +1,6 @@
+import browser from 'webextension-polyfill';
+
+export async function getNotificationImage() {
+  const iconUrl = await browser.runtime.getURL('../../images/icon-64.png');
+  return iconUrl;
+}
diff --git a/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
index e979e9cc5b53..514c5b40fadc 100644
--- a/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
+++ b/app/scripts/controllers/push-platform-notifications/utils/get-notification-message.ts
@@ -9,6 +9,7 @@ import { t } from '../../../translate';
 import type { Notification } from '../../metamask-notifications/types/types';
 import ExtensionPlatform from '../../../platforms/extension';
 import { getAmount, formatAmount } from './get-notification-data';
+import { getNotificationImage } from './get-notification-image';
 
 type PushNotificationMessage = {
   title: string;
@@ -47,9 +48,11 @@ export async function onPushNotification(
     return;
   }
 
+  const iconUrl = await getNotificationImage();
+
   await registration.showNotification(notificationMessage.title, {
     body: notificationMessage.description,
-    icon: './images/icon-64.png',
+    icon: iconUrl,
     tag: notification?.id,
     data: notification,
   });

From 755ecedf27e2a796d169ba2d906fafc2025cde77 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Tue, 18 Jun 2024 15:11:15 +0200
Subject: [PATCH 046/236] v12.0.0 fix: logic for using notifications tabs
 (#25382)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR introduces two small fixes:
- If there are no snaps with notifications, the tabs for filtering
results are not displayed on the notifications page.
- Feature announcements are included in the onChain tab and not in the
Web3 tab.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25350?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25382?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/notifications/notifications.test.tsx |  2 +
 ui/pages/notifications/notifications.tsx      | 95 ++++++++++---------
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/ui/pages/notifications/notifications.test.tsx b/ui/pages/notifications/notifications.test.tsx
index 61f793775f34..fc7675a85dea 100644
--- a/ui/pages/notifications/notifications.test.tsx
+++ b/ui/pages/notifications/notifications.test.tsx
@@ -4,6 +4,7 @@ import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+import mockState from '../../../test/data/mock-state.json';
 import Notifications from './notifications';
 
 const mockDispatch = jest.fn();
@@ -32,6 +33,7 @@ jest.mock('../../store/actions', () => ({
 
 const initialState = {
   metamask: {
+    ...mockState.metamask,
     theme: 'light',
     isMetamaskNotificationsEnabled: true,
     isFeatureAnnouncementsEnabled: true,
diff --git a/ui/pages/notifications/notifications.tsx b/ui/pages/notifications/notifications.tsx
index 138011fe5124..5b5d89e6645a 100644
--- a/ui/pages/notifications/notifications.tsx
+++ b/ui/pages/notifications/notifications.tsx
@@ -16,7 +16,7 @@ import {
 import { NotificationsPage } from '../../components/multichain';
 import { Content, Header } from '../../components/multichain/pages/page';
 import { useMetamaskNotificationsContext } from '../../contexts/metamask-notifications/metamask-notifications';
-import { getNotifications } from '../../selectors';
+import { getNotifications, getNotifySnaps } from '../../selectors';
 import {
   selectIsFeatureAnnouncementsEnabled,
   selectIsMetamaskNotificationsEnabled,
@@ -142,17 +142,15 @@ const filterNotifications = (
   }
 
   if (activeTab === TAB_KEYS.WALLET) {
-    return notifications.filter((notification) =>
-      TRIGGER_TYPES_WALLET_SET.has(notification.type),
+    return notifications.filter(
+      (notification) =>
+        TRIGGER_TYPES_WALLET_SET.has(notification.type) ||
+        notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT,
     );
   }
 
   if (activeTab === TAB_KEYS.WEB3) {
-    return notifications.filter(
-      (notification) =>
-        notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT ||
-        notification.type === 'SNAP',
-    );
+    return notifications.filter((notification) => notification.type === 'SNAP');
   }
 
   return notifications;
@@ -172,6 +170,9 @@ export default function Notifications() {
     [activeTab, combinedNotifications],
   );
 
+  let hasNotifySnaps = false;
+  hasNotifySnaps = useSelector(getNotifySnaps).length > 0;
+
   return (
     <NotificationsPage>
       {/* Back and Settings Buttons */}
@@ -202,44 +203,46 @@ export default function Notifications() {
       >
         {t('notifications')}
       </Header>
-      <Content paddingLeft={0} paddingRight={0}>
-        <Tabs
-          defaultActiveTabKey={activeTab}
-          onTabClick={(tab) => setActiveTab(tab)}
-          tabsClassName="notifications__tabs"
-        >
-          <Tab
-            activeClassName="notifications__tab--active"
-            className="notifications__tab"
-            data-testid={TAB_KEYS.ALL}
-            name={t('all')}
-            tabKey={TAB_KEYS.ALL}
-          />
-          <Tab
-            activeClassName="notifications__tab--active"
-            className="notifications__tab"
-            data-testid={TAB_KEYS.WALLET}
-            name={
-              <Box
-                display={Display.Flex}
-                justifyContent={JustifyContent.center}
-                alignItems={AlignItems.center}
-                gap={2}
-              >
-                {t('wallet')}
-                <NewFeatureTag />
-              </Box>
-            }
-            tabKey={TAB_KEYS.WALLET}
-          ></Tab>
-          <Tab
-            activeClassName="notifications__tab--active"
-            className="notifications__tab"
-            data-testid={TAB_KEYS.WEB3}
-            name={t('web3')}
-            tabKey={TAB_KEYS.WEB3}
-          />
-        </Tabs>
+      <Content paddingLeft={0} paddingRight={0} paddingTop={0}>
+        {hasNotifySnaps && (
+          <Tabs
+            defaultActiveTabKey={activeTab}
+            onTabClick={(tab) => setActiveTab(tab)}
+            tabsClassName="notifications__tabs"
+          >
+            <Tab
+              activeClassName="notifications__tab--active"
+              className="notifications__tab"
+              data-testid={TAB_KEYS.ALL}
+              name={t('all')}
+              tabKey={TAB_KEYS.ALL}
+            />
+            <Tab
+              activeClassName="notifications__tab--active"
+              className="notifications__tab"
+              data-testid={TAB_KEYS.WALLET}
+              name={
+                <Box
+                  display={Display.Flex}
+                  justifyContent={JustifyContent.center}
+                  alignItems={AlignItems.center}
+                  gap={2}
+                >
+                  {t('wallet')}
+                  <NewFeatureTag />
+                </Box>
+              }
+              tabKey={TAB_KEYS.WALLET}
+            ></Tab>
+            <Tab
+              activeClassName="notifications__tab--active"
+              className="notifications__tab"
+              data-testid={TAB_KEYS.WEB3}
+              name={t('web3')}
+              tabKey={TAB_KEYS.WEB3}
+            />
+          </Tabs>
+        )}
         <NotificationsList
           activeTab={activeTab}
           notifications={filteredNotifications}

From 3e4608101a55506dee709aae73ae5da47767bd95 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Fri, 14 Jun 2024 23:41:16 -0600
Subject: [PATCH 047/236] fix: swap+send bugs in Version v12.0.0 release
 (#25307)

---
 test/data/transaction-data.json               | 1388 +++++++++++++++++
 .../tests/swap-send/swap-send-erc20.spec.ts   |    3 +-
 .../e2e/tests/swap-send/swap-send-eth.spec.ts |    6 +-
 .../tests/swap-send/swap-send-test-utils.ts   |   12 +-
 .../multichain/asset-picker-amount/index.scss |   12 +-
 .../send/components/recipient-content.tsx     |    7 +-
 .../ui/unit-input/unit-input.component.js     |    1 +
 ui/hooks/useSwappedTokenValue.js              |   33 +-
 ui/hooks/useTransactionDisplayData.js         |    3 +-
 ui/hooks/useTransactionDisplayData.test.js    |   30 +-
 10 files changed, 1470 insertions(+), 25 deletions(-)

diff --git a/test/data/transaction-data.json b/test/data/transaction-data.json
index bdcbd7cd6abf..ad2dacfe082c 100644
--- a/test/data/transaction-data.json
+++ b/test/data/transaction-data.json
@@ -1252,5 +1252,1393 @@
     },
     "hasRetried": false,
     "hasCancelled": false
+  },
+  {
+    "nonce": "0x9",
+    "transactions": [
+      {
+        "actionId": 1718133500046.724,
+        "approvalTxId": "5ce4f880-2827-11ef-9c65-d1738f73c46f",
+        "baseFeePerGas": "0x0",
+        "blockTimestamp": "0x6668a2fd",
+        "chainId": "0x38",
+        "defaultGasEstimates": {
+          "estimateType": "medium",
+          "gas": "0x51fc6",
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "destinationTokenAddress": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+        "destinationTokenAmount": "4990565483715933000",
+        "destinationTokenDecimals": 18,
+        "destinationTokenSymbol": "DAI",
+        "hash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+        "history": [],
+        "id": "5cf9b900-2827-11ef-9c65-d1738f73c46f",
+        "networkClientId": "899c28d9-9f01-43c6-be76-b5e9f3cfe8bc",
+        "origin": "metamask",
+        "r": "0x443ec5a1269c18767b078894d177b4067831ea9ddcb33ebf92670d6667940985",
+        "rawTx": "0x02f903f1380984b2d05e0084b2d05e0083051fc6943cb693656622fc470f0bb07d3f5813f7889bf82e80b90384048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c188380000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc30000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b82680400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000148c43c9ef600000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b826804000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d000000000000000000000000e9e7cea3dedca5984780bafc599bd69add087d560000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc3869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb0000000000000000000000000000000000000000aca7f7533c2098f78f35db24000000000000000000000000000000000000000000000000c001a0443ec5a1269c18767b078894d177b4067831ea9ddcb33ebf92670d6667940985a0519c27715e9ce0cab31e7738ffad7d454088c3e3c855f54b8a0965a17d999c62",
+        "s": "0x519c27715e9ce0cab31e7738ffad7d454088c3e3c855f54b8a0965a17d999c62",
+        "sendFlowHistory": [],
+        "sourceTokenAddress": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+        "sourceTokenAmount": "5000000000000000000",
+        "sourceTokenDecimals": 18,
+        "sourceTokenSymbol": "USDC",
+        "status": "confirmed",
+        "submittedTime": 1718133500335,
+        "swapAndSendRecipient": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "swapTokenValue": "5",
+        "time": 1718133500048,
+        "txParams": {
+          "data": "0x048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c188380000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc30000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b82680400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000148c43c9ef600000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b826804000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d000000000000000000000000e9e7cea3dedca5984780bafc599bd69add087d560000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc3869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb0000000000000000000000000000000000000000aca7f7533c2098f78f35db24000000000000000000000000000000000000000000000000",
+          "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+          "gas": "0x51fc6",
+          "gasLimit": "0x51fc6",
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00",
+          "nonce": "0x9",
+          "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+          "type": "0x2",
+          "value": "0x0"
+        },
+        "txReceipt": {
+          "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+          "blockNumber": "0x25b2338",
+          "contractAddress": null,
+          "cumulativeGasUsed": "0x30fb3e",
+          "effectiveGasPrice": "0xb2d05e00",
+          "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+          "gasUsed": "0x401d6",
+          "logs": [
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+              "logIndex": "0x45",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x46",
+              "removed": false,
+              "topics": [
+                "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+                "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838",
+                "0x0000000000000000000000003cb693656622fc470f0bb07d3f5813f7889bf82e"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+              "logIndex": "0x47",
+              "removed": false,
+              "topics": [
+                "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+              "logIndex": "0x48",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+                "0x0000000000000000000000002354ef4df11afacb85a5c7f98b624072eccddbb1"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x49",
+              "removed": false,
+              "topics": [
+                "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0xe9e7cea3dedca5984780bafc599bd69add087d56",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x00000000000000000000000000000000000000000000000045351670c8c8eb16",
+              "logIndex": "0x4a",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x0000000000000000000000002354ef4df11afacb85a5c7f98b624072eccddbb1",
+                "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x2354ef4df11afacb85a5c7f98b624072eccddbb1",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x000000000000000000000000000000000000000000005cf210c436771e7d4016000000000000000000000000000000000000000000005cfaf19326e57b4c5707",
+              "logIndex": "0x4b",
+              "removed": false,
+              "topics": [
+                "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x2354ef4df11afacb85a5c7f98b624072eccddbb1",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000000004563918244f400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045351670c8c8eb16",
+              "logIndex": "0x4c",
+              "removed": false,
+              "topics": [
+                "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+                "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x000000000000000000000000000000000000000000000000453047e918796cfd",
+              "logIndex": "0x4d",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x66fdb2eccfb58cf098eaa419e5efde841368e489",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000020c638a3898eb7869dcf0000000000000000000000000000000000000000000020af974dbd9430b354c8",
+              "logIndex": "0x4e",
+              "removed": false,
+              "topics": [
+                "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x66fdb2eccfb58cf098eaa419e5efde841368e489",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045351670c8c8eb16000000000000000000000000000000000000000000000000453047e918796cfd0000000000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x4f",
+              "removed": false,
+              "topics": [
+                "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x50",
+              "removed": false,
+              "topics": [
+                "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x000000000000000000000000000000000000000000000000453047e918796cfd",
+              "logIndex": "0x51",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+                "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            },
+            {
+              "address": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+              "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+              "blockNumber": "0x25b2338",
+              "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000045357415000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x52",
+              "removed": false,
+              "topics": [
+                "0x0c18aae526accb31b01cf9a15bdf435e70632ee31efc4c5c0752c4262ea45d2f"
+              ],
+              "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+              "transactionIndex": "0x21"
+            }
+          ],
+          "logsBloom": "0x006000000040001000000000800004000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000002000c0000000010000012000040008000000240000000000000088000000000000000008000000000000000000000004000040000000000000002008000010000000020000000000000001000000000040008000000000000800084000004000000100020000000000000000004000000000000000000000000000004000000000000000000002000000020000000000001000000040100000001000000020000000000010000000004002000000100000000000800000008000000000000001000000",
+          "status": "0x1",
+          "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+          "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+          "transactionIndex": "0x21",
+          "type": "0x2"
+        },
+        "type": "swapAndSend",
+        "userEditedGasLimit": false,
+        "userFeeLevel": "medium",
+        "v": "0x1",
+        "verifiedOnBlockchain": true
+      }
+    ],
+    "initialTransaction": {
+      "actionId": 1718133500046.724,
+      "approvalTxId": "5ce4f880-2827-11ef-9c65-d1738f73c46f",
+      "baseFeePerGas": "0x0",
+      "blockTimestamp": "0x6668a2fd",
+      "chainId": "0x38",
+      "defaultGasEstimates": {
+        "estimateType": "medium",
+        "gas": "0x51fc6",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00"
+      },
+      "destinationTokenAddress": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+      "destinationTokenAmount": "4990565483715933000",
+      "destinationTokenDecimals": 18,
+      "destinationTokenSymbol": "DAI",
+      "hash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+      "history": [],
+      "id": "5cf9b900-2827-11ef-9c65-d1738f73c46f",
+      "networkClientId": "899c28d9-9f01-43c6-be76-b5e9f3cfe8bc",
+      "origin": "metamask",
+      "r": "0x443ec5a1269c18767b078894d177b4067831ea9ddcb33ebf92670d6667940985",
+      "rawTx": "0x02f903f1380984b2d05e0084b2d05e0083051fc6943cb693656622fc470f0bb07d3f5813f7889bf82e80b90384048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c188380000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc30000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b82680400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000148c43c9ef600000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b826804000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d000000000000000000000000e9e7cea3dedca5984780bafc599bd69add087d560000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc3869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb0000000000000000000000000000000000000000aca7f7533c2098f78f35db24000000000000000000000000000000000000000000000000c001a0443ec5a1269c18767b078894d177b4067831ea9ddcb33ebf92670d6667940985a0519c27715e9ce0cab31e7738ffad7d454088c3e3c855f54b8a0965a17d999c62",
+      "s": "0x519c27715e9ce0cab31e7738ffad7d454088c3e3c855f54b8a0965a17d999c62",
+      "sendFlowHistory": [],
+      "sourceTokenAddress": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+      "sourceTokenAmount": "5000000000000000000",
+      "sourceTokenDecimals": 18,
+      "sourceTokenSymbol": "USDC",
+      "status": "confirmed",
+      "submittedTime": 1718133500335,
+      "swapAndSendRecipient": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "swapTokenValue": "5",
+      "time": 1718133500048,
+      "txParams": {
+        "data": "0x048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c188380000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc30000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b82680400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000148c43c9ef600000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b826804000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d000000000000000000000000e9e7cea3dedca5984780bafc599bd69add087d560000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc3869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb0000000000000000000000000000000000000000aca7f7533c2098f78f35db24000000000000000000000000000000000000000000000000",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gas": "0x51fc6",
+        "gasLimit": "0x51fc6",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00",
+        "nonce": "0x9",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "type": "0x2",
+        "value": "0x0"
+      },
+      "txReceipt": {
+        "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+        "blockNumber": "0x25b2338",
+        "contractAddress": null,
+        "cumulativeGasUsed": "0x30fb3e",
+        "effectiveGasPrice": "0xb2d05e00",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gasUsed": "0x401d6",
+        "logs": [
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+            "logIndex": "0x45",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x46",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838",
+              "0x0000000000000000000000003cb693656622fc470f0bb07d3f5813f7889bf82e"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+            "logIndex": "0x47",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+            "logIndex": "0x48",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x0000000000000000000000002354ef4df11afacb85a5c7f98b624072eccddbb1"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x49",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0xe9e7cea3dedca5984780bafc599bd69add087d56",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x00000000000000000000000000000000000000000000000045351670c8c8eb16",
+            "logIndex": "0x4a",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x0000000000000000000000002354ef4df11afacb85a5c7f98b624072eccddbb1",
+              "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x2354ef4df11afacb85a5c7f98b624072eccddbb1",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000005cf210c436771e7d4016000000000000000000000000000000000000000000005cfaf19326e57b4c5707",
+            "logIndex": "0x4b",
+            "removed": false,
+            "topics": [
+              "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x2354ef4df11afacb85a5c7f98b624072eccddbb1",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045351670c8c8eb16",
+            "logIndex": "0x4c",
+            "removed": false,
+            "topics": [
+              "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000453047e918796cfd",
+            "logIndex": "0x4d",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x66fdb2eccfb58cf098eaa419e5efde841368e489",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000020c638a3898eb7869dcf0000000000000000000000000000000000000000000020af974dbd9430b354c8",
+            "logIndex": "0x4e",
+            "removed": false,
+            "topics": [
+              "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x66fdb2eccfb58cf098eaa419e5efde841368e489",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045351670c8c8eb16000000000000000000000000000000000000000000000000453047e918796cfd0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x4f",
+            "removed": false,
+            "topics": [
+              "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x50",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000453047e918796cfd",
+            "logIndex": "0x51",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000045357415000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x52",
+            "removed": false,
+            "topics": [
+              "0x0c18aae526accb31b01cf9a15bdf435e70632ee31efc4c5c0752c4262ea45d2f"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          }
+        ],
+        "logsBloom": "0x006000000040001000000000800004000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000002000c0000000010000012000040008000000240000000000000088000000000000000008000000000000000000000004000040000000000000002008000010000000020000000000000001000000000040008000000000000800084000004000000100020000000000000000004000000000000000000000000000004000000000000000000002000000020000000000001000000040100000001000000020000000000010000000004002000000100000000000800000008000000000000001000000",
+        "status": "0x1",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+        "transactionIndex": "0x21",
+        "type": "0x2"
+      },
+      "type": "swapAndSend",
+      "userEditedGasLimit": false,
+      "userFeeLevel": "medium",
+      "v": "0x1",
+      "verifiedOnBlockchain": true
+    },
+    "primaryTransaction": {
+      "actionId": 1718133500046.724,
+      "approvalTxId": "5ce4f880-2827-11ef-9c65-d1738f73c46f",
+      "baseFeePerGas": "0x0",
+      "blockTimestamp": "0x6668a2fd",
+      "chainId": "0x38",
+      "defaultGasEstimates": {
+        "estimateType": "medium",
+        "gas": "0x51fc6",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00"
+      },
+      "destinationTokenAddress": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+      "destinationTokenAmount": "4990565483715933000",
+      "destinationTokenDecimals": 18,
+      "destinationTokenSymbol": "DAI",
+      "hash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+      "history": [],
+      "id": "5cf9b900-2827-11ef-9c65-d1738f73c46f",
+      "networkClientId": "899c28d9-9f01-43c6-be76-b5e9f3cfe8bc",
+      "origin": "metamask",
+      "r": "0x443ec5a1269c18767b078894d177b4067831ea9ddcb33ebf92670d6667940985",
+      "rawTx": "0x02f903f1380984b2d05e0084b2d05e0083051fc6943cb693656622fc470f0bb07d3f5813f7889bf82e80b90384048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c188380000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc30000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b82680400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000148c43c9ef600000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b826804000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d000000000000000000000000e9e7cea3dedca5984780bafc599bd69add087d560000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc3869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb0000000000000000000000000000000000000000aca7f7533c2098f78f35db24000000000000000000000000000000000000000000000000c001a0443ec5a1269c18767b078894d177b4067831ea9ddcb33ebf92670d6667940985a0519c27715e9ce0cab31e7738ffad7d454088c3e3c855f54b8a0965a17d999c62",
+      "s": "0x519c27715e9ce0cab31e7738ffad7d454088c3e3c855f54b8a0965a17d999c62",
+      "sendFlowHistory": [],
+      "sourceTokenAddress": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+      "sourceTokenAmount": "5000000000000000000",
+      "sourceTokenDecimals": 18,
+      "sourceTokenSymbol": "USDC",
+      "status": "confirmed",
+      "submittedTime": 1718133500335,
+      "swapAndSendRecipient": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "swapTokenValue": "5",
+      "time": 1718133500048,
+      "txParams": {
+        "data": "0x048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c188380000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d0000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc30000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b82680400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000148c43c9ef600000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000004563918244f4000000000000000000000000000000000000000000000000000043df73024b826804000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d000000000000000000000000e9e7cea3dedca5984780bafc599bd69add087d560000000000000000000000001af3f329e8be154074d8769d1ffa4ee058b1dbc3869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb0000000000000000000000000000000000000000aca7f7533c2098f78f35db24000000000000000000000000000000000000000000000000",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gas": "0x51fc6",
+        "gasLimit": "0x51fc6",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00",
+        "nonce": "0x9",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "type": "0x2",
+        "value": "0x0"
+      },
+      "txReceipt": {
+        "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+        "blockNumber": "0x25b2338",
+        "contractAddress": null,
+        "cumulativeGasUsed": "0x30fb3e",
+        "effectiveGasPrice": "0xb2d05e00",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gasUsed": "0x401d6",
+        "logs": [
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+            "logIndex": "0x45",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x46",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838",
+              "0x0000000000000000000000003cb693656622fc470f0bb07d3f5813f7889bf82e"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+            "logIndex": "0x47",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f40000",
+            "logIndex": "0x48",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x0000000000000000000000002354ef4df11afacb85a5c7f98b624072eccddbb1"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x49",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0xe9e7cea3dedca5984780bafc599bd69add087d56",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x00000000000000000000000000000000000000000000000045351670c8c8eb16",
+            "logIndex": "0x4a",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x0000000000000000000000002354ef4df11afacb85a5c7f98b624072eccddbb1",
+              "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x2354ef4df11afacb85a5c7f98b624072eccddbb1",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000005cf210c436771e7d4016000000000000000000000000000000000000000000005cfaf19326e57b4c5707",
+            "logIndex": "0x4b",
+            "removed": false,
+            "topics": [
+              "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x2354ef4df11afacb85a5c7f98b624072eccddbb1",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000004563918244f400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045351670c8c8eb16",
+            "logIndex": "0x4c",
+            "removed": false,
+            "topics": [
+              "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000453047e918796cfd",
+            "logIndex": "0x4d",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x00000000000000000000000066fdb2eccfb58cf098eaa419e5efde841368e489",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x66fdb2eccfb58cf098eaa419e5efde841368e489",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000020c638a3898eb7869dcf0000000000000000000000000000000000000000000020af974dbd9430b354c8",
+            "logIndex": "0x4e",
+            "removed": false,
+            "topics": [
+              "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x66fdb2eccfb58cf098eaa419e5efde841368e489",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045351670c8c8eb16000000000000000000000000000000000000000000000000453047e918796cfd0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x4f",
+            "removed": false,
+            "topics": [
+              "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x50",
+            "removed": false,
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000453047e918796cfd",
+            "logIndex": "0x51",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          },
+          {
+            "address": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+            "blockHash": "0x2ad0174dc123330852694ddeaa1924450b6bba340485f18abe3a6681bc8896f7",
+            "blockNumber": "0x25b2338",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000045357415000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x52",
+            "removed": false,
+            "topics": [
+              "0x0c18aae526accb31b01cf9a15bdf435e70632ee31efc4c5c0752c4262ea45d2f"
+            ],
+            "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+            "transactionIndex": "0x21"
+          }
+        ],
+        "logsBloom": "0x006000000040001000000000800004000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000002000c0000000010000012000040008000000240000000000000088000000000000000008000000000000000000000004000040000000000000002008000010000000020000000000000001000000000040008000000000000800084000004000000100020000000000000000004000000000000000000000000000004000000000000000000002000000020000000000001000000040100000001000000020000000000010000000004002000000100000000000800000008000000000000001000000",
+        "status": "0x1",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "transactionHash": "0x5be1ae5ae27c4e2a5542228b4f7967a660881dcbc71521a978ea6d9c3b3971fe",
+        "transactionIndex": "0x21",
+        "type": "0x2"
+      },
+      "type": "swapAndSend",
+      "userEditedGasLimit": false,
+      "userFeeLevel": "medium",
+      "v": "0x1",
+      "verifiedOnBlockchain": true
+    },
+    "hasRetried": false,
+    "hasCancelled": false
+  },
+  {
+    "nonce": "0x0",
+    "transactions": [
+      {
+        "actionId": 1717789986313.557,
+        "baseFeePerGas": "0x0",
+        "blockTimestamp": "0x66636524",
+        "chainId": "0x38",
+        "defaultGasEstimates": {
+          "estimateType": "medium",
+          "gas": "0x397cf",
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "destinationTokenAddress": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+        "destinationTokenAmount": "33721280446418538542",
+        "destinationTokenDecimals": 18,
+        "destinationTokenSymbol": "USDC",
+        "firstRetryBlockNumber": "0x259650b",
+        "gasFeeEstimates": {
+          "high": {
+            "maxFeePerGas": "0xb2d05e00",
+            "maxPriorityFeePerGas": "0xb2d05e00"
+          },
+          "low": {
+            "maxFeePerGas": "0xb2d05e00",
+            "maxPriorityFeePerGas": "0xb2d05e00"
+          },
+          "medium": {
+            "maxFeePerGas": "0xb2d05e00",
+            "maxPriorityFeePerGas": "0xb2d05e00"
+          },
+          "type": "fee-market"
+        },
+        "gasFeeEstimatesLoaded": true,
+        "hash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+        "history": [],
+        "id": "8ed642e0-2507-11ef-99c4-53f3fc2768a2",
+        "networkClientId": "899c28d9-9f01-43c6-be76-b5e9f3cfe8bc",
+        "origin": "metamask",
+        "r": "0x7fbbe0d92a8da53a9bc98ef8144c6677ecb08050ea180548d93b7830cb407a2a",
+        "rawTx": "0x02f903d8388084b2d05e0084b2d05e00830397cf943cb693656622fc470f0bb07d3f5813f7889bf82e87b1a2bc2ec50000b90364048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec5000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000000000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d00000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000018de76816d80000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000128c43c9ef6000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb000000000000000000000000000000003736a41146b8f4bb97dbe80a5771808c000000000000000000000000000000000000000000000000c001a07fbbe0d92a8da53a9bc98ef8144c6677ecb08050ea180548d93b7830cb407a2aa04d050489b179ec7832166566d3769408ef6c407d0032243cdabeb99bab87d634",
+        "s": "0x4d050489b179ec7832166566d3769408ef6c407d0032243cdabeb99bab87d634",
+        "sendFlowHistory": [],
+        "sourceTokenAddress": "0x0000000000000000000000000000000000000000",
+        "sourceTokenAmount": "50000000000000000",
+        "sourceTokenDecimals": 18,
+        "sourceTokenSymbol": "BNB",
+        "status": "confirmed",
+        "submittedTime": 1717789986704,
+        "swapAndSendRecipient": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "swapTokenValue": "0.05",
+        "time": 1717789986319,
+        "txParams": {
+          "data": "0x048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec5000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000000000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d00000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000018de76816d80000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000128c43c9ef6000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb000000000000000000000000000000003736a41146b8f4bb97dbe80a5771808c000000000000000000000000000000000000000000000000",
+          "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+          "gas": "0x397cf",
+          "gasLimit": "0x397cf",
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00",
+          "nonce": "0x0",
+          "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+          "type": "0x2",
+          "value": "0xb1a2bc2ec50000"
+        },
+        "txReceipt": {
+          "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+          "blockNumber": "0x259650c",
+          "contractAddress": null,
+          "cumulativeGasUsed": "0x2644bd",
+          "effectiveGasPrice": "0xb2d05e00",
+          "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+          "gasUsed": "0x31a28",
+          "logs": [
+            {
+              "address": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+              "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+              "blockNumber": "0x259650c",
+              "data": "0x00000000000000000000000000000000000000000000000000b014d4c6ae2800",
+              "logIndex": "0x38",
+              "removed": false,
+              "topics": [
+                "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+              ],
+              "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+              "transactionIndex": "0x2e"
+            },
+            {
+              "address": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+              "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+              "blockNumber": "0x259650c",
+              "data": "0x00000000000000000000000000000000000000000000000000b014d4c6ae2800",
+              "logIndex": "0x39",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+                "0x000000000000000000000000d99c7f6c65857ac913a8f880a4cb84032ab2fc5b"
+              ],
+              "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+              "transactionIndex": "0x2e"
+            },
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+              "blockNumber": "0x259650c",
+              "data": "0x000000000000000000000000000000000000000000000001d3be028ce893dfbe",
+              "logIndex": "0x3a",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x000000000000000000000000d99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+              ],
+              "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+              "transactionIndex": "0x2e"
+            },
+            {
+              "address": "0xd99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+              "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+              "blockNumber": "0x259650c",
+              "data": "0x000000000000000000000000000000000000000000003ef046f04c7cafc1e5e20000000000000000000000000000000000000000000000179ff39de2fc5b390a",
+              "logIndex": "0x3b",
+              "removed": false,
+              "topics": [
+                "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+              ],
+              "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+              "transactionIndex": "0x2e"
+            },
+            {
+              "address": "0xd99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+              "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+              "blockNumber": "0x259650c",
+              "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001d3be028ce893dfbe0000000000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x3c",
+              "removed": false,
+              "topics": [
+                "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+                "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+              ],
+              "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+              "transactionIndex": "0x2e"
+            },
+            {
+              "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+              "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+              "blockNumber": "0x259650c",
+              "data": "0x000000000000000000000000000000000000000000000001d3be028ce893dfbe",
+              "logIndex": "0x3d",
+              "removed": false,
+              "topics": [
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+                "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838"
+              ],
+              "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+              "transactionIndex": "0x2e"
+            },
+            {
+              "address": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+              "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+              "blockNumber": "0x259650c",
+              "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000045357415000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x3e",
+              "removed": false,
+              "topics": [
+                "0x0c18aae526accb31b01cf9a15bdf435e70632ee31efc4c5c0752c4262ea45d2f"
+              ],
+              "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+              "transactionIndex": "0x2e"
+            }
+          ],
+          "logsBloom": "0x00600000000000000000000080000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000010000012000000008000000200000000000000000000400008000000000400000000000000000000004000040000000000000000008000010000000000000000000000001000000000040008000040001000800080000004000000000000000000000000000004000000000000000000000000004024000000000000000000002000000000000040000000000000000000000001040000000000080000000000000005002000000000000000000000000000000400000000001000000",
+          "status": "0x1",
+          "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+          "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+          "transactionIndex": "0x2e",
+          "type": "0x2"
+        },
+        "type": "swapAndSend",
+        "userEditedGasLimit": false,
+        "userFeeLevel": "medium",
+        "v": "0x1",
+        "verifiedOnBlockchain": true
+      }
+    ],
+    "initialTransaction": {
+      "actionId": 1717789986313.557,
+      "baseFeePerGas": "0x0",
+      "blockTimestamp": "0x66636524",
+      "chainId": "0x38",
+      "defaultGasEstimates": {
+        "estimateType": "medium",
+        "gas": "0x397cf",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00"
+      },
+      "destinationTokenAddress": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+      "destinationTokenAmount": "33721280446418538542",
+      "destinationTokenDecimals": 18,
+      "destinationTokenSymbol": "USDC",
+      "firstRetryBlockNumber": "0x259650b",
+      "gasFeeEstimates": {
+        "high": {
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "low": {
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "medium": {
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "type": "fee-market"
+      },
+      "gasFeeEstimatesLoaded": true,
+      "hash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+      "history": [],
+      "id": "8ed642e0-2507-11ef-99c4-53f3fc2768a2",
+      "networkClientId": "899c28d9-9f01-43c6-be76-b5e9f3cfe8bc",
+      "origin": "metamask",
+      "r": "0x7fbbe0d92a8da53a9bc98ef8144c6677ecb08050ea180548d93b7830cb407a2a",
+      "rawTx": "0x02f903d8388084b2d05e0084b2d05e00830397cf943cb693656622fc470f0bb07d3f5813f7889bf82e87b1a2bc2ec50000b90364048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec5000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000000000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d00000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000018de76816d80000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000128c43c9ef6000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb000000000000000000000000000000003736a41146b8f4bb97dbe80a5771808c000000000000000000000000000000000000000000000000c001a07fbbe0d92a8da53a9bc98ef8144c6677ecb08050ea180548d93b7830cb407a2aa04d050489b179ec7832166566d3769408ef6c407d0032243cdabeb99bab87d634",
+      "s": "0x4d050489b179ec7832166566d3769408ef6c407d0032243cdabeb99bab87d634",
+      "sendFlowHistory": [],
+      "sourceTokenAddress": "0x0000000000000000000000000000000000000000",
+      "sourceTokenAmount": "50000000000000000",
+      "sourceTokenDecimals": 18,
+      "sourceTokenSymbol": "BNB",
+      "status": "confirmed",
+      "submittedTime": 1717789986704,
+      "swapAndSendRecipient": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "swapTokenValue": "0.05",
+      "time": 1717789986319,
+      "txParams": {
+        "data": "0x048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec5000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000000000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d00000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000018de76816d80000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000128c43c9ef6000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb000000000000000000000000000000003736a41146b8f4bb97dbe80a5771808c000000000000000000000000000000000000000000000000",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gas": "0x397cf",
+        "gasLimit": "0x397cf",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00",
+        "nonce": "0x0",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "type": "0x2",
+        "value": "0xb1a2bc2ec50000"
+      },
+      "txReceipt": {
+        "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+        "blockNumber": "0x259650c",
+        "contractAddress": null,
+        "cumulativeGasUsed": "0x2644bd",
+        "effectiveGasPrice": "0xb2d05e00",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gasUsed": "0x31a28",
+        "logs": [
+          {
+            "address": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x00000000000000000000000000000000000000000000000000b014d4c6ae2800",
+            "logIndex": "0x38",
+            "removed": false,
+            "topics": [
+              "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x00000000000000000000000000000000000000000000000000b014d4c6ae2800",
+            "logIndex": "0x39",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x000000000000000000000000d99c7f6c65857ac913a8f880a4cb84032ab2fc5b"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000001d3be028ce893dfbe",
+            "logIndex": "0x3a",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000d99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0xd99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000003ef046f04c7cafc1e5e20000000000000000000000000000000000000000000000179ff39de2fc5b390a",
+            "logIndex": "0x3b",
+            "removed": false,
+            "topics": [
+              "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0xd99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001d3be028ce893dfbe0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x3c",
+            "removed": false,
+            "topics": [
+              "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000001d3be028ce893dfbe",
+            "logIndex": "0x3d",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000045357415000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x3e",
+            "removed": false,
+            "topics": [
+              "0x0c18aae526accb31b01cf9a15bdf435e70632ee31efc4c5c0752c4262ea45d2f"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          }
+        ],
+        "logsBloom": "0x00600000000000000000000080000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000010000012000000008000000200000000000000000000400008000000000400000000000000000000004000040000000000000000008000010000000000000000000000001000000000040008000040001000800080000004000000000000000000000000000004000000000000000000000000004024000000000000000000002000000000000040000000000000000000000001040000000000080000000000000005002000000000000000000000000000000400000000001000000",
+        "status": "0x1",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+        "transactionIndex": "0x2e",
+        "type": "0x2"
+      },
+      "type": "swapAndSend",
+      "userEditedGasLimit": false,
+      "userFeeLevel": "medium",
+      "v": "0x1",
+      "verifiedOnBlockchain": true
+    },
+    "primaryTransaction": {
+      "actionId": 1717789986313.557,
+      "baseFeePerGas": "0x0",
+      "blockTimestamp": "0x66636524",
+      "chainId": "0x38",
+      "defaultGasEstimates": {
+        "estimateType": "medium",
+        "gas": "0x397cf",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00"
+      },
+      "destinationTokenAddress": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+      "destinationTokenAmount": "33721280446418538542",
+      "destinationTokenDecimals": 18,
+      "destinationTokenSymbol": "USDC",
+      "firstRetryBlockNumber": "0x259650b",
+      "gasFeeEstimates": {
+        "high": {
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "low": {
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "medium": {
+          "maxFeePerGas": "0xb2d05e00",
+          "maxPriorityFeePerGas": "0xb2d05e00"
+        },
+        "type": "fee-market"
+      },
+      "gasFeeEstimatesLoaded": true,
+      "hash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+      "history": [],
+      "id": "8ed642e0-2507-11ef-99c4-53f3fc2768a2",
+      "networkClientId": "899c28d9-9f01-43c6-be76-b5e9f3cfe8bc",
+      "origin": "metamask",
+      "r": "0x7fbbe0d92a8da53a9bc98ef8144c6677ecb08050ea180548d93b7830cb407a2a",
+      "rawTx": "0x02f903d8388084b2d05e0084b2d05e00830397cf943cb693656622fc470f0bb07d3f5813f7889bf82e87b1a2bc2ec50000b90364048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec5000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000000000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d00000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000018de76816d80000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000128c43c9ef6000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb000000000000000000000000000000003736a41146b8f4bb97dbe80a5771808c000000000000000000000000000000000000000000000000c001a07fbbe0d92a8da53a9bc98ef8144c6677ecb08050ea180548d93b7830cb407a2aa04d050489b179ec7832166566d3769408ef6c407d0032243cdabeb99bab87d634",
+      "s": "0x4d050489b179ec7832166566d3769408ef6c407d0032243cdabeb99bab87d634",
+      "sendFlowHistory": [],
+      "sourceTokenAddress": "0x0000000000000000000000000000000000000000",
+      "sourceTokenAmount": "50000000000000000",
+      "sourceTokenDecimals": 18,
+      "sourceTokenSymbol": "BNB",
+      "status": "confirmed",
+      "submittedTime": 1717789986704,
+      "swapAndSendRecipient": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "swapTokenValue": "0.05",
+      "time": 1717789986319,
+      "txParams": {
+        "data": "0x048226a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec5000000000000000000000000000000000000000000000000000000000000000002a0000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000000000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d00000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000018de76816d80000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000128c43c9ef6000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001ca9e03628c802fdb00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000008ac76a51cc950d9822d68b83fe1ad97b32cd580d869584cd00000000000000000000000011ededebf63bef0ea2d2d071bdf88f71543ec6fb000000000000000000000000000000003736a41146b8f4bb97dbe80a5771808c000000000000000000000000000000000000000000000000",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gas": "0x397cf",
+        "gasLimit": "0x397cf",
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0xb2d05e00",
+        "nonce": "0x0",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "type": "0x2",
+        "value": "0xb1a2bc2ec50000"
+      },
+      "txReceipt": {
+        "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+        "blockNumber": "0x259650c",
+        "contractAddress": null,
+        "cumulativeGasUsed": "0x2644bd",
+        "effectiveGasPrice": "0xb2d05e00",
+        "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+        "gasUsed": "0x31a28",
+        "logs": [
+          {
+            "address": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x00000000000000000000000000000000000000000000000000b014d4c6ae2800",
+            "logIndex": "0x38",
+            "removed": false,
+            "topics": [
+              "0xe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x00000000000000000000000000000000000000000000000000b014d4c6ae2800",
+            "logIndex": "0x39",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x000000000000000000000000d99c7f6c65857ac913a8f880a4cb84032ab2fc5b"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000001d3be028ce893dfbe",
+            "logIndex": "0x3a",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000d99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0xd99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000003ef046f04c7cafc1e5e20000000000000000000000000000000000000000000000179ff39de2fc5b390a",
+            "logIndex": "0x3b",
+            "removed": false,
+            "topics": [
+              "0x1c411e9a96e071241c2f21f7726b17ae89e3cab4c78be50e062b03a9fffbbad1"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0xd99c7f6c65857ac913a8f880a4cb84032ab2fc5b",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b014d4c6ae2800000000000000000000000000000000000000000000000001d3be028ce893dfbe0000000000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x3c",
+            "removed": false,
+            "topics": [
+              "0xd78ad95fa46c994b6551d0da85fc275fe613ce37657fb8d5e3d130840159d822",
+              "0x000000000000000000000000def1c0ded9bec7f1a1670819833240f027b25eff",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000001d3be028ce893dfbe",
+            "logIndex": "0x3d",
+            "removed": false,
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x000000000000000000000000bd7607133b9620320e745b3e0b1af717f8ea5889",
+              "0x000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          },
+          {
+            "address": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+            "blockHash": "0xdf447bf7f6018f3b30ddc7004f45d8d55f68434865a05598ce4c1fd774642590",
+            "blockNumber": "0x259650c",
+            "data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000045357415000000000000000000000000000000000000000000000000000000000",
+            "logIndex": "0x3e",
+            "removed": false,
+            "topics": [
+              "0x0c18aae526accb31b01cf9a15bdf435e70632ee31efc4c5c0752c4262ea45d2f"
+            ],
+            "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+            "transactionIndex": "0x2e"
+          }
+        ],
+        "logsBloom": "0x00600000000000000000000080000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000010000012000000008000000200000000000000000000400008000000000400000000000000000000004000040000000000000000008000010000000000000000000000001000000000040008000040001000800080000004000000000000000000000000000004000000000000000000000000004024000000000000000000002000000000000040000000000000000000000001040000000000080000000000000005002000000000000000000000000000000400000000001000000",
+        "status": "0x1",
+        "to": "0x3cb693656622fc470f0bb07d3f5813f7889bf82e",
+        "transactionHash": "0x5b13c4573b31d93bfb564c4f8506448bba16908b6974a4c0494a40d9aa622de7",
+        "transactionIndex": "0x2e",
+        "type": "0x2"
+      },
+      "type": "swapAndSend",
+      "userEditedGasLimit": false,
+      "userFeeLevel": "medium",
+      "v": "0x1",
+      "verifiedOnBlockchain": true
+    },
+    "hasRetried": false,
+    "hasCancelled": false
   }
 ]
diff --git a/test/e2e/tests/swap-send/swap-send-erc20.spec.ts b/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
index 3e2fdc1f7b41..2fe73a9b53aa 100644
--- a/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
+++ b/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
@@ -21,6 +21,7 @@ describe('Swap-Send ERC20', function () {
         getSwapSendFixtures(
           this.test?.fullTitle(),
           SWAP_SEND_QUOTES_RESPONSE_TST_ETH,
+          '?sourceAmount=100000&sourceToken=0x581c3C1A2A4EBDE2A0Df29B5cf4c116E42945947&destinationToken=0x0000000000000000000000000000000000000000&sender=0x5cfe73b6021e818b776b421b1c4db2474086a7e1&recipient=0xc427D562164062a23a5cFf596A4a3208e72Acd28&slippage=2',
         ),
         async ({
           driver,
@@ -104,7 +105,7 @@ describe('Swap-Send ERC20', function () {
             'Send TST as ETH',
             'Confirmed',
             '-10 TST',
-            '-$0.00',
+            '',
           );
 
           driver.summarizeErrorsAndExceptions();
diff --git a/test/e2e/tests/swap-send/swap-send-eth.spec.ts b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
index f7835af0c332..780840d28b04 100644
--- a/test/e2e/tests/swap-send/swap-send-eth.spec.ts
+++ b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
@@ -71,18 +71,20 @@ describe('Swap-Send ETH', function () {
             '≈ $4,515,000,000.00',
           );
 
+          // TODO assert swap api request payload
+
           await swapSendPage.submitSwap();
           await swapSendPage.verifyHistoryEntry(
             'Send ETH as TST',
             'Pending',
             '-1 ETH',
-            '-$3,010.00',
+            '',
           );
           await swapSendPage.verifyHistoryEntry(
             'Send ETH as TST',
             'Confirmed',
             '-1 ETH',
-            '-$3,010.00',
+            '',
           );
 
           driver.summarizeErrorsAndExceptions();
diff --git a/test/e2e/tests/swap-send/swap-send-test-utils.ts b/test/e2e/tests/swap-send/swap-send-test-utils.ts
index 0cfff6449b7f..bcb76ae9c378 100644
--- a/test/e2e/tests/swap-send/swap-send-test-utils.ts
+++ b/test/e2e/tests/swap-send/swap-send-test-utils.ts
@@ -2,7 +2,7 @@ import { strict as assert } from 'assert';
 import { Mockttp } from 'mockttp';
 import FixtureBuilder from '../../fixture-builder';
 import { SWAPS_API_V2_BASE_URL } from '../../../../shared/constants/swaps';
-import { defaultGanacheOptions } from '../../helpers';
+import { generateGanacheOptions } from '../../helpers';
 import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import { SWAP_SEND_QUOTES_RESPONSE_ETH_TST } from './mocks/eth-data';
 
@@ -245,10 +245,11 @@ export class SwapSendPage {
 }
 
 export const mockSwapsApi =
-  (quotes = SWAP_SEND_QUOTES_RESPONSE_ETH_TST) =>
+  (quotes: typeof SWAP_SEND_QUOTES_RESPONSE_ETH_TST, query: string) =>
   async (mockServer: Mockttp) => {
-    return await mockServer
+    await mockServer
       .forGet(`${SWAPS_API_V2_BASE_URL}/v2/networks/1337/quotes`)
+      .withExactQuery(query)
       .always()
       .thenCallback(() => {
         return {
@@ -261,6 +262,7 @@ export const mockSwapsApi =
 export const getSwapSendFixtures = (
   title?: string,
   swapsQuotes = SWAP_SEND_QUOTES_RESPONSE_ETH_TST,
+  swapsQuery = '?sourceAmount=1000000000000000000&sourceToken=0x0000000000000000000000000000000000000000&destinationToken=0x581c3C1A2A4EBDE2A0Df29B5cf4c116E42945947&sender=0x5cfe73b6021e818b776b421b1c4db2474086a7e1&recipient=0xc427D562164062a23a5cFf596A4a3208e72Acd28&slippage=2',
 ) => {
   const ETH_CONVERSION_RATE_USD = 3010;
   return {
@@ -296,8 +298,8 @@ export const getSwapSendFixtures = (
       .build(),
     smartContract: SMART_CONTRACTS.HST,
     ethConversionInUsd: ETH_CONVERSION_RATE_USD,
-    testSpecificMock: mockSwapsApi(swapsQuotes),
-    ganacheOptions: defaultGanacheOptions,
+    testSpecificMock: mockSwapsApi(swapsQuotes, swapsQuery),
+    ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
     title,
   };
 };
diff --git a/ui/components/multichain/asset-picker-amount/index.scss b/ui/components/multichain/asset-picker-amount/index.scss
index 573e71c83f05..b9f22ba6d1cf 100644
--- a/ui/components/multichain/asset-picker-amount/index.scss
+++ b/ui/components/multichain/asset-picker-amount/index.scss
@@ -36,7 +36,7 @@
     .unit-input__inputs {
       // primary (i.e., input) and secondary (i.e., subtext) input sections
       & > div {
-        max-width: 125px;
+        max-width: 138px;
         white-space: nowrap;
         text-overflow: ellipsis;
       }
@@ -51,7 +51,15 @@
 
         text-overflow: ellipsis;
         overflow: hidden;
-        display: inline;
+        flex-wrap: nowrap;
+
+        & > span.currency-display-component__text {
+          width: max-content;
+        }
+
+        & > span.currency-display-component__suffix {
+          width: max-content;
+        }
       }
 
       // secondary field elements (e.g., value, symbols)
diff --git a/ui/components/multichain/pages/send/components/recipient-content.tsx b/ui/components/multichain/pages/send/components/recipient-content.tsx
index 6ca53ae62575..90a73a932c4b 100644
--- a/ui/components/multichain/pages/send/components/recipient-content.tsx
+++ b/ui/components/multichain/pages/send/components/recipient-content.tsx
@@ -25,6 +25,7 @@ import {
   getUseExternalServices,
 } from '../../../../../selectors';
 import type { Quote } from '../../../../../ducks/send/swap-and-send-utils';
+import { isEqualCaseInsensitive } from '../../../../../../shared/modules/string-utils';
 import { SendHexData, SendPageRow, QuoteCard } from '.';
 
 export const SendPageRecipientContent = ({
@@ -59,8 +60,10 @@ export const SendPageRecipientContent = ({
 
   const isLoadingInitialQuotes = !bestQuote && isSwapQuoteLoading;
 
-  const isBasicSend =
-    receiveAsset.details?.address === sendAsset.details?.address;
+  const isBasicSend = isEqualCaseInsensitive(
+    receiveAsset.details?.address ?? '',
+    sendAsset.details?.address ?? '',
+  );
 
   const amount = isBasicSend
     ? sendAmount
diff --git a/ui/components/ui/unit-input/unit-input.component.js b/ui/components/ui/unit-input/unit-input.component.js
index e916cf5e2e3f..727a33e98c4a 100644
--- a/ui/components/ui/unit-input/unit-input.component.js
+++ b/ui/components/ui/unit-input/unit-input.component.js
@@ -95,6 +95,7 @@ export default class UnitInput extends PureComponent {
     }
 
     this.props.onBlur && this.props.onBlur(value);
+    this.unitInput.scrollTo && this.unitInput.scrollTo(0, 0);
   };
 
   handleChange = (event) => {
diff --git a/ui/hooks/useSwappedTokenValue.js b/ui/hooks/useSwappedTokenValue.js
index a93140373829..c7007346d7c0 100644
--- a/ui/hooks/useSwappedTokenValue.js
+++ b/ui/hooks/useSwappedTokenValue.js
@@ -37,16 +37,16 @@ export function useSwappedTokenValue(transactionGroup, currentAsset) {
   const chainId = useSelector(getCurrentChainId);
 
   const isViewingReceivedTokenFromSwap =
-    currentAsset?.symbol === primaryTransaction.destinationTokenSymbol ||
-    (isSwapsDefaultTokenAddress(currentAsset.address, chainId) &&
-      isSwapsDefaultTokenSymbol(
-        primaryTransaction.destinationTokenSymbol,
-        chainId,
-      ));
+    type === TransactionType.swap &&
+    (currentAsset?.symbol === primaryTransaction.destinationTokenSymbol ||
+      (isSwapsDefaultTokenAddress(currentAsset.address, chainId) &&
+        isSwapsDefaultTokenSymbol(
+          primaryTransaction.destinationTokenSymbol,
+          chainId,
+        )));
 
   const swapTokenValue =
-    [TransactionType.swap, TransactionType.swapAndSend].includes(type) &&
-    isViewingReceivedTokenFromSwap
+    [TransactionType.swap].includes(type) && isViewingReceivedTokenFromSwap
       ? getSwapsTokensReceivedFromTxMeta(
           primaryTransaction.destinationTokenSymbol,
           initialTransaction,
@@ -69,8 +69,21 @@ export function useSwappedTokenValue(transactionGroup, currentAsset) {
     swapTokenValue || '',
     symbol,
   );
-  const swapTokenFiatAmount =
-    swapTokenValue && isViewingReceivedTokenFromSwap && _swapTokenFiatAmount;
+  const _swapAndSendTokenFiatAmount = useTokenFiatAmount(
+    primaryTransaction.sourceTokenAddress,
+    swapTokenValue,
+    primaryTransaction.sourceTokenSymbol,
+  );
+
+  let swapTokenFiatAmount;
+  if (swapTokenValue) {
+    if (isViewingReceivedTokenFromSwap) {
+      swapTokenFiatAmount = _swapTokenFiatAmount;
+    } else if (type === TransactionType.swapAndSend) {
+      swapTokenFiatAmount = _swapAndSendTokenFiatAmount;
+    }
+  }
+
   return {
     swapTokenValue,
     swapTokenFiatAmount,
diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index 019a9ec13fa2..4b551b318b62 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -394,7 +394,8 @@ export function useTransactionDisplayData(transactionGroup) {
     recipientAddress,
     secondaryCurrency:
       (isTokenCategory && !tokenFiatAmount) ||
-      (type === TransactionType.swap && !swapTokenFiatAmount)
+      ([TransactionType.swap, TransactionType.swapAndSend].includes(type) &&
+        !swapTokenFiatAmount)
         ? undefined
         : secondaryCurrency,
     displayedStatusKey,
diff --git a/ui/hooks/useTransactionDisplayData.test.js b/ui/hooks/useTransactionDisplayData.test.js
index 6a8838fdbd61..0755105a32f7 100644
--- a/ui/hooks/useTransactionDisplayData.test.js
+++ b/ui/hooks/useTransactionDisplayData.test.js
@@ -165,10 +165,36 @@ const expectedResults = [
     subtitle: 'metamask',
     subtitleContainsOrigin: true,
     date: formatDateWithYearContext(1585088013000),
-    primaryCurrency: '-0 BAT',
+    primaryCurrency: '-33.425656732428330864 BAT',
     senderAddress: '0x0a985a957b490f4d05bef05bc7ec556dd8535946',
     recipientAddress: '0xc6f6ca03d790168758285264bcbf7fb30d27322b',
-    secondaryCurrency: '-0 ETH',
+    secondaryCurrency: undefined,
+    isPending: false,
+    displayedStatusKey: TransactionStatus.confirmed,
+  },
+  {
+    title: 'Send USDC as DAI',
+    category: TransactionType.swapAndSend,
+    subtitle: 'metamask',
+    subtitleContainsOrigin: true,
+    date: formatDateWithYearContext(1585088013000),
+    primaryCurrency: '-5 USDC',
+    senderAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
+    recipientAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
+    secondaryCurrency: undefined,
+    isPending: false,
+    displayedStatusKey: TransactionStatus.confirmed,
+  },
+  {
+    title: 'Send BNB as USDC',
+    category: TransactionType.swapAndSend,
+    subtitle: 'metamask',
+    subtitleContainsOrigin: true,
+    date: formatDateWithYearContext(1585088013000),
+    primaryCurrency: '-0.05 BNB',
+    senderAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
+    recipientAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
+    secondaryCurrency: undefined,
     isPending: false,
     displayedStatusKey: TransactionStatus.confirmed,
   },

From a9f7d7114eed5054bd77e73ddcecd931bf332b94 Mon Sep 17 00:00:00 2001
From: Derek Brans <dbrans@gmail.com>
Date: Wed, 12 Jun 2024 18:04:22 -0400
Subject: [PATCH 048/236] fix: swap+send e2e tests (#25275)

---
 test/e2e/tests/swap-send/swap-send-erc20.spec.ts | 4 ++--
 test/e2e/tests/swap-send/swap-send-eth.spec.ts   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/e2e/tests/swap-send/swap-send-erc20.spec.ts b/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
index 2fe73a9b53aa..10b18592f42b 100644
--- a/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
+++ b/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
@@ -75,8 +75,8 @@ describe('Swap-Send ERC20', function () {
 
           await swapSendPage.verifyQuoteDisplay(
             '1 TST = 0.000002634 ETH',
-            '879687 ETH',
-            '≈ $2,647,857,870.00',
+            '0.0075669 ETH',
+            '≈ $22.78',
           );
 
           await swapSendPage.submitSwap();
diff --git a/test/e2e/tests/swap-send/swap-send-eth.spec.ts b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
index 780840d28b04..244693d513a2 100644
--- a/test/e2e/tests/swap-send/swap-send-eth.spec.ts
+++ b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
@@ -67,8 +67,8 @@ describe('Swap-Send ETH', function () {
 
           await swapSendPage.verifyQuoteDisplay(
             '1 ETH = 301075.4807 TST',
-            '1500000 ETH', // TODO this looks weird
-            '≈ $4,515,000,000.00',
+            '0.0129028 ETH',
+            '≈ $38.84',
           );
 
           // TODO assert swap api request payload
@@ -116,7 +116,7 @@ describe('Swap-Send ETH', function () {
 
         await swapSendPage.verifyMaxButtonClick(
           ['ETH', 'ETH'],
-          ['24.995559472', '24.995559472'],
+          ['24.9970184730279925', '24.9970184730279925'],
         );
       },
     );

From 2c4822be627cfd3a0707f715a599ab01ce7fec86 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 19 Jun 2024 06:18:36 -0230
Subject: [PATCH 049/236] chore: Cherry pick 25372 v12 (#25395)

Cherry-pick https://github.com/MetaMask/metamask-extension/pull/25372 to
v12

this will fix the audit failure on the v12 branch/PR

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
---
 package.json |  2 ++
 yarn.lock    | 52 +++++++++++-----------------------------------------
 2 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 699dc1b55523..fee996b1730c 100644
--- a/package.json
+++ b/package.json
@@ -190,6 +190,8 @@
     "regenerator-runtime@^0.13.4": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
     "regenerator-runtime@^0.13.7": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
     "regenerator-runtime@^0.11.0": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
+    "ws@8.13.0": "^8.17.1",
+    "ws@7.4.6": "^7.5.10",
     "jsdom@^16.7.0": "patch:jsdom@npm%3A16.7.0#./.yarn/patches/jsdom-npm-16.7.0-216c5c4bf9.patch",
     "trim": "^0.0.3",
     "@eslint/eslintrc@npm:^2.1.4": "patch:@eslint/eslintrc@npm%3A2.1.4#~/.yarn/patches/@eslint-eslintrc-npm-2.1.4-1ff4b5f908.patch",
diff --git a/yarn.lock b/yarn.lock
index 31d04b8c651b..8004288ae8a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -35678,9 +35678,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:*, ws@npm:>=8.14.2, ws@npm:^8.11.0, ws@npm:^8.16.0, ws@npm:^8.2.3, ws@npm:^8.5.0, ws@npm:^8.8.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
+"ws@npm:*, ws@npm:>=8.14.2, ws@npm:^8.11.0, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.2.3, ws@npm:^8.5.0, ws@npm:^8.8.0":
+  version: 8.17.1
+  resolution: "ws@npm:8.17.1"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -35689,52 +35689,22 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10/7c511c59e979bd37b63c3aea4a8e4d4163204f00bd5633c053b05ed67835481995f61a523b0ad2b603566f9a89b34cb4965cb9fab9649fbfebd8f740cea57f17
-  languageName: node
-  linkType: hard
-
-"ws@npm:7.4.6":
-  version: 7.4.6
-  resolution: "ws@npm:7.4.6"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 10/150e3f917b7cde568d833a5ea6ccc4132e59c38d04218afcf2b6c7b845752bd011a9e0dc1303c8694d3c402a0bdec5893661a390b71ff88f0fc81a4e4e66b09c
-  languageName: node
-  linkType: hard
-
-"ws@npm:8.13.0":
-  version: 8.13.0
-  resolution: "ws@npm:8.13.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 10/1769532b6fdab9ff659f0b17810e7501831d34ecca23fd179ee64091dd93a51f42c59f6c7bb4c7a384b6c229aca8076fb312aa35626257c18081511ef62a161d
+  checksum: 10/4264ae92c0b3e59c7e309001e93079b26937aab181835fb7af79f906b22cd33b6196d96556dafb4e985742dd401e99139572242e9847661fdbc96556b9e6902d
   languageName: node
   linkType: hard
 
 "ws@npm:^6.1.0":
-  version: 6.2.2
-  resolution: "ws@npm:6.2.2"
+  version: 6.2.3
+  resolution: "ws@npm:6.2.3"
   dependencies:
     async-limiter: "npm:~1.0.0"
-  checksum: 10/bb791ac02ad7e59fd4208cc6dd3a5bf7a67dff4611a128ed33365996f9fc24fa0d699043559f1798b4bc8045639fd21a1fd3ceca81de560124444abd8e321afc
+  checksum: 10/19f8d1608317f4c98f63da6eebaa85260a6fe1ba459cbfedd83ebe436368177fb1e2944761e2392c6b7321cbb7a375c8a81f9e1be35d555b6b4647eb61eadd46
   languageName: node
   linkType: hard
 
-"ws@npm:^7, ws@npm:^7.2.0, ws@npm:^7.4.5, ws@npm:^7.4.6, ws@npm:^7.5.0":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+"ws@npm:^7, ws@npm:^7.2.0, ws@npm:^7.4.5, ws@npm:^7.4.6, ws@npm:^7.5.0, ws@npm:^7.5.10":
+  version: 7.5.10
+  resolution: "ws@npm:7.5.10"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -35743,7 +35713,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10/171e35012934bd8788150a7f46f963e50bac43a4dc524ee714c20f258693ac4d3ba2abadb00838fdac42a47af9e958c7ae7e6f4bc56db047ba897b8a2268cf7c
+  checksum: 10/9c796b84ba80ffc2c2adcdfc9c8e9a219ba99caa435c9a8d45f9ac593bba325563b3f83edc5eb067cc6d21b9a6bf2c930adf76dd40af5f58a5ca6859e81858f0
   languageName: node
   linkType: hard
 

From ba52059d9aa274d5ad5127dac58b4060de86b1c9 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Tue, 18 Jun 2024 13:43:17 +0200
Subject: [PATCH 050/236] chore: Refactor offscreen creation logic (#25302)

Refactor initialization logic to defer creation of the offscreen
document until the `MetaMaskController` is initialized. This adds a
`offscreenPromise` to the controller that can be awaited for
functionality that requires the offscreen document to be created.

Additionally this PR adds a message that the offscreen document will
send once initial execution of the offscreen page has finished. This is
awaited in the `offscreenPromise`.

We await `offscreenPromise` before unlocking the keyrings as some
keyrings rely on the offscreen document to process requests, e.g.
hardware wallets.

There may be room for more improvements here though, that I have not
tackled in this PR. As the hardware wallet logic doesn't seem to wait
for iframes to fully load, so there is a chance of some missed messages.

I have tested that hardware wallet support, at least for Ledger, is
still working following the changes in this PR.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25302?quickstart=1)
---
 app/scripts/app-init.js                     | 24 -----------
 app/scripts/background.js                   |  7 ++++
 app/scripts/metamask-controller.js          |  6 +++
 app/scripts/offscreen.js                    | 44 +++++++++++++++++++++
 offscreen/scripts/offscreen.ts              |  6 +++
 shared/constants/offscreen-communication.ts |  1 +
 6 files changed, 64 insertions(+), 24 deletions(-)
 create mode 100644 app/scripts/offscreen.js

diff --git a/app/scripts/app-init.js b/app/scripts/app-init.js
index 3290dc59d84b..766ba15e2d0d 100644
--- a/app/scripts/app-init.js
+++ b/app/scripts/app-init.js
@@ -185,27 +185,3 @@ const registerInPageContentScript = async () => {
 };
 
 registerInPageContentScript();
-
-/**
- * Creates an offscreen document that can be used to load additional scripts
- * and iframes that can communicate with the extension through the chrome
- * runtime API. Only one offscreen document may exist, so any iframes required
- * by extension can be embedded in the offscreen.html file. See the offscreen
- * folder for more details.
- */
-async function createOffscreen() {
-  if (!chrome.offscreen || (await chrome.offscreen.hasDocument())) {
-    return;
-  }
-
-  await chrome.offscreen.createDocument({
-    url: './offscreen.html',
-    reasons: ['IFRAME_SCRIPTING'],
-    justification:
-      'Used for Hardware Wallet and Snaps scripts to communicate with the extension.',
-  });
-
-  console.debug('Offscreen iframe loaded');
-}
-
-createOffscreen();
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 1fde714275cd..c7a1621fba19 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -67,6 +67,7 @@ import {
   shouldEmitDappViewedEvent,
 } from './lib/util';
 import { generateSkipOnboardingState } from './skip-onboarding';
+import { createOffscreen } from './offscreen';
 
 /* eslint-enable import/first */
 
@@ -278,6 +279,8 @@ function saveTimestamp() {
  */
 async function initialize() {
   try {
+    const offscreenPromise = isManifestV3 ? createOffscreen() : null;
+
     const initData = await loadStateFromPersistence();
 
     const initState = initData.data;
@@ -314,6 +317,7 @@ async function initialize() {
       {},
       isFirstMetaMaskControllerSetup,
       initData.meta,
+      offscreenPromise,
     );
     if (!isManifestV3) {
       await loadPhishingWarningPage();
@@ -528,6 +532,7 @@ function emitDappViewedMetricEvent(
  * @param {object} overrides - object with callbacks that are allowed to override the setup controller logic (usefull for desktop app)
  * @param isFirstMetaMaskControllerSetup
  * @param {object} stateMetadata - Metadata about the initial state and migrations, including the most recent migration version
+ * @param {Promise<void>} offscreenPromise - A promise that resolves when the offscreen document has finished initialization.
  */
 export function setupController(
   initState,
@@ -535,6 +540,7 @@ export function setupController(
   overrides,
   isFirstMetaMaskControllerSetup,
   stateMetadata,
+  offscreenPromise,
 ) {
   //
   // MetaMask Controller
@@ -563,6 +569,7 @@ export function setupController(
     isFirstMetaMaskControllerSetup,
     currentMigrationVersion: stateMetadata.version,
     featureFlags: {},
+    offscreenPromise,
   });
 
   setupEnsIpfsResolver({
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fdfddfd3689b..d2e8580e105f 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -371,6 +371,8 @@ export default class MetamaskController extends EventEmitter {
     // the only thing that uses controller connections are open metamask UI instances
     this.activeControllerConnections = 0;
 
+    this.offscreenPromise = opts.offscreenPromise ?? Promise.resolve();
+
     this.getRequestAccountTabIds = opts.getRequestAccountTabIds;
     this.getOpenMetamaskTabsIds = opts.getOpenMetamaskTabsIds;
 
@@ -4081,6 +4083,10 @@ export default class MetamaskController extends EventEmitter {
    */
   async submitPassword(password) {
     const { completedOnboarding } = this.onboardingController.store.getState();
+
+    // Before attempting to unlock the keyrings, we need the offscreen to have loaded.
+    await this.offscreenPromise;
+
     await this.keyringController.submitPassword(password);
 
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
diff --git a/app/scripts/offscreen.js b/app/scripts/offscreen.js
new file mode 100644
index 000000000000..ba796874f2fc
--- /dev/null
+++ b/app/scripts/offscreen.js
@@ -0,0 +1,44 @@
+import { OffscreenCommunicationTarget } from '../../shared/constants/offscreen-communication';
+
+/**
+ * Creates an offscreen document that can be used to load additional scripts
+ * and iframes that can communicate with the extension through the chrome
+ * runtime API. Only one offscreen document may exist, so any iframes required
+ * by extension can be embedded in the offscreen.html file. See the offscreen
+ * folder for more details.
+ */
+export async function createOffscreen() {
+  const { chrome } = globalThis;
+  if (!chrome.offscreen || (await chrome.offscreen.hasDocument())) {
+    return;
+  }
+
+  const loadPromise = new Promise((resolve) => {
+    const messageListener = (msg) => {
+      if (
+        msg.target === OffscreenCommunicationTarget.extensionMain &&
+        msg.isBooted
+      ) {
+        chrome.runtime.onMessage.removeListener(messageListener);
+        resolve();
+      }
+    };
+    chrome.runtime.onMessage.addListener(messageListener);
+  });
+
+  await chrome.offscreen.createDocument({
+    url: './offscreen.html',
+    reasons: ['IFRAME_SCRIPTING'],
+    justification:
+      'Used for Hardware Wallet and Snaps scripts to communicate with the extension.',
+  });
+
+  // In case we are in a bad state where the offscreen document is not loading, timeout and let execution continue.
+  const timeoutPromise = new Promise((resolve) => {
+    setTimeout(resolve, 5000);
+  });
+
+  await Promise.race([loadPromise, timeoutPromise]);
+
+  console.debug('Offscreen iframe loaded');
+}
diff --git a/offscreen/scripts/offscreen.ts b/offscreen/scripts/offscreen.ts
index 8c0598b4bd3f..c2448ae3c289 100644
--- a/offscreen/scripts/offscreen.ts
+++ b/offscreen/scripts/offscreen.ts
@@ -1,5 +1,6 @@
 import { BrowserRuntimePostMessageStream } from '@metamask/post-message-stream';
 import { ProxySnapExecutor } from '@metamask/snaps-execution-environments';
+import { OffscreenCommunicationTarget } from '../../shared/constants/offscreen-communication';
 import initLedger from './ledger';
 import initTrezor from './trezor';
 import initLattice from './lattice';
@@ -20,3 +21,8 @@ const parentStream = new BrowserRuntimePostMessageStream({
 });
 
 ProxySnapExecutor.initialize(parentStream);
+
+chrome.runtime.sendMessage({
+  target: OffscreenCommunicationTarget.extensionMain,
+  isBooted: true,
+});
diff --git a/shared/constants/offscreen-communication.ts b/shared/constants/offscreen-communication.ts
index cab4232c09dc..618239609956 100644
--- a/shared/constants/offscreen-communication.ts
+++ b/shared/constants/offscreen-communication.ts
@@ -7,6 +7,7 @@ export enum OffscreenCommunicationTarget {
   ledgerOffscreen = 'ledger-offscreen',
   latticeOffscreen = 'lattice-offscreen',
   extension = 'extension-offscreen',
+  extensionMain = 'extension',
 }
 
 /**

From f95565371394a0bb51f233cdf92ff895b5c6506c Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Wed, 19 Jun 2024 11:05:12 +0200
Subject: [PATCH 051/236] chore: Bump Snaps packages (#25292)

Bump snaps packages to latest and handle breaking changes.

~~Depends on #25302~~

Summary of changes in the snaps deps:
- **Breaking:** Defer creation of offscreen document
- Fix an issue with decrypting legacy state blobs
- Support nested children in JSX
- Allow usage of the `tooltip` prop on `Row`
- Revert requiring at least one child in JSX components
- Update `onNameLookup` response to include `domainName`

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25292?quickstart=1)
---
 app/scripts/metamask-controller.js            |   4 +-
 builds.yml                                    |   6 +-
 lavamoat/browserify/beta/policy.json          | 172 +++++++++++----
 lavamoat/browserify/desktop/policy.json       | 202 ++++++++++++++----
 lavamoat/browserify/flask/policy.json         | 202 ++++++++++++++----
 lavamoat/browserify/main/policy.json          | 202 ++++++++++++++----
 lavamoat/browserify/mmi/policy.json           | 202 ++++++++++++++----
 package.json                                  |  12 +-
 test/e2e/snaps/enums.js                       |   2 +-
 .../snaps/snap-ui-renderer/components/row.ts  |   1 +
 yarn.lock                                     | 164 ++++++++++----
 11 files changed, 926 insertions(+), 243 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d2e8580e105f..9782bd1d78eb 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1248,9 +1248,8 @@ export default class MetamaskController extends EventEmitter {
             iframeUrl: new URL(process.env.IFRAME_EXECUTION_ENVIRONMENT_URL),
           })
         : new OffscreenExecutionService({
-            // eslint-disable-next-line no-undef
-            documentUrl: chrome.runtime.getURL('./offscreen.html'),
             ...snapExecutionServiceArgs,
+            offscreenPromise: this.offscreenPromise,
           });
 
     const snapControllerMessenger = this.controllerMessenger.getRestricted({
@@ -1398,7 +1397,6 @@ export default class MetamaskController extends EventEmitter {
       state: initState.SnapsRegistry,
       messenger: snapsRegistryMessenger,
       refetchOnAllowlistMiss: requireAllowlist,
-      failOnUnavailableRegistry: requireAllowlist,
       url: {
         registry: 'https://acl.execution.metamask.io/latest/registry.json',
         signature: 'https://acl.execution.metamask.io/latest/signature.json',
diff --git a/builds.yml b/builds.yml
index 48cc602120bb..9358a8b1dcea 100644
--- a/builds.yml
+++ b/builds.yml
@@ -27,7 +27,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.3.0/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
     # Main build uses the default browser manifest
     manifestOverrides: false
@@ -64,7 +64,7 @@ buildTypes:
       - SEGMENT_FLASK_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: true
       - REQUIRE_SNAPS_ALLOWLIST: false
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.3.0/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
       - SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
       - SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
       - INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
@@ -109,7 +109,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
       - ALLOW_LOCAL_SNAPS: false
       - REQUIRE_SNAPS_ALLOWLIST: true
-      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.3.0/index.html
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
       - MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default
       - SUPPORT_LINK: https://mmi-support.metamask.io/hc/en-us
       - SUPPORT_REQUEST_LINK: https://mmi-support.metamask.io/hc/en-us/requests/new
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 30fe70df1cdc..895997ffb97b 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1759,9 +1759,9 @@
         "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1820,8 +1820,15 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+        "@metamask/utils": true
       }
     },
     "@metamask/notification-controller>nanoid": {
@@ -1854,11 +1861,11 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -1914,8 +1921,8 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/phishing-controller>@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
@@ -1928,24 +1935,6 @@
         "immer": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -2002,10 +1991,10 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/selected-network-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2438,13 +2427,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
-      "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/safe-event-emitter": true,
-        "@metamask/utils": true
-      }
-    },
     "@metamask/snaps-controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2462,8 +2444,8 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils": true,
@@ -2472,13 +2454,65 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>fast-xml-parser": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2492,15 +2526,6 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>fast-xml-parser": {
-      "globals": {
-        "entityName": true,
-        "val": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>fast-xml-parser>strnum": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
@@ -2517,13 +2542,14 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
         "@metamask/snaps-utils>marked": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
@@ -2535,12 +2561,74 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-utils>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/base-controller": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
         "luxon": true
       }
     },
+    "@metamask/snaps-utils>fast-xml-parser": {
+      "globals": {
+        "entityName": true,
+        "val": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+      }
+    },
     "@metamask/snaps-utils>marked": {
       "globals": {
         "console.error": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 1a637052d11f..6c8c137e500b 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1904,9 +1904,9 @@
         "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1965,8 +1965,15 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+        "@metamask/utils": true
       }
     },
     "@metamask/notification-controller": {
@@ -2026,11 +2033,11 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2086,8 +2093,8 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/phishing-controller>@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
@@ -2100,24 +2107,6 @@
         "immer": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -2174,10 +2163,10 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/selected-network-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2627,8 +2616,6 @@
       "globals": {
         "DecompressionStream": true,
         "URL": true,
-        "chrome.offscreen.createDocument": true,
-        "chrome.offscreen.hasDocument": true,
         "clearTimeout": true,
         "document.getElementById": true,
         "fetch.bind": true,
@@ -2636,12 +2623,12 @@
       },
       "packages": {
         "@metamask/object-multiplex": true,
-        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2688,6 +2675,39 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2745,8 +2765,8 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils": true,
@@ -2755,13 +2775,65 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>fast-xml-parser": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2775,15 +2847,6 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>fast-xml-parser": {
-      "globals": {
-        "entityName": true,
-        "val": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>fast-xml-parser>strnum": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
@@ -2800,13 +2863,14 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
         "@metamask/snaps-utils>marked": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
@@ -2818,6 +2882,59 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-utils>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/base-controller": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
@@ -2832,6 +2949,15 @@
         "luxon": true
       }
     },
+    "@metamask/snaps-utils>fast-xml-parser": {
+      "globals": {
+        "entityName": true,
+        "val": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+      }
+    },
     "@metamask/snaps-utils>marked": {
       "globals": {
         "console.error": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 481676bbf8b5..aa61e9d971a4 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1904,9 +1904,9 @@
         "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1965,8 +1965,15 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+        "@metamask/utils": true
       }
     },
     "@metamask/notification-controller": {
@@ -2026,11 +2033,11 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2086,8 +2093,8 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/phishing-controller>@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
@@ -2100,24 +2107,6 @@
         "immer": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -2226,10 +2215,10 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/selected-network-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2679,8 +2668,6 @@
       "globals": {
         "DecompressionStream": true,
         "URL": true,
-        "chrome.offscreen.createDocument": true,
-        "chrome.offscreen.hasDocument": true,
         "clearTimeout": true,
         "document.getElementById": true,
         "fetch.bind": true,
@@ -2688,12 +2675,12 @@
       },
       "packages": {
         "@metamask/object-multiplex": true,
-        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2740,6 +2727,39 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2797,8 +2817,8 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils": true,
@@ -2807,13 +2827,65 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>fast-xml-parser": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2827,15 +2899,6 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>fast-xml-parser": {
-      "globals": {
-        "entityName": true,
-        "val": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>fast-xml-parser>strnum": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
@@ -2852,13 +2915,14 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
         "@metamask/snaps-utils>marked": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
@@ -2870,6 +2934,59 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-utils>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/base-controller": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
@@ -2884,6 +3001,15 @@
         "luxon": true
       }
     },
+    "@metamask/snaps-utils>fast-xml-parser": {
+      "globals": {
+        "entityName": true,
+        "val": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+      }
+    },
     "@metamask/snaps-utils>marked": {
       "globals": {
         "console.error": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 84c84a7491d2..b3440376d9b5 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -1759,9 +1759,9 @@
         "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1820,8 +1820,15 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+        "@metamask/utils": true
       }
     },
     "@metamask/notification-controller": {
@@ -1881,11 +1888,11 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -1941,8 +1948,8 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/phishing-controller>@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
@@ -1955,24 +1962,6 @@
         "immer": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -2081,10 +2070,10 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/selected-network-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2534,8 +2523,6 @@
       "globals": {
         "DecompressionStream": true,
         "URL": true,
-        "chrome.offscreen.createDocument": true,
-        "chrome.offscreen.hasDocument": true,
         "clearTimeout": true,
         "document.getElementById": true,
         "fetch.bind": true,
@@ -2543,12 +2530,12 @@
       },
       "packages": {
         "@metamask/object-multiplex": true,
-        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2595,6 +2582,39 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2652,8 +2672,8 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils": true,
@@ -2662,13 +2682,65 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>fast-xml-parser": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2682,15 +2754,6 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>fast-xml-parser": {
-      "globals": {
-        "entityName": true,
-        "val": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>fast-xml-parser>strnum": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
@@ -2707,13 +2770,14 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
         "@metamask/snaps-utils>marked": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
@@ -2725,6 +2789,59 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-utils>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/base-controller": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
@@ -2739,6 +2856,15 @@
         "luxon": true
       }
     },
+    "@metamask/snaps-utils>fast-xml-parser": {
+      "globals": {
+        "entityName": true,
+        "val": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+      }
+    },
     "@metamask/snaps-utils>marked": {
       "globals": {
         "console.error": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 707f51758f20..892524d9742a 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2044,9 +2044,9 @@
         "@metamask/network-controller>@metamask/controller-utils": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -2105,8 +2105,15 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-provider": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/network-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true
+        "@metamask/utils": true
       }
     },
     "@metamask/notification-controller": {
@@ -2166,11 +2173,11 @@
         "console.error": true
       },
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2226,8 +2233,8 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/controller-utils": true,
         "@metamask/phishing-controller>@metamask/base-controller": true,
-        "@metamask/phishing-controller>@metamask/controller-utils": true,
         "@metamask/phishing-warning>eth-phishing-detect": true,
         "punycode": true
       }
@@ -2240,24 +2247,6 @@
         "immer": true
       }
     },
-    "@metamask/phishing-controller>@metamask/controller-utils": {
-      "globals": {
-        "URL": true,
-        "console.error": true,
-        "fetch": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/ethjs>@metamask/ethjs-unit": true,
-        "@metamask/utils": true,
-        "bn.js": true,
-        "browserify>buffer": true,
-        "eslint>fast-deep-equal": true,
-        "eth-ens-namehash": true
-      }
-    },
     "@metamask/phishing-warning>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -2366,10 +2355,10 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
+        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/selected-network-controller": true,
-        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/utils": true
       }
     },
@@ -2819,8 +2808,6 @@
       "globals": {
         "DecompressionStream": true,
         "URL": true,
-        "chrome.offscreen.createDocument": true,
-        "chrome.offscreen.hasDocument": true,
         "clearTimeout": true,
         "document.getElementById": true,
         "fetch.bind": true,
@@ -2828,12 +2815,12 @@
       },
       "packages": {
         "@metamask/object-multiplex": true,
-        "@metamask/permission-controller": true,
         "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/permission-controller": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2880,6 +2867,39 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2937,8 +2957,8 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils": true,
@@ -2947,13 +2967,65 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
       },
       "packages": {
         "@metamask/providers>@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk>fast-xml-parser": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2967,15 +3039,6 @@
         "@noble/hashes": true
       }
     },
-    "@metamask/snaps-sdk>fast-xml-parser": {
-      "globals": {
-        "entityName": true,
-        "val": true
-      },
-      "packages": {
-        "@metamask/snaps-sdk>fast-xml-parser>strnum": true
-      }
-    },
     "@metamask/snaps-utils": {
       "globals": {
         "File": true,
@@ -2992,13 +3055,14 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/permission-controller": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/permission-controller": true,
         "@metamask/snaps-utils>@metamask/slip44": true,
         "@metamask/snaps-utils>cron-parser": true,
         "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
         "@metamask/snaps-utils>marked": true,
         "@metamask/snaps-utils>rfdc": true,
         "@metamask/snaps-utils>validate-npm-package-name": true,
@@ -3010,6 +3074,59 @@
         "superstruct": true
       }
     },
+    "@metamask/snaps-utils>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-utils>@metamask/base-controller": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
     "@metamask/snaps-utils>@metamask/snaps-registry": {
       "packages": {
         "@metamask/message-signing-snap>@noble/curves": true,
@@ -3024,6 +3141,15 @@
         "luxon": true
       }
     },
+    "@metamask/snaps-utils>fast-xml-parser": {
+      "globals": {
+        "entityName": true,
+        "val": true
+      },
+      "packages": {
+        "@metamask/snaps-utils>fast-xml-parser>strnum": true
+      }
+    },
     "@metamask/snaps-utils>marked": {
       "globals": {
         "console.error": true,
diff --git a/package.json b/package.json
index fee996b1730c..ef57199fa40f 100644
--- a/package.json
+++ b/package.json
@@ -222,7 +222,7 @@
     "semver@7.3.8": "^7.5.4",
     "@trezor/schema-utils@npm:1.0.2": "patch:@trezor/schema-utils@npm%3A1.0.2#~/.yarn/patches/@trezor-schema-utils-npm-1.0.2-7dd48689b2.patch",
     "lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch",
-    "@metamask/snaps-sdk": "^4.4.2",
+    "@metamask/snaps-sdk": "^5.0.0",
     "@metamask/transaction-controller": "^32.0.0",
     "@babel/runtime@npm:^7.7.6": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@babel/runtime@npm:^7.9.2": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
@@ -335,11 +335,11 @@
     "@metamask/selected-network-controller": "^13.0.0",
     "@metamask/signature-controller": "^14.0.1",
     "@metamask/smart-transactions-controller": "^10.1.2",
-    "@metamask/snaps-controllers": "^8.4.0",
-    "@metamask/snaps-execution-environments": "^6.3.0",
-    "@metamask/snaps-rpc-methods": "^9.1.2",
-    "@metamask/snaps-sdk": "^4.4.2",
-    "@metamask/snaps-utils": "^7.5.0",
+    "@metamask/snaps-controllers": "^9.0.0",
+    "@metamask/snaps-execution-environments": "^6.4.0",
+    "@metamask/snaps-rpc-methods": "^9.1.3",
+    "@metamask/snaps-sdk": "^5.0.0",
+    "@metamask/snaps-utils": "^7.6.0",
     "@metamask/transaction-controller": "^32.0.0",
     "@metamask/user-operation-controller": "^10.0.0",
     "@metamask/utils": "^8.2.1",
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
index 5732b1b7f335..daeaf9db924f 100644
--- a/test/e2e/snaps/enums.js
+++ b/test/e2e/snaps/enums.js
@@ -1,3 +1,3 @@
 module.exports = {
-  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.6.1/',
+  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/snaps/test-snaps/2.9.0/',
 };
diff --git a/ui/components/app/snaps/snap-ui-renderer/components/row.ts b/ui/components/app/snaps/snap-ui-renderer/components/row.ts
index 153da8fc8148..b57425250c7a 100644
--- a/ui/components/app/snaps/snap-ui-renderer/components/row.ts
+++ b/ui/components/app/snaps/snap-ui-renderer/components/row.ts
@@ -9,6 +9,7 @@ export const row: UIComponentFactory<Row> = ({ element, ...params }) => ({
   props: {
     label: element.props.label,
     variant: element.props.variant,
+    tooltip: element.props.tooltip,
     style: {
       // We do this to cause an overhang with certain confirmation row variants
       marginLeft: '-8px',
diff --git a/yarn.lock b/yarn.lock
index 8004288ae8a9..af571c3016fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5482,6 +5482,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/json-rpc-engine@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@metamask/json-rpc-engine@npm:9.0.0"
+  dependencies:
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/safe-event-emitter": "npm:^3.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+  checksum: 10/9ddde2ca81e3b3a70e0cc752b5e22e436723cafa1948cbb45d63a42796a1260ff0f9356ebda0d375d9aae81232e77e487a8d0e1273aed3aa83ca0fe3e2f2763f
+  languageName: node
+  linkType: hard
+
 "@metamask/json-rpc-middleware-stream@npm:^7.0.1":
   version: 7.0.1
   resolution: "@metamask/json-rpc-middleware-stream@npm:7.0.1"
@@ -5494,6 +5505,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/json-rpc-middleware-stream@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.0"
+  dependencies:
+    "@metamask/json-rpc-engine": "npm:^9.0.0"
+    "@metamask/safe-event-emitter": "npm:^3.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    readable-stream: "npm:^3.6.2"
+  checksum: 10/0b32021714032093311f72ede6671d14eb4faf39a379ce12ea98b4621f24e0e41332bca966329f308159eb5884c8d376297c45bbe8ea9c0b7b09f7ce0810bef9
+  languageName: node
+  linkType: hard
+
 "@metamask/key-tree@npm:^9.1.1":
   version: 9.1.1
   resolution: "@metamask/key-tree@npm:9.1.1"
@@ -5827,6 +5850,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/permission-controller@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@metamask/permission-controller@npm:10.0.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/json-rpc-engine": "npm:^9.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/utils": "npm:^8.3.0"
+    "@types/deep-freeze-strict": "npm:^1.1.0"
+    deep-freeze-strict: "npm:^1.1.1"
+    immer: "npm:^9.0.6"
+    nanoid: "npm:^3.1.31"
+  peerDependencies:
+    "@metamask/approval-controller": ^7.0.0
+  checksum: 10/0c72e205be760fc471b2a6892a9ad52d5c6a40b4cf1757464e992a5ada2dec57efbb24b09351ce8c29990b59f1d731cd2b338caaef37ce7690ea2d1919afe061
+  languageName: node
+  linkType: hard
+
 "@metamask/permission-controller@npm:^9.0.1, @metamask/permission-controller@npm:^9.0.2":
   version: 9.0.2
   resolution: "@metamask/permission-controller@npm:9.0.2"
@@ -5857,16 +5899,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/phishing-controller@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "@metamask/phishing-controller@npm:10.0.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@types/punycode": "npm:^2.1.0"
+    eth-phishing-detect: "npm:^1.2.0"
+    punycode: "npm:^2.1.1"
+  checksum: 10/aef6fbd540f4b3c04400166aef16a7dadaee8414879269b3148cc965c803f29402115fa64de9e5e059baad6afdd5cdc749c02c964cda685642bb84d12a7aace1
+  languageName: node
+  linkType: hard
+
 "@metamask/phishing-controller@npm:^9.0.1, @metamask/phishing-controller@npm:^9.0.3":
-  version: 9.0.3
-  resolution: "@metamask/phishing-controller@npm:9.0.3"
+  version: 9.0.4
+  resolution: "@metamask/phishing-controller@npm:9.0.4"
   dependencies:
     "@metamask/base-controller": "npm:^5.0.2"
-    "@metamask/controller-utils": "npm:^9.1.0"
+    "@metamask/controller-utils": "npm:^10.0.0"
     "@types/punycode": "npm:^2.1.0"
     eth-phishing-detect: "npm:^1.2.0"
     punycode: "npm:^2.1.1"
-  checksum: 10/effc72b2fa136e8d0c2dfd2bef45ade7ae07ac5fa6ac79b3b3de988cb2cbf29b3069ea1297f6297a62cfe73e281dec6a8e948ba4fe644a7e924202b17289d384
+  checksum: 10/e68258c3dfedd7a60a040f8b58577ee98cc4566a3893a047b7b620edd72e98c8f2f75056332457b9773932c3ae8cbc7c66bbe0792e07de31dff895a9b77d081b
   languageName: node
   linkType: hard
 
@@ -6139,7 +6194,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-controllers@npm:^8.1.1, @metamask/snaps-controllers@npm:^8.4.0":
+"@metamask/snaps-controllers@npm:^8.1.1":
   version: 8.4.0
   resolution: "@metamask/snaps-controllers@npm:8.4.0"
   dependencies:
@@ -6176,22 +6231,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-execution-environments@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "@metamask/snaps-execution-environments@npm:6.3.0"
+"@metamask/snaps-controllers@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@metamask/snaps-controllers@npm:9.0.0"
   dependencies:
-    "@metamask/json-rpc-engine": "npm:^8.0.1"
+    "@metamask/approval-controller": "npm:^7.0.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/json-rpc-engine": "npm:^9.0.0"
+    "@metamask/json-rpc-middleware-stream": "npm:^8.0.0"
+    "@metamask/object-multiplex": "npm:^2.0.0"
+    "@metamask/permission-controller": "npm:^10.0.0"
+    "@metamask/phishing-controller": "npm:^10.0.0"
+    "@metamask/post-message-stream": "npm:^8.1.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-rpc-methods": "npm:^9.1.3"
+    "@metamask/snaps-sdk": "npm:^5.0.0"
+    "@metamask/snaps-utils": "npm:^7.6.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@xstate/fsm": "npm:^2.0.0"
+    browserify-zlib: "npm:^0.2.0"
+    concat-stream: "npm:^2.0.0"
+    fast-deep-equal: "npm:^3.1.3"
+    get-npm-tarball-url: "npm:^2.0.3"
+    immer: "npm:^9.0.6"
+    nanoid: "npm:^3.1.31"
+    readable-stream: "npm:^3.6.2"
+    readable-web-to-node-stream: "npm:^3.0.2"
+    tar-stream: "npm:^3.1.7"
+  peerDependencies:
+    "@metamask/snaps-execution-environments": ^6.4.0
+  peerDependenciesMeta:
+    "@metamask/snaps-execution-environments":
+      optional: true
+  checksum: 10/12e89e622865025e89c0f06f34e9dad278f91b3621e2b9944b154a7f190e5b47d5a899beb65e431627e023ebcd00969c492a280a5051239b57ed24cf5c3347ec
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-execution-environments@npm:^6.4.0":
+  version: 6.4.0
+  resolution: "@metamask/snaps-execution-environments@npm:6.4.0"
+  dependencies:
+    "@metamask/json-rpc-engine": "npm:^9.0.0"
     "@metamask/object-multiplex": "npm:^2.0.0"
     "@metamask/post-message-stream": "npm:^8.1.0"
     "@metamask/providers": "npm:^17.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/snaps-sdk": "npm:^4.4.0"
-    "@metamask/snaps-utils": "npm:^7.4.0"
+    "@metamask/snaps-sdk": "npm:^5.0.0"
+    "@metamask/snaps-utils": "npm:^7.6.0"
     "@metamask/utils": "npm:^8.3.0"
     nanoid: "npm:^3.1.31"
     readable-stream: "npm:^3.6.2"
     superstruct: "npm:^1.0.3"
-  checksum: 10/9ee030a5b8134cc4a4dad533e23e09a5008f66b3b87b05f74b6e1c2988dd3e1c9c9f961e0e549867034b20270edbddc1e9f6dcb99d8c2424e3f227e3e869056a
+  checksum: 10/ef487a7b8e2b1aa46c214d06e14d482a741abdc75f5904ff61f38b019cd253422cd5ae95fba7263b0fab57256eb081a3c44eeafcdff8ad71d5bf9163d65fd5dc
   languageName: node
   linkType: hard
 
@@ -6207,49 +6299,48 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:^9.1.2":
-  version: 9.1.2
-  resolution: "@metamask/snaps-rpc-methods@npm:9.1.2"
+"@metamask/snaps-rpc-methods@npm:^9.1.2, @metamask/snaps-rpc-methods@npm:^9.1.3":
+  version: 9.1.3
+  resolution: "@metamask/snaps-rpc-methods@npm:9.1.3"
   dependencies:
     "@metamask/key-tree": "npm:^9.1.1"
-    "@metamask/permission-controller": "npm:^9.0.2"
+    "@metamask/permission-controller": "npm:^10.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/snaps-sdk": "npm:^4.4.1"
-    "@metamask/snaps-utils": "npm:^7.4.1"
+    "@metamask/snaps-sdk": "npm:^5.0.0"
+    "@metamask/snaps-utils": "npm:^7.6.0"
     "@metamask/utils": "npm:^8.3.0"
     "@noble/hashes": "npm:^1.3.1"
     superstruct: "npm:^1.0.3"
-  checksum: 10/c24bcf81c4a53dc600ba63bddbaf4b307ac53517081a47417970ccc5e50e5ef385228ec1a18df7f24151e438040a20e7a3dd982d683720a4143ccbedc67ad057
+  checksum: 10/d346f12fb170dac694b4b5d1580fe9bc212cd266cece063636be85c442be0a7d0fa98e1d93d999da3dc67a9b5ce49c5a67e5345567b97062dd94e7d10c4e2959
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@npm:^4.4.2":
-  version: 4.4.2
-  resolution: "@metamask/snaps-sdk@npm:4.4.2"
+"@metamask/snaps-sdk@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@metamask/snaps-sdk@npm:5.0.0"
   dependencies:
     "@metamask/key-tree": "npm:^9.1.1"
     "@metamask/providers": "npm:^17.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/utils": "npm:^8.3.0"
-    fast-xml-parser: "npm:^4.3.4"
     superstruct: "npm:^1.0.3"
-  checksum: 10/32be48679eb306ec97c2ee16b4146ce69875e665feb61c04f7e63a23361c445b49ad4a0c8f6176560e7973b09c56e5a26055ba7cd894d67111c8c3cedf90dc4f
+  checksum: 10/2419edb193c32fbd7292ebddbe37e9af6b09dc175fa03b74e9b732b859cdd1b6ddd5d18d19dcf0d550fdcfdb6210ec89168e020c382d3cf41178f51e0e1e888c
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^7.1.0, @metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.4.1, @metamask/snaps-utils@npm:^7.5.0":
-  version: 7.5.0
-  resolution: "@metamask/snaps-utils@npm:7.5.0"
+"@metamask/snaps-utils@npm:^7.1.0, @metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.5.0, @metamask/snaps-utils@npm:^7.6.0":
+  version: 7.6.0
+  resolution: "@metamask/snaps-utils@npm:7.6.0"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/types": "npm:^7.23.0"
-    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/base-controller": "npm:^6.0.0"
     "@metamask/key-tree": "npm:^9.1.1"
-    "@metamask/permission-controller": "npm:^9.0.2"
+    "@metamask/permission-controller": "npm:^10.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/slip44": "npm:^3.1.0"
     "@metamask/snaps-registry": "npm:^3.1.0"
-    "@metamask/snaps-sdk": "npm:^4.4.2"
+    "@metamask/snaps-sdk": "npm:^5.0.0"
     "@metamask/utils": "npm:^8.3.0"
     "@noble/hashes": "npm:^1.3.1"
     "@scure/base": "npm:^1.1.1"
@@ -6257,13 +6348,14 @@ __metadata:
     cron-parser: "npm:^4.5.0"
     fast-deep-equal: "npm:^3.1.3"
     fast-json-stable-stringify: "npm:^2.1.0"
+    fast-xml-parser: "npm:^4.3.4"
     marked: "npm:^12.0.1"
     rfdc: "npm:^1.3.0"
     semver: "npm:^7.5.4"
     ses: "npm:^1.1.0"
     superstruct: "npm:^1.0.3"
     validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/34e22ee984d99f692db7d0f3fdb6426ba5ea31f3d83b9dfd65f074eb5e52d916f675cf631430bc4c5e369b85052e08ccc04f0f84bbfca1c07ccab3e35a7e4fe7
+  checksum: 10/e81e0185ab1678822b47e400c4422023449be1641bea7ce3d679386257545091ecc73c9a4626c0ed585d93d9fe3a1354dc8e4b8310c27c33871f7fb0bb029506
   languageName: node
   linkType: hard
 
@@ -24986,11 +25078,11 @@ __metadata:
     "@metamask/selected-network-controller": "npm:^13.0.0"
     "@metamask/signature-controller": "npm:^14.0.1"
     "@metamask/smart-transactions-controller": "npm:^10.1.2"
-    "@metamask/snaps-controllers": "npm:^8.4.0"
-    "@metamask/snaps-execution-environments": "npm:^6.3.0"
-    "@metamask/snaps-rpc-methods": "npm:^9.1.2"
-    "@metamask/snaps-sdk": "npm:^4.4.2"
-    "@metamask/snaps-utils": "npm:^7.5.0"
+    "@metamask/snaps-controllers": "npm:^9.0.0"
+    "@metamask/snaps-execution-environments": "npm:^6.4.0"
+    "@metamask/snaps-rpc-methods": "npm:^9.1.3"
+    "@metamask/snaps-sdk": "npm:^5.0.0"
+    "@metamask/snaps-utils": "npm:^7.6.0"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
     "@metamask/transaction-controller": "npm:^32.0.0"

From 9efed04b7543044c25f305f3704ba529932795ce Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Tue, 18 Jun 2024 15:43:42 +0200
Subject: [PATCH 052/236] fix: Improve stability of initial state sync in Snaps
 UI (#25375)

<!--
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**

Improves stability of initial state sync when using Snaps UI.
Previously, sometimes, the `initialState` in the `SnapInterfaceContext`
wouldn't be updated when the content of the interface changed and thus
initial values would be missing.

This PR changes the implementation to use one selector in the renderer,
which only changes when the content does, but passes the `initialState`
and `context` to the `SnapInterfaceContext` itself. This way we are
guaranteed for the content and state to stay in sync.

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


Can be tested with a Snap like:

```ts
export const onRpcRequest: OnRpcRequestHandler = async ({
  origin,
  request,
}) => {
  switch (request.method) {
    case 'hello': {
      const id = await snap.request({
        method: 'snap_createInterface',
        params: {
          ui: (
            <Box>
              <Text>foo</Text>
              <Button>Click me</Button>
            </Box>
          ),
          context: { foo: 'bar' },
        },
      });

      return snap.request({
        method: 'snap_dialog',
        params: {
          type: 'confirmation',
          id,
        },
      });
    }
    default:
      throw new Error('Method not found.');
  }
};

export const onUserInput: OnUserInputHandler = async ({
  id,
  event,
  context,
}) => {
  if (event.type === 'ButtonClickEvent') {
    await snap.request({
      method: 'snap_updateInterface',
      params: {
        id,
        ui: (
          <Box>
            <Heading>Settings</Heading>
            <Input name="foo" value="foo" />
            <Form name="settingsForm">
              <Field label="foo">
                <Input name="foo" value="foo" />
              </Field>
            </Form>
          </Box>
        ),
      },
    });
    return;
  }
};

```
---
 .../snap-ui-renderer/snap-ui-renderer.js      | 23 +++++++++++++------
 ui/contexts/snaps/snap-interface.tsx          | 16 ++++++-------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js
index 4b5f19e0a014..6a812917306b 100644
--- a/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js
+++ b/ui/components/app/snaps/snap-ui-renderer/snap-ui-renderer.js
@@ -5,10 +5,7 @@ import { useSelector } from 'react-redux';
 import { isEqual } from 'lodash';
 import MetaMaskTemplateRenderer from '../../metamask-template-renderer/metamask-template-renderer';
 import { SnapDelineator } from '../snap-delineator';
-import {
-  getSnapMetadata,
-  getMemoizedInterfaceContent,
-} from '../../../../selectors';
+import { getSnapMetadata, getMemoizedInterface } from '../../../../selectors';
 import { Box, FormTextField } from '../../../component-library';
 import { DelineatorType } from '../../../../helpers/constants/snaps';
 
@@ -35,10 +32,15 @@ const SnapUIRendererComponent = ({
     getSnapMetadata(state, snapId),
   );
 
-  const content = useSelector((state) =>
-    getMemoizedInterfaceContent(state, interfaceId),
+  const interfaceState = useSelector(
+    (state) => getMemoizedInterface(state, interfaceId),
+    // We only want to update the state if the content has changed.
+    // We do this to avoid useless re-renders.
+    (oldState, newState) => isEqual(oldState.content, newState.content),
   );
 
+  const content = interfaceState?.content;
+
   // sections are memoized to avoid useless re-renders if one of the parents element re-renders.
   const sections = useMemo(
     () =>
@@ -64,6 +66,8 @@ const SnapUIRendererComponent = ({
     );
   }
 
+  const { state: initialState, context } = interfaceState;
+
   return (
     <SnapDelineator
       snapName={snapName}
@@ -74,7 +78,12 @@ const SnapUIRendererComponent = ({
       boxProps={boxProps}
     >
       <Box className="snap-ui-renderer__content">
-        <SnapInterfaceContextProvider snapId={snapId} interfaceId={interfaceId}>
+        <SnapInterfaceContextProvider
+          snapId={snapId}
+          interfaceId={interfaceId}
+          initialState={initialState}
+          context={context}
+        >
           <MetaMaskTemplateRenderer sections={sections} />
         </SnapInterfaceContextProvider>
         {isPrompt && (
diff --git a/ui/contexts/snaps/snap-interface.tsx b/ui/contexts/snaps/snap-interface.tsx
index 194128af4ebe..1943e35a2745 100644
--- a/ui/contexts/snaps/snap-interface.tsx
+++ b/ui/contexts/snaps/snap-interface.tsx
@@ -3,6 +3,7 @@ import {
   InterfaceState,
   UserInputEventType,
 } from '@metamask/snaps-sdk';
+import { Json } from '@metamask/utils';
 import { debounce, throttle } from 'lodash';
 import React, {
   FunctionComponent,
@@ -11,8 +12,7 @@ import React, {
   useEffect,
   useRef,
 } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { getMemoizedInterface } from '../../selectors';
+import { useDispatch } from 'react-redux';
 import {
   handleSnapRequest,
   updateInterfaceState,
@@ -47,6 +47,8 @@ export const SnapInterfaceContext =
 export type SnapInterfaceContextProviderProps = {
   interfaceId: string;
   snapId: string;
+  initialState: Record<string, string | Record<string, unknown> | unknown>;
+  context: Json;
 };
 
 // We want button clicks to be instant and therefore use throttling
@@ -64,18 +66,14 @@ const THROTTLED_EVENTS = [
  * @param params.children - The childrens to wrap with the context provider.
  * @param params.interfaceId - The interface ID to use.
  * @param params.snapId - The Snap ID that requested the interface.
+ * @param params.initialState - The initial state of the interface.
+ * @param params.context - The context blob of the interface.
  * @returns The context provider.
  */
 export const SnapInterfaceContextProvider: FunctionComponent<
   SnapInterfaceContextProviderProps
-> = ({ children, interfaceId, snapId }) => {
+> = ({ children, interfaceId, snapId, initialState, context }) => {
   const dispatch = useDispatch();
-  const { state: initialState, context } = useSelector(
-    (state) => getMemoizedInterface(state, interfaceId),
-    // Prevents the selector update.
-    // We do this to avoid useless re-renders.
-    () => true,
-  );
 
   // We keep an internal copy of the state to speed-up the state update in the UI.
   // It's kept in a ref to avoid useless re-rendering of the entire tree of components.

From d49478d019d95deaad2922d8ae1cc67f7ae3fc23 Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Wed, 19 Jun 2024 18:30:25 +0200
Subject: [PATCH 053/236] Cherry pick: fix: Disable Smart Transactions for the
 new Send&Swap feature (#25422)

---
 app/scripts/lib/transaction/smart-transactions.test.ts | 7 +++++++
 app/scripts/lib/transaction/smart-transactions.ts      | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts
index 507ab83ecdf2..04c029c3ef8b 100644
--- a/app/scripts/lib/transaction/smart-transactions.test.ts
+++ b/app/scripts/lib/transaction/smart-transactions.test.ts
@@ -134,6 +134,13 @@ describe('submitSmartTransactionHook', () => {
     expect(result).toEqual({ transactionHash: undefined });
   });
 
+  it('falls back to regular transaction submit if the transaction type is "swapAndSend"', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.transactionMeta.type = TransactionType.swapAndSend;
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: undefined });
+  });
+
   it('falls back to regular transaction submit if /getFees throws an error', async () => {
     const request: SubmitSmartTransactionRequestMocked = createRequest();
     jest
diff --git a/app/scripts/lib/transaction/smart-transactions.ts b/app/scripts/lib/transaction/smart-transactions.ts
index 38f57f597947..97e37965d6ea 100644
--- a/app/scripts/lib/transaction/smart-transactions.ts
+++ b/app/scripts/lib/transaction/smart-transactions.ts
@@ -10,6 +10,7 @@ import {
   TransactionController,
   TransactionMeta,
   TransactionParams,
+  TransactionType,
 } from '@metamask/transaction-controller';
 import log from 'loglevel';
 import {
@@ -120,9 +121,15 @@ class SmartTransactionHook {
   }
 
   async submit() {
+    const isUnsupportedTransactionTypeForSmartTransaction =
+      this.#transactionMeta?.type === TransactionType.swapAndSend;
+
     // Will cause TransactionController to publish to the RPC provider as normal.
     const useRegularTransactionSubmit = { transactionHash: undefined };
-    if (!this.#isSmartTransaction) {
+    if (
+      !this.#isSmartTransaction ||
+      isUnsupportedTransactionTypeForSmartTransaction
+    ) {
       return useRegularTransactionSubmit;
     }
     const { id: approvalFlowId } = await this.#controllerMessenger.call(

From c3a4a3d13fae6471370fa5507ff69be7bf451195 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 19 Jun 2024 17:27:13 -0230
Subject: [PATCH 054/236] Update blockaid unit tests for v12

---
 .../__snapshots__/blockaid-banner-alert.test.js.snap | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 4111226eea01..50b8d01883c8 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
@@ -54,7 +54,7 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
                 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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                 >
@@ -151,7 +151,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.7%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
                   rel="noopener noreferrer"
                   target="_blank"
                 >
@@ -248,7 +248,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                 >
@@ -346,7 +346,7 @@ exports[`Blockaid Banner Alert should render details section even when features
                   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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                   >
@@ -457,7 +457,7 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
                   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.7%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"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                   >
@@ -556,7 +556,7 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
                   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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                   >

From fc9bcff969686091e5de605677bd453d9e8ae233 Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Tue, 18 Jun 2024 20:44:06 +0100
Subject: [PATCH 055/236] fix: Fix unit and e2e tests that were expected the
 date based privacy policy components to not be shown (#25390)
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.
-->

Fixture / mock data in unit and e2e tests have been modified to handle
the privacy policy toast. These tests previously assumed that the
privacy policy toast, and in one case the updated metametrics component
during onboarding, would not be shown. However, their display was date
dependent. With this PR, the updated test data takes these dates into
account, and tests should now pass.

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

Fixes: failing tests on develop

e2e and unit tests should pass

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

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

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

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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: Dan Miller <danjm.com@gmail.com>
---
 test/e2e/default-fixture.js                   |  2 +
 ...rs-after-init-opt-in-background-state.json |  4 +-
 .../errors-after-init-opt-in-ui-state.json    |  4 +-
 ...s-before-init-opt-in-background-state.json |  2 +
 .../errors-before-init-opt-in-ui-state.json   |  2 +
 .../__snapshots__/metametrics.test.js.snap    | 85 +++++++---------
 .../onboarding-flow/onboarding-flow.test.js   |  4 +-
 ui/pages/routes/routes.component.test.js      | 13 ++-
 .../__snapshots__/security-tab.test.js.snap   | 98 +++++++++----------
 9 files changed, 104 insertions(+), 110 deletions(-)

diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
index d6d84c154772..96b28c6896d1 100644
--- a/test/e2e/default-fixture.js
+++ b/test/e2e/default-fixture.js
@@ -107,6 +107,8 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
           '__FIXTURE_SUBSTITUTION__currentDateInMilliseconds',
         showTestnetMessageInDropdown: true,
         trezorModel: null,
+        newPrivacyPolicyToastClickedOrClosed: true,
+        newPrivacyPolicyToastShownDate: Date.now(),
         usedNetworks: {
           [CHAIN_IDS.MAINNET]: true,
           [CHAIN_IDS.LINEA_MAINNET]: true,
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 69e354480f37..0e02c3ddf794 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -39,6 +39,8 @@
     "showAccountBanner": true,
     "trezorModel": null,
     "onboardingDate": "object",
+    "newPrivacyPolicyToastClickedOrClosed": "boolean",
+    "newPrivacyPolicyToastShownDate": "number",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
@@ -46,8 +48,6 @@
     "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
-    "newPrivacyPolicyToastClickedOrClosed": "object",
-    "newPrivacyPolicyToastShownDate": "object",
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": "object",
     "switchedNetworkNeverShowMessage": "boolean",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 0772ce4d7c23..f00c2b601230 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -76,6 +76,8 @@
     "showAccountBanner": true,
     "trezorModel": null,
     "onboardingDate": "object",
+    "newPrivacyPolicyToastClickedOrClosed": "boolean",
+    "newPrivacyPolicyToastShownDate": "number",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
@@ -83,8 +85,6 @@
     "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
-    "newPrivacyPolicyToastClickedOrClosed": "object",
-    "newPrivacyPolicyToastShownDate": "object",
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": "object",
     "switchedNetworkNeverShowMessage": "boolean",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index 60379a1d0811..dd90d1071776 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -46,6 +46,8 @@
         "0x5": true,
         "0x539": true
       },
+      "newPrivacyPolicyToastClickedOrClosed": "boolean",
+      "newPrivacyPolicyToastShownDate": "number",
       "snapsInstallPrivacyWarningShown": true
     },
     "CurrencyController": {
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index 48392c6b4db3..fc4bb1d65eed 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -46,6 +46,8 @@
         "0x5": true,
         "0x539": true
       },
+      "newPrivacyPolicyToastClickedOrClosed": "boolean",
+      "newPrivacyPolicyToastShownDate": "number",
       "snapsInstallPrivacyWarningShown": true
     },
     "CurrencyController": {
diff --git a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
index f669f81f59d7..c68e7759e419 100644
--- a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
+++ b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
@@ -4,7 +4,7 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
 <div>
   <div
     class="onboarding-metametrics"
-    data-testid="onboarding-legacy-metametrics"
+    data-testid="onboarding-metametrics"
   >
     <h2
       class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h2 typography--weight-bold typography--style-normal typography--align-center typography--color-text-default"
@@ -12,37 +12,23 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
       Help us improve MetaMask
     </h2>
     <p
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-left typography--color-text-default"
     >
-      MetaMask would like to gather usage data to better understand how our users interact with MetaMask. This data will be used to provide the service, which includes improving the service based on your use.
+      We’d like to gather basic usage and diagnostics data to improve MetaMask. Know that we never sell the data you provide here.
     </p>
     <p
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-left typography--color-text-default"
     >
-      MetaMask will...
+      When we gather metrics, it will always be...
     </p>
     <ul>
-      <li>
-        <span
-          class="mm-box mm-icon mm-icon--size-md mm-box--margin-inline-end-3 mm-box--display-inline-block mm-box--color-success-default"
-          style="mask-image: url('./images/icons/check.svg');"
-        />
-        Always allow you to opt-out via Settings
-      </li>
-      <li>
-        <span
-          class="mm-box mm-icon mm-icon--size-md mm-box--margin-inline-end-3 mm-box--display-inline-block mm-box--color-success-default"
-          style="mask-image: url('./images/icons/check.svg');"
-        />
-        Send anonymized click and pageview events
-      </li>
       <li>
         <div
           class="box box--flex-direction-row"
         >
           <span
-            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
-            style="mask-image: url('./images/icons/close.svg');"
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/check.svg');"
           />
           <span>
              
@@ -50,9 +36,9 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
             <span
               class="box box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
             >
-              Never
+              Private:
             </span>
-             collect information we don’t need to provide the service (such as keys, addresses, transaction hashes, or balances)
+             clicks and views on the app are stored, but other details (like your public address) are not.
              
           </span>
         </div>
@@ -62,8 +48,8 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
           class="box box--flex-direction-row"
         >
           <span
-            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
-            style="mask-image: url('./images/icons/close.svg');"
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/check.svg');"
           />
           <span>
              
@@ -71,9 +57,9 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
             <span
               class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
             >
-              Never
+              General:
             </span>
-             collect your full IP address*
+             we temporarily use your IP address to detect a general location (like your country or region), but it's never stored.
              
           </span>
         </div>
@@ -83,8 +69,8 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
           class="box box--flex-direction-row"
         >
           <span
-            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
-            style="mask-image: url('./images/icons/close.svg');"
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/check.svg');"
           />
           <span>
              
@@ -92,42 +78,47 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
             <span
               class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
             >
-              Never
+              Optional:
             </span>
-             sell data.  Ever!
+             you decide if you want to share or delete your usage data via settings any time.
              
           </span>
         </div>
          
       </li>
     </ul>
-    <h6
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+    <label
+      class="mm-box mm-text mm-checkbox mm-text--body-md mm-box--padding-bottom-3 mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+      for="metametrics-opt-in"
     >
-      This data is aggregated and is therefore anonymous for the purposes of General Data Protection Regulation (EU) 2016/679.
-    </h6>
+      <span
+        class="mm-checkbox__input-wrapper"
+      >
+        <input
+          class="mm-box mm-checkbox__input mm-box--margin-0 mm-box--margin-right-2 mm-box--display-flex mm-box--background-color-background-default mm-box--rounded-sm mm-box--border-color-border-default mm-box--border-width-2 box--border-style-solid"
+          id="metametrics-opt-in"
+          title="We’ll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features)."
+          type="checkbox"
+        />
+      </span>
+      <span>
+        We’ll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features).
+      </span>
+    </label>
     <h6
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-left typography--color-text-alternative"
     >
       <span>
          
-        * When you use Infura as your default RPC provider in MetaMask, Infura will collect your IP address and your Ethereum wallet address when you send a transaction. We don’t store this information in a way that allows our systems to associate those two pieces of data. For more information on how MetaMask and Infura interact from a data collection perspective, see our update 
-        <a
-          href="https://consensys.io/blog/consensys-data-retention-update"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          here
-        </a>
-        . For more information on our privacy practices in general, see our 
+        We’ll let you know if we decide to use this data for other purposes. You can review our 
         <a
           href="https://metamask.io/privacy.html"
           rel="noopener noreferrer"
           target="_blank"
         >
-          Privacy Policy here
+          Privacy Policy
         </a>
-        .
+         for more information. Remember, you can go to settings and opt out at any time.
          
       </span>
     </h6>
diff --git a/ui/pages/onboarding-flow/onboarding-flow.test.js b/ui/pages/onboarding-flow/onboarding-flow.test.js
index cc471f5febd5..a02ba4f9b5ea 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.test.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.test.js
@@ -244,9 +244,7 @@ describe('Onboarding Flow', () => {
       ONBOARDING_METAMETRICS,
     );
 
-    const onboardingMetametrics = queryByTestId(
-      'onboarding-legacy-metametrics',
-    );
+    const onboardingMetametrics = queryByTestId('onboarding-metametrics');
     expect(onboardingMetametrics).toBeInTheDocument();
   });
 
diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js
index 377f6bf98c55..5119ad5c5c42 100644
--- a/ui/pages/routes/routes.component.test.js
+++ b/ui/pages/routes/routes.component.test.js
@@ -109,6 +109,7 @@ describe('Routes Component', () => {
             ticker: 'ETH',
             type: NETWORK_TYPES.MAINNET,
           },
+          newPrivacyPolicyToastShownDate: new Date('0'),
         },
         send: {
           ...mockSendState.send,
@@ -125,7 +126,7 @@ describe('Routes Component', () => {
 });
 
 describe('toast display', () => {
-  const testState = {
+  const getToastDisplayTestState = (date) => ({
     ...mockState,
     metamask: {
       ...mockState.metamask,
@@ -134,17 +135,21 @@ describe('toast display', () => {
       completedOnboarding: true,
       usedNetworks: [],
       swapsState: { swapsFeatureIsLive: true },
+      newPrivacyPolicyToastShownDate: date,
     },
-  };
+  });
 
   it('renders toastContainer on default route', async () => {
-    await render([DEFAULT_ROUTE], testState);
+    await render([DEFAULT_ROUTE], getToastDisplayTestState(new Date('9999')));
     const toastContainer = document.querySelector('.toasts-container');
     expect(toastContainer).toBeInTheDocument();
   });
 
   it('does not render toastContainer on confirmation route', async () => {
-    await render([CONFIRMATION_V_NEXT_ROUTE], testState);
+    await render(
+      [CONFIRMATION_V_NEXT_ROUTE],
+      getToastDisplayTestState(new Date(0)),
+    );
     const toastContainer = document.querySelector('.toasts-container');
     expect(toastContainer).not.toBeInTheDocument();
   });
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 c6d2258b4fdb..c2ab279a6979 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
@@ -1762,77 +1762,71 @@ exports[`Security Tab should match snapshot 1`] = `
       class="settings-page__content-padded"
     >
       <div
-        class="mm-box"
+        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"
       >
         <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="profileSyncToggle"
+          class="settings-page__content-item"
         >
+          <span>
+            Participate in MetaMetrics
+          </span>
           <div
-            class="settings-page__content-item"
-            id="profileSyncLabel"
+            class="settings-page__content-description"
           >
             <span>
-              Participate in MetaMetrics
-            </span>
-            <div
-              class="settings-page__content-description"
-              data-testid="profileSyncDescription"
-            >
               Participate in MetaMetrics to help us make MetaMask better
-            </div>
+            </span>
           </div>
-          <div
-            class="settings-page__content-item-col"
-            data-testid="participateInMetaMetrics"
+        </div>
+        <div
+          class="settings-page__content-item-col"
+          data-testid="participateInMetaMetrics"
+        >
+          <label
+            class="toggle-button toggle-button--off"
+            tabindex="0"
           >
-            <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="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;"
+                style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
               >
                 <div
-                  style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(159, 166, 174);"
-                >
-                  <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>
+                  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="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: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
-                  />
-                </div>
-                <input
-                  data-testid="toggleButton"
-                  style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
-                  type="checkbox"
-                  value="false"
+                  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
-                class="toggle-button__status"
+                style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
               >
-                <span
-                  class="toggle-button__label-off"
-                >
-                  Off
-                </span>
-                <span
-                  class="toggle-button__label-on"
-                >
-                  On
-                </span>
+                <div
+                  style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
+                />
               </div>
-            </label>
-          </div>
+              <input
+                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

From d3799ebfd03487d4ab0c677569eb560d5f84eafb Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Thu, 20 Jun 2024 00:24:41 +0200
Subject: [PATCH 056/236] v12.0.0 fix: display the correct symbol of a native
 currency (#25376)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-pick https://github.com/MetaMask/metamask-extension/pull/25364

## **Description**

This PR fixes a small bug in the display of certain types of
notifications. Specifically, in the case of receiving or sending
notifications of native currencies, the symbol of the native currency is
now correctly displayed.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25364?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

## **Screenshots/Recordings**

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

### **Before**

<img width="387" alt="Screenshot 2024-06-17 at 11 16 01"
src="https://github.com/MetaMask/metamask-extension/assets/1284304/5f66746e-7b32-45a3-899a-672ef65db44e">

### **After**

<img width="443" alt="Screenshot 2024-06-17 at 11 43 31"
src="https://github.com/MetaMask/metamask-extension/assets/1284304/686351cd-7940-499b-9e42-f626fe705677">

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25376?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Dan J Miller <danjm.com@gmail.com>
---
 .../eth-sent-received/eth-sent-received.tsx                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx b/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
index 5b44e42f7112..ec857b45da94 100644
--- a/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
+++ b/ui/pages/notifications/notification-components/eth-sent-received/eth-sent-received.tsx
@@ -63,8 +63,8 @@ const getTitle = (n: ETHNotification) => {
 };
 
 const getDescription = (n: ETHNotification) => {
-  const { nativeCurrencyName } = getNativeCurrency(n);
-  const items = createTextItems([nativeCurrencyName], TextVariant.bodyMd);
+  const { nativeCurrencySymbol } = getNativeCurrency(n);
+  const items = createTextItems([nativeCurrencySymbol], TextVariant.bodyMd);
   return items;
 };
 

From fd894b54a34428f2d1b43a9094b415e84ef55755 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 19 Jun 2024 18:50:54 -0500
Subject: [PATCH 057/236] fix (cherry-pick): Prevent Token Autodetection
 Firefox blocker (#25309)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Token detection modal seems to stay stuck on firefox

## Original PR

https://github.com/MetaMask/metamask-extension/pull/25279

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25279?quickstart=1)

## **Related issues**

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

## **Manual testing steps**
To run locally use:
`rm -rf dist && ENABLE_MV3=false yarn && ENABLE_MV3=false yarn build:dev
dev --build-type main --lockdown false --snow false --apply-lavamoat
false`

1. Import wallet on firefox
2. Got to settings => security and privacy and disable token auto
detection
3. Go back to home page and you should see the token detection modal
4. Clicking on allow should dismiss the modal and enable the token
detection


## **Screenshots/Recordings**

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

### **Before**

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



https://github.com/MetaMask/metamask-extension/assets/10994169/e23f59d6-7bc9-4707-872d-436c1a56e7cf


### **After**



https://github.com/MetaMask/metamask-extension/assets/10994169/cf47e04c-e5bc-4898-92f1-c80c87988fdb




## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

---------


<!--
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/25309?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: sahar-fehri <sahar.fehri@consensys.net>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 .../app/auto-detect-token/auto-detect-token-modal.tsx          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx b/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx
index 27ea2bfcaf70..cf03216ec3ca 100644
--- a/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx
+++ b/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx
@@ -45,6 +45,7 @@ function AutoDetectTokenModal({
   const dispatch = useDispatch();
   const trackEvent = useContext(MetaMetricsContext);
   const { chainId } = useSelector(getProviderConfig);
+  const locale = useSelector(getCurrentLocale);
 
   const handleTokenAutoDetection = useCallback(
     (val) => {
@@ -55,7 +56,7 @@ function AutoDetectTokenModal({
         category: MetaMetricsEventCategory.Navigation,
         properties: {
           chain_id: chainId,
-          locale: getCurrentLocale,
+          locale,
           referrer: ORIGIN_METAMASK,
         },
       });

From f05367492de075a9c8f41ac33e4c3f470021adae Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Thu, 20 Jun 2024 01:10:13 +0100
Subject: [PATCH 058/236] fix (cherry-pick 12.0.0): Fix switch network popup
 (#25299) (#25327)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR is to ensure the network switch modal doesn't show up in a flash
when network is switched via the dapp

## **Related issues**

Fixes: #25196

## **Manual testing steps**

1. Go to Pancake swap Dapp
2. Connect MetaMask
3. Switch to Polygon or any network that is not already added to network
list in metamask via Dapp
4. Network switch should happen and no modal should up in the flash

## **Screenshots/Recordings**


### **Before**




https://github.com/MetaMask/metamask-extension/assets/39872794/ff30359f-2970-4e86-a68d-3bd6250c4d33




### **After**



https://github.com/MetaMask/metamask-extension/assets/39872794/a172ea2a-7db7-4b5f-b698-13e39a52b29a



## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

---------


<!--
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/25327?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Jonathan Bursztyn <jonathan@bursztyn.io>
---
 ui/pages/routes/routes.component.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index e36f9827ea5c..003c4836d917 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -912,7 +912,9 @@ export default class Routes extends Component {
         }
       >
         {shouldShowNetworkDeprecationWarning ? <DeprecatedNetworks /> : null}
-        {shouldShowNetworkInfo && <NewNetworkInfo />}
+        {location.pathname === DEFAULT_ROUTE && shouldShowNetworkInfo ? (
+          <NewNetworkInfo />
+        ) : null}
         <QRHardwarePopover />
         <Modal />
         <Alert visible={this.props.alertOpen} msg={alertMessage} />

From f4ac4830fe9e2758935c3c9f5e88b5421022053e Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Thu, 20 Jun 2024 02:11:01 +0200
Subject: [PATCH 059/236] v12.0.0 fix: use a min-width value in the
 notifications-tag-counter (#25363)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR introduces a fix for a bug related to the UI of the
`notifications-tag-counter` component. The component now has a min-width
to prevent the tag from appearing squished in the case of a single
character.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25363?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Dan J Miller <danjm.com@gmail.com>
---
 .../app-header/__snapshots__/app-header.test.js.snap      | 4 ++--
 .../multichain/notifications-tag-counter/index.scss       | 5 +++++
 .../notifications-tag-counter.tsx                         | 8 ++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

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 290cdbe01773..d464e487dd57 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
@@ -383,11 +383,11 @@ exports[`App Header should match snapshot 1`] = `
               style="position: relative;"
             >
               <div
-                class="mm-box notification-list-item__unread-dot__wrapper mm-box--padding-top-0 mm-box--padding-right-0 mm-box--padding-bottom-0 mm-box--padding-left-0 mm-box--display-block mm-box--background-color-error-default mm-box--rounded-md mm-box--border-style-none"
+                class="mm-box notification-list-item__unread-dot__wrapper mm-box--padding-top-0 mm-box--padding-right-0 mm-box--padding-bottom-0 mm-box--padding-left-0 mm-box--display-block mm-box--background-color-error-default mm-box--rounded-lg mm-box--border-style-none"
                 style="position: absolute; cursor: pointer; top: -5px; left: 10px; z-index: 1;"
               >
                 <p
-                  class="mm-box mm-text notifications-tag-counter__unread-dot mm-text--body-xs mm-box--color-error-inverse"
+                  class="mm-box mm-text notifications-tag-counter__unread-dot mm-text--body-xs mm-text--text-align-center mm-box--color-error-inverse"
                 >
                   1
                 </p>
diff --git a/ui/components/multichain/notifications-tag-counter/index.scss b/ui/components/multichain/notifications-tag-counter/index.scss
index f5c8b1fe1e03..328c4cb9728d 100644
--- a/ui/components/multichain/notifications-tag-counter/index.scss
+++ b/ui/components/multichain/notifications-tag-counter/index.scss
@@ -2,7 +2,12 @@
   padding-left: 6px;
   padding-right: 6px;
 
+  &__text {
+    min-width: 13px;
+  }
+
   &__unread-dot {
+    min-width: 16.5px;
     padding-left: 3px;
     padding-right: 3px;
     line-height: 1.4;
diff --git a/ui/components/multichain/notifications-tag-counter/notifications-tag-counter.tsx b/ui/components/multichain/notifications-tag-counter/notifications-tag-counter.tsx
index 39b2b0175db1..4964eb8e7a23 100644
--- a/ui/components/multichain/notifications-tag-counter/notifications-tag-counter.tsx
+++ b/ui/components/multichain/notifications-tag-counter/notifications-tag-counter.tsx
@@ -8,6 +8,7 @@ import {
   Display,
   TextColor,
   TextVariant,
+  TextAlign,
 } from '../../../helpers/constants/design-system';
 
 type NotificationsTagCounterProps = {
@@ -37,7 +38,7 @@ export const NotificationsTagCounter = ({
         }}
         backgroundColor={BackgroundColor.errorDefault}
         borderStyle={BorderStyle.none}
-        borderRadius={BorderRadius.MD}
+        borderRadius={BorderRadius.LG}
         paddingTop={0}
         paddingBottom={0}
         paddingLeft={0}
@@ -47,6 +48,7 @@ export const NotificationsTagCounter = ({
           color={TextColor.errorInverse}
           variant={TextVariant.bodyXs}
           className="notifications-tag-counter__unread-dot"
+          textAlign={TextAlign.Center}
         >
           {notificationsCount > 10 ? '9+' : notificationsCount}
         </Text>
@@ -58,7 +60,7 @@ export const NotificationsTagCounter = ({
     <Box
       backgroundColor={BackgroundColor.errorDefault}
       borderStyle={BorderStyle.none}
-      borderRadius={BorderRadius.MD}
+      borderRadius={BorderRadius.LG}
       paddingTop={0}
       paddingBottom={0}
       className="notifications-tag-counter"
@@ -67,6 +69,8 @@ export const NotificationsTagCounter = ({
         color={TextColor.errorInverse}
         variant={TextVariant.bodySm}
         data-testid="global-menu-notification-count"
+        className="notifications-tag-counter__text"
+        textAlign={TextAlign.Center}
       >
         {notificationsCount > 10 ? '9+' : notificationsCount}
       </Text>

From c6a2cb62047ad73a9ddc125ee8df303150eeebc5 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Thu, 20 Jun 2024 02:21:39 +0200
Subject: [PATCH 060/236] v12.0.0 fix: hide mark all as read button with no
 uread notifications (#25348) (#25400)
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 PR introduces a small fix to hide the "Mark all as read" button for
notifications when all notifications are already read. [![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25348?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25400?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Dan J Miller <danjm.com@gmail.com>
---
 ui/pages/notifications/notifications-list.test.tsx | 1 +
 ui/pages/notifications/notifications-list.tsx      | 3 ++-
 ui/pages/notifications/notifications.tsx           | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/pages/notifications/notifications-list.test.tsx b/ui/pages/notifications/notifications-list.test.tsx
index 366d3d2261ff..a48e5be37845 100644
--- a/ui/pages/notifications/notifications-list.test.tsx
+++ b/ui/pages/notifications/notifications-list.test.tsx
@@ -51,6 +51,7 @@ describe('NotificationsList', () => {
               notifications={[]}
               isLoading={false}
               isError={false}
+              notificationsCount={0}
             />
           </MetamaskNotificationsProvider>
         </Router>
diff --git a/ui/pages/notifications/notifications-list.tsx b/ui/pages/notifications/notifications-list.tsx
index cc1c2a40a4ec..500b7ef210aa 100644
--- a/ui/pages/notifications/notifications-list.tsx
+++ b/ui/pages/notifications/notifications-list.tsx
@@ -23,6 +23,7 @@ export type NotificationsListProps = {
   notifications: NotificationType[];
   isLoading: boolean;
   isError: boolean;
+  notificationsCount: number;
 };
 
 function LoadingContent() {
@@ -120,7 +121,7 @@ export function NotificationsList(props: NotificationsListProps) {
       <NotificationsListStates {...props} />
 
       {/* Read All Button */}
-      {props.notifications.length > 0 ? (
+      {props.notifications.length > 0 && props.notificationsCount > 0 ? (
         <NotificationsListReadAllButton notifications={props.notifications} />
       ) : null}
     </Box>
diff --git a/ui/pages/notifications/notifications.tsx b/ui/pages/notifications/notifications.tsx
index 5b5d89e6645a..bdefd020ca42 100644
--- a/ui/pages/notifications/notifications.tsx
+++ b/ui/pages/notifications/notifications.tsx
@@ -16,6 +16,7 @@ import {
 import { NotificationsPage } from '../../components/multichain';
 import { Content, Header } from '../../components/multichain/pages/page';
 import { useMetamaskNotificationsContext } from '../../contexts/metamask-notifications/metamask-notifications';
+import { useCounter } from '../../hooks/metamask-notifications/useCounter';
 import { getNotifications, getNotifySnaps } from '../../selectors';
 import {
   selectIsFeatureAnnouncementsEnabled,
@@ -165,6 +166,7 @@ export default function Notifications() {
 
   const [activeTab, setActiveTab] = useState<TAB_KEYS>(TAB_KEYS.ALL);
   const combinedNotifications = useCombinedNotifications();
+  const { notificationsCount } = useCounter();
   const filteredNotifications = useMemo(
     () => filterNotifications(activeTab, combinedNotifications),
     [activeTab, combinedNotifications],
@@ -248,6 +250,7 @@ export default function Notifications() {
           notifications={filteredNotifications}
           isLoading={isLoading}
           isError={Boolean(error)}
+          notificationsCount={notificationsCount}
         />
       </Content>
     </NotificationsPage>

From 053381b7e5ff070b420fcd8203630ab4352dba81 Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Thu, 20 Jun 2024 01:40:04 +0100
Subject: [PATCH 061/236] v12.0.0 fix: remove `Approving to` row on Permit
 Signature (#25409)
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**

<!--
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?
-->

This PR aims to remove the ` Approving to` row on Permit signatures
because it made it into `v12.0.0` release before it was fully complete.

This row has changed by this
[PR](https://github.com/MetaMask/metamask-extension/pull/24975) in
`develop`, so the only remaining issue is to remove it for the release
candidate with this PR.


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

## **Related issues**

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

## **Manual testing steps**

1. Go to test dapp
2. Click on Malicious Permit

## **Screenshots/Recordings**


![image](https://github.com/MetaMask/metamask-extension/assets/45455812/4048282a-bc08-472f-891b-7d9b3812b627)


<!-- 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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Dan J Miller <danjm.com@gmail.com>
---
 app/_locales/en/messages.json                 |  3 ---
 .../info/typed-sign/typed-sign.test.tsx       | 13 ------------
 .../confirm/info/typed-sign/typed-sign.tsx    | 20 +++----------------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 495fb5ca508f..6b4803069133 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -512,9 +512,6 @@
     "message": "Approved on $1 for $2",
     "description": "$1 is the approval date for a permission. $2 is the AvatarGroup component displaying account images."
   },
-  "approvingTo": {
-    "message": "Approving to"
-  },
   "areYouSure": {
     "message": "Are you sure?"
   },
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
index 1f337f5a9dc2..71050362909e 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
@@ -4,7 +4,6 @@ import configureMockStore from 'redux-mock-store';
 import mockState from '../../../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../../../test/lib/render-helpers';
 import {
-  permitSignatureMsg,
   unapprovedTypedSignMsgV3,
   unapprovedTypedSignMsgV4,
 } from '../../../../../../../test/data/confirmations/typed_sign';
@@ -63,16 +62,4 @@ describe('TypedSignInfo', () => {
     const { container } = renderWithProvider(<TypedSignInfo />, mockStore);
     expect(container).toMatchSnapshot();
   });
-
-  it('displays "Approving to" for permit signature type', () => {
-    const state = {
-      ...mockState,
-      confirm: {
-        currentConfirmation: permitSignatureMsg,
-      },
-    };
-    const mockStore = configureMockStore([])(state);
-    const { getByText } = renderWithProvider(<TypedSignInfo />, mockStore);
-    expect(getByText('Approving to')).toBeDefined();
-  });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
index adf66ae16f9d..a8153359984f 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
@@ -5,7 +5,6 @@ import { isValidAddress } from 'ethereumjs-util';
 import {
   ConfirmInfoRow,
   ConfirmInfoRowAddress,
-  ConfirmInfoRowDivider,
   ConfirmInfoRowUrl,
 } from '../../../../../../components/app/confirm/info/row';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
@@ -15,7 +14,6 @@ import {
   BackgroundColor,
   BorderRadius,
 } from '../../../../../../helpers/constants/design-system';
-import { EIP712_PRIMARY_TYPE_PERMIT } from '../../../../constants';
 import { SignatureRequestType } from '../../../../types/confirm';
 import { parseTypedDataMessage } from '../../../../utils';
 import { ConfirmInfoRowTypedSignData } from '../../row/typed-sign-data/typedSignData';
@@ -30,11 +28,9 @@ const TypedSignInfo: React.FC = () => {
     return null;
   }
 
-  const {
-    domain,
-    domain: { verifyingContract },
-    primaryType,
-  } = parseTypedDataMessage(currentConfirmation.msgParams.data as string);
+  const { domain } = parseTypedDataMessage(
+    currentConfirmation.msgParams.data as string,
+  );
 
   return (
     <>
@@ -44,16 +40,6 @@ const TypedSignInfo: React.FC = () => {
         marginBottom={4}
         padding={0}
       >
-        {primaryType === EIP712_PRIMARY_TYPE_PERMIT && (
-          <>
-            <Box padding={2}>
-              <ConfirmInfoRow label={t('approvingTo')}>
-                <ConfirmInfoRowAddress address={verifyingContract} />
-              </ConfirmInfoRow>
-            </Box>
-            <ConfirmInfoRowDivider />
-          </>
-        )}
         <Box padding={2}>
           <ConfirmInfoRow
             label={t('requestFrom')}

From 76c7eb6fb556c58744f6bdcb2e8f7b0dae1770a7 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Thu, 20 Jun 2024 10:38:29 +0200
Subject: [PATCH 062/236] v12.0.0 fix a delay on the account toggles (#25428)
 (#25432)
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 PR fixes the way the toggles for individual accounts are updated on
the notifications settings page. The update call is made immediately
after the individual toggle is updated.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25428?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25432?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../notifications-settings-per-account.tsx    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/ui/pages/notifications-settings/notifications-settings-per-account.tsx b/ui/pages/notifications-settings/notifications-settings-per-account.tsx
index 337a8af96582..a591a4f81ea9 100644
--- a/ui/pages/notifications-settings/notifications-settings-per-account.tsx
+++ b/ui/pages/notifications-settings/notifications-settings-per-account.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState, useCallback, useContext } from 'react';
-import { useSelector } from 'react-redux';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
@@ -15,7 +14,6 @@ import {
   NotificationsSettingsBox,
   NotificationsSettingsAccount,
 } from '../../components/multichain';
-import { getIsUpdatingMetamaskNotificationsAccount } from '../../selectors/metamask-notifications/metamask-notifications';
 
 type NotificationsSettingsPerAccountProps = {
   address: string;
@@ -46,11 +44,6 @@ export const NotificationsSettingsPerAccount = ({
   >(undefined);
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
-  // Selectors
-  const isUpdatingMetamaskNotificationsAccount = useSelector(
-    getIsUpdatingMetamaskNotificationsAccount,
-  );
-
   useEffect(() => {
     const fetchData = async () => {
       const fetchedData = await switchAccountNotifications([address]);
@@ -63,16 +56,6 @@ export const NotificationsSettingsPerAccount = ({
     setIsLoading(loading);
   }, [loading]);
 
-  useEffect(() => {
-    const updateData = async () => {
-      if (isUpdatingMetamaskNotificationsAccount.includes(address)) {
-        const fetchedData = await switchAccountNotifications([address]);
-        setData(fetchedData || {});
-      }
-    };
-    updateData();
-  }, [isUpdatingMetamaskNotificationsAccount]);
-
   const error =
     errorAccountNotificationsChange || errorSwitchAccountNotifications;
 
@@ -88,6 +71,8 @@ export const NotificationsSettingsPerAccount = ({
         address,
       },
     });
+    const fetchedData = await switchAccountNotifications([address]);
+    setData(fetchedData || {});
     listNotifications();
   }, [address, data, onChangeAccountNotifications]);
 

From eebc4d5b2284024eaeb190cddfa89990f593ca34 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Thu, 20 Jun 2024 12:02:30 +0200
Subject: [PATCH 063/236] fix v12.0.0 changelog (#25434)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix lint issue and add changelog for previous hotfix

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25434?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d712a76c6c9a..b56f60891e4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.0]
+
 ## [11.16.12]
+### Added
+- Add a marketing data collection consent toggle across Onboarding, Wallet Toast, and Settings, empowering users to control their participation in marketing analytics ([#24605](https://github.com/MetaMask/metamask-extension/pull/24605))
 
 ## [11.16.11]
 ### Fixed
@@ -4816,9 +4819,7 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...HEAD
-[12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v12.0.0
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...HEAD
+[12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...v12.0.0
 [11.16.12]: https://github.com/MetaMask/metamask-extension/compare/v11.16.11...v11.16.12
 [11.16.11]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...v11.16.11
 [11.16.10]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...v11.16.10

From 1c7e132f5f4edeed815b2c9400c7cf09a5a26c91 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Thu, 20 Jun 2024 19:33:19 +0200
Subject: [PATCH 064/236] Fix: V12.0.0/cherry pick
 f26f4bba6410f4446d80f75e6049b4c7dc06815a (#25448)
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 PR fixes the fiat (USD) conversion for the values displayed in the
Swap notifications.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25444?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**



![image](https://github.com/MetaMask/metamask-extension/assets/1284304/8a7c817a-6f5f-4ee9-9e33-b02c44cd01f8)

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

### **After**

![Screenshot 2024-06-20 at 18 00

31](https://github.com/MetaMask/metamask-extension/assets/1284304/17a5c7bf-a797-4e1f-a618-9408723f6fed)

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25448?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/helpers/utils/notification.util.ts       |  7 ++--
 ui/helpers/utils/notification.utils.test.ts | 36 +++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/ui/helpers/utils/notification.util.ts b/ui/helpers/utils/notification.util.ts
index 0ecafa5f0bcb..8c8d1544737a 100644
--- a/ui/helpers/utils/notification.util.ts
+++ b/ui/helpers/utils/notification.util.ts
@@ -226,8 +226,11 @@ export const getUsdAmount = (amount: string, decimals: string, usd: string) => {
     return '';
   }
 
-  const amountInEther = getAmount(amount, decimals);
-  const numericAmount = parseFloat(amountInEther) * parseFloat(usd);
+  const amountInEther = calcTokenAmount(
+    amount,
+    parseFloat(decimals),
+  ).toNumber();
+  const numericAmount = parseFloat(`${amountInEther}`) * parseFloat(usd);
 
   return formatAmount(numericAmount);
 };
diff --git a/ui/helpers/utils/notification.utils.test.ts b/ui/helpers/utils/notification.utils.test.ts
index cb37ffcbaaa0..f08a4802f4b9 100644
--- a/ui/helpers/utils/notification.utils.test.ts
+++ b/ui/helpers/utils/notification.utils.test.ts
@@ -3,6 +3,7 @@ import {
   formatMenuItemDate,
   getLeadingZeroCount,
   getRandomKey,
+  getUsdAmount,
 } from './notification.util';
 
 describe('formatMenuItemDate', () => {
@@ -115,3 +116,38 @@ describe('getRandomKey', () => {
     expect(result).toContain('testtext');
   });
 });
+
+describe('getUsdAmount', () => {
+  it('should return formatted USD amount based on token amount, decimals, and USD rate', () => {
+    const amount = '1000000000000000000'; // 1 Ether (1e18 wei)
+    const decimals = '18';
+    const usdRate = '2000'; // 1 Ether = $2000
+
+    const result = getUsdAmount(amount, decimals, usdRate);
+    expect(result).toBe('2K'); // Since 1 Ether * $2000 = $2000, formatted as '2K'
+  });
+
+  it('should return an empty string if any of the parameters are missing', () => {
+    expect(getUsdAmount('', '18', '2000')).toBe('');
+    expect(getUsdAmount('1000000000000000000', '', '2000')).toBe('');
+    expect(getUsdAmount('1000000000000000000', '18', '')).toBe('');
+  });
+
+  it('should handle small amounts correctly', () => {
+    const amount = '1000000000000000'; // 0.001 Ether (1e15 wei)
+    const decimals = '18';
+    const usdRate = '1500'; // 1 Ether = $1500
+
+    const result = getUsdAmount(amount, decimals, usdRate);
+    expect(result).toBe('1.5'); // Since 0.001 Ether * $1500 = $1.5
+  });
+
+  it('should handle large amounts correctly', () => {
+    const amount = '5000000000000000000000'; // 5000 Ether
+    const decimals = '18';
+    const usdRate = '1000'; // 1 Ether = $1000
+
+    const result = getUsdAmount(amount, decimals, usdRate);
+    expect(result).toBe('5M'); // Since 5000 Ether * $1000 = $5,000,000, formatted as '5M'
+  });
+});

From 1eaeeb07fa713e91153878477dd45a0d2fa68160 Mon Sep 17 00:00:00 2001
From: jiexi <jiexiluan@gmail.com>
Date: Thu, 20 Jun 2024 16:22:36 -0700
Subject: [PATCH 065/236] v12 cherrypick: Bump `queued-request-controller` to
 `^1.0.0` (#25310) (#25451)

cherrypicks
https://github.com/MetaMask/metamask-extension/commit/ba8d84eafd6012457e2cc7276473e5de5c03990d
which bumps `queued-request-controller` to `^1.0.0` and fixes the
`eth_requestAccounts` handling bug


Merge conflicts on the lavamoat policies

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

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 app/scripts/metamask-controller.js            |  16 +-
 lavamoat/browserify/beta/policy.json          |   9 +-
 lavamoat/browserify/desktop/policy.json       |   9 +-
 lavamoat/browserify/flask/policy.json         |   9 +-
 lavamoat/browserify/main/policy.json          |   9 +-
 lavamoat/browserify/mmi/policy.json           |   9 +-
 package.json                                  |   2 +-
 ...-switch-dapp2-eth-request-accounts.spec.js | 151 ++++++++++++++++++
 .../permissions-connect.component.js          |  27 ----
 yarn.lock                                     |  20 +--
 10 files changed, 216 insertions(+), 45 deletions(-)
 create mode 100644 test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a97553ddd6ab..0731a771a3d0 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -449,7 +449,8 @@ export default class MetamaskController extends EventEmitter {
         ],
         allowedEvents: ['SelectedNetworkController:stateChange'],
       }),
-      methodsRequiringNetworkSwitch,
+      shouldRequestSwitchNetwork: ({ method }) =>
+        methodsRequiringNetworkSwitch.includes(method),
       clearPendingConfirmations,
     });
 
@@ -5113,7 +5114,18 @@ export default class MetamaskController extends EventEmitter {
       useRequestQueue: this.preferencesController.getUseRequestQueue.bind(
         this.preferencesController,
       ),
-      methodsWithConfirmation,
+      shouldEnqueueRequest: (request) => {
+        if (
+          request.method === 'eth_requestAccounts' &&
+          this.permissionController.hasPermission(
+            request.origin,
+            PermissionNames.eth_accounts,
+          )
+        ) {
+          return false;
+        }
+        return methodsWithConfirmation.includes(request.method);
+      },
     });
     engine.push(requestQueueMiddleware);
 
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 078a6e778e3f..ceda4ecc16ff 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1990,9 +1990,9 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
+        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2005,6 +2005,13 @@
         "immer": true
       }
     },
+    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 2c42b202f01b..5dc9e06d53c0 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -2162,9 +2162,9 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
+        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2177,6 +2177,13 @@
         "immer": true
       }
     },
+    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 943501f5d897..99decf305b07 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2214,9 +2214,9 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
+        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2229,6 +2229,13 @@
         "immer": true
       }
     },
+    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 1b40c94878aa..4a35b2301dbe 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2069,9 +2069,9 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
+        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2084,6 +2084,13 @@
         "immer": true
       }
     },
+    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index fa2ba932f48f..2e16735c03ff 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2354,9 +2354,9 @@
     },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
+        "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2369,6 +2369,13 @@
         "immer": true
       }
     },
+    "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/rate-limit-controller": {
       "globals": {
         "setTimeout": true
diff --git a/package.json b/package.json
index df815c18f2ce..b1bd0fe251dd 100644
--- a/package.json
+++ b/package.json
@@ -329,7 +329,7 @@
     "@metamask/post-message-stream": "^8.0.0",
     "@metamask/ppom-validator": "^0.30.0",
     "@metamask/providers": "^14.0.2",
-    "@metamask/queued-request-controller": "^0.10.0",
+    "@metamask/queued-request-controller": "^1.0.0",
     "@metamask/rate-limit-controller": "^5.0.1",
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
diff --git a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js
new file mode 100644
index 000000000000..60690d4ab66b
--- /dev/null
+++ b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js
@@ -0,0 +1,151 @@
+const { strict: assert } = require('assert');
+
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  WINDOW_TITLES,
+  defaultGanacheOptions,
+  switchToNotificationWindow,
+} = require('../../helpers');
+
+describe('Request Queuing Dapp 1 Send Tx -> Dapp 2 Request Accounts Tx', function () {
+  it('should queue `eth_requestAccounts` requests when the requesting dapp does not already have connected accounts', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withPermissionControllerConnectedToTestDapp()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Dapp Send Button
+        await driver.clickElement('#sendButton');
+
+        // Leave the confirmation pending
+
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        const accountsOnload = await (
+          await driver.findElement('#accounts')
+        ).getText();
+        assert.deepStrictEqual(accountsOnload, '');
+
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        const accountsBeforeConnect = await (
+          await driver.findElement('#accounts')
+        ).getText();
+        assert.deepStrictEqual(accountsBeforeConnect, '');
+
+        // Reject the pending confirmation from the first dapp
+        await switchToNotificationWindow(driver);
+        await driver.clickElement({ text: 'Reject', tag: 'button' });
+
+        // Wait for switch confirmation to close then request accounts confirmation to show for the second dapp
+        await driver.delay(regularDelayMs);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithUrl(DAPP_ONE_URL);
+
+        await driver.waitForSelector({
+          text: '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+          css: '#accounts',
+        });
+      },
+    );
+  });
+
+  it('should not queue the `eth_requestAccounts` requests when the requesting dapp already has connected accounts', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withPermissionControllerConnectedToTwoTestDapps()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Dapp Send Button
+        await driver.clickElement('#sendButton');
+
+        // Leave the confirmation pending
+
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        const ethRequestAccounts = JSON.stringify({
+          jsonrpc: '2.0',
+          method: 'eth_requestAccounts',
+        });
+
+        const accounts = await driver.executeScript(
+          `return window.ethereum.request(${ethRequestAccounts})`,
+        );
+
+        assert.deepStrictEqual(accounts, [
+          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+        ]);
+      },
+    );
+  });
+});
diff --git a/ui/pages/permissions-connect/permissions-connect.component.js b/ui/pages/permissions-connect/permissions-connect.component.js
index c147bb5cd67f..2dd1982f1abc 100644
--- a/ui/pages/permissions-connect/permissions-connect.component.js
+++ b/ui/pages/permissions-connect/permissions-connect.component.js
@@ -5,8 +5,6 @@ import { Switch, Route } from 'react-router-dom';
 import { ethErrors, serializeError } from 'eth-rpc-errors';
 import { SubjectType } from '@metamask/permission-controller';
 ///: END:ONLY_INCLUDE_IF
-import { getEnvironmentType } from '../../../app/scripts/lib/util';
-import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../shared/constants/app';
 import { MILLISECOND } from '../../../shared/constants/time';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import PermissionPageContainer from '../../components/app/permission-page-container';
@@ -129,22 +127,6 @@ export default class PermissionConnect extends Component {
     ///: END:ONLY_INCLUDE_IF
   };
 
-  beforeUnload = () => {
-    const { permissionsRequestId, rejectPermissionsRequest } = this.props;
-    const { permissionsApproved } = this.state;
-
-    if (permissionsApproved === null && permissionsRequestId) {
-      rejectPermissionsRequest(permissionsRequestId);
-    }
-  };
-
-  removeBeforeUnload = () => {
-    const environmentType = getEnvironmentType();
-    if (environmentType === ENVIRONMENT_TYPE_NOTIFICATION) {
-      window.removeEventListener('beforeunload', this.beforeUnload);
-    }
-  };
-
   componentDidMount() {
     const {
       connectPath,
@@ -168,11 +150,6 @@ export default class PermissionConnect extends Component {
       return;
     }
 
-    const environmentType = getEnvironmentType();
-    if (environmentType === ENVIRONMENT_TYPE_NOTIFICATION) {
-      window.addEventListener('beforeunload', this.beforeUnload);
-    }
-
     if (history.location.pathname === connectPath && !isRequestingAccounts) {
       ///: BEGIN:ONLY_INCLUDE_IF(snaps)
 
@@ -274,7 +251,6 @@ export default class PermissionConnect extends Component {
       redirecting: shouldRedirect,
       permissionsApproved: approved,
     });
-    this.removeBeforeUnload();
 
     if (shouldRedirect && approved) {
       setTimeout(() => history.push(DEFAULT_ROUTE), APPROVE_TIMEOUT);
@@ -471,7 +447,6 @@ export default class PermissionConnect extends Component {
                       serializeError(ethErrors.provider.userRejectedRequest()),
                     );
                     this.setState({ permissionsApproved: true });
-                    this.removeBeforeUnload();
                   }}
                   targetSubjectMetadata={targetSubjectMetadata}
                 />
@@ -504,7 +479,6 @@ export default class PermissionConnect extends Component {
                       serializeError(ethErrors.provider.userRejectedRequest()),
                     );
                     this.setState({ permissionsApproved: false });
-                    this.removeBeforeUnload();
                   }}
                   targetSubjectMetadata={targetSubjectMetadata}
                 />
@@ -526,7 +500,6 @@ export default class PermissionConnect extends Component {
                   approveSnapResult={(requestId) => {
                     approvePendingApproval(requestId);
                     this.setState({ permissionsApproved: true });
-                    this.removeBeforeUnload();
                   }}
                   targetSubjectMetadata={targetSubjectMetadata}
                 />
diff --git a/yarn.lock b/yarn.lock
index 8cb2c1fb06f8..d18a17c67c4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6086,20 +6086,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/queued-request-controller@npm:^0.10.0":
-  version: 0.10.0
-  resolution: "@metamask/queued-request-controller@npm:0.10.0"
+"@metamask/queued-request-controller@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/queued-request-controller@npm:1.0.0"
   dependencies:
-    "@metamask/base-controller": "npm:^5.0.2"
-    "@metamask/controller-utils": "npm:^9.1.0"
-    "@metamask/json-rpc-engine": "npm:^8.0.2"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/json-rpc-engine": "npm:^9.0.0"
     "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/swappable-obj-proxy": "npm:^2.2.0"
     "@metamask/utils": "npm:^8.3.0"
   peerDependencies:
-    "@metamask/network-controller": ^18.0.0
-    "@metamask/selected-network-controller": ^13.0.0
-  checksum: 10/b6caba5889b1e6219d33a5e80c6a3baf77c64b52cfdde8123f4e44d21ef501b78c49e111b050bb4aacd0bf12bd3593f88058f2a230ff5693d7b9d8ff1521e5bc
+    "@metamask/network-controller": ^19.0.0
+    "@metamask/selected-network-controller": ^15.0.0
+  checksum: 10/84b5442035ef4843ad5c3effdb961c9725c07fa3caf37928c4315ffb4929160a1032b8e0f814061fa8487f499d147766f3cfdd4172c8a3941c2996b11628a46b
   languageName: node
   linkType: hard
 
@@ -25092,7 +25092,7 @@ __metadata:
     "@metamask/post-message-stream": "npm:^8.0.0"
     "@metamask/ppom-validator": "npm:^0.30.0"
     "@metamask/providers": "npm:^14.0.2"
-    "@metamask/queued-request-controller": "npm:^0.10.0"
+    "@metamask/queued-request-controller": "npm:^1.0.0"
     "@metamask/rate-limit-controller": "npm:^5.0.1"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"

From 675ced41d1e99de75f008e0b34cff53d93d4c9ef Mon Sep 17 00:00:00 2001
From: legobeat <109787230+legobeat@users.noreply.github.com>
Date: Tue, 18 Jun 2024 17:39:15 +0900
Subject: [PATCH 066/236] fix: upgrade dependency ws (#25372)

---
 package.json |  2 ++
 yarn.lock    | 52 +++++++++++-----------------------------------------
 2 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 42277b241088..5baeff7120cc 100644
--- a/package.json
+++ b/package.json
@@ -186,6 +186,8 @@
     "regenerator-runtime@^0.13.4": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
     "regenerator-runtime@^0.13.7": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
     "regenerator-runtime@^0.11.0": "patch:regenerator-runtime@npm%3A0.13.7#./.yarn/patches/regenerator-runtime-npm-0.13.7-41bcbe64ea.patch",
+    "ws@8.13.0": "^8.17.1",
+    "ws@7.4.6": "^7.5.10",
     "jsdom@^16.7.0": "patch:jsdom@npm%3A16.7.0#./.yarn/patches/jsdom-npm-16.7.0-216c5c4bf9.patch",
     "trim": "^0.0.3",
     "@eslint/eslintrc@npm:^2.1.4": "patch:@eslint/eslintrc@npm%3A2.1.4#~/.yarn/patches/@eslint-eslintrc-npm-2.1.4-1ff4b5f908.patch",
diff --git a/yarn.lock b/yarn.lock
index a742de0a9979..af1eef1dc5a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -36038,9 +36038,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:*, ws@npm:>=8.14.2, ws@npm:^8.11.0, ws@npm:^8.16.0, ws@npm:^8.2.3, ws@npm:^8.5.0, ws@npm:^8.8.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
+"ws@npm:*, ws@npm:>=8.14.2, ws@npm:^8.11.0, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.2.3, ws@npm:^8.5.0, ws@npm:^8.8.0":
+  version: 8.17.1
+  resolution: "ws@npm:8.17.1"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -36049,52 +36049,22 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 7c511c59e979bd37b63c3aea4a8e4d4163204f00bd5633c053b05ed67835481995f61a523b0ad2b603566f9a89b34cb4965cb9fab9649fbfebd8f740cea57f17
-  languageName: node
-  linkType: hard
-
-"ws@npm:7.4.6":
-  version: 7.4.6
-  resolution: "ws@npm:7.4.6"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 150e3f917b7cde568d833a5ea6ccc4132e59c38d04218afcf2b6c7b845752bd011a9e0dc1303c8694d3c402a0bdec5893661a390b71ff88f0fc81a4e4e66b09c
-  languageName: node
-  linkType: hard
-
-"ws@npm:8.13.0":
-  version: 8.13.0
-  resolution: "ws@npm:8.13.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 1769532b6fdab9ff659f0b17810e7501831d34ecca23fd179ee64091dd93a51f42c59f6c7bb4c7a384b6c229aca8076fb312aa35626257c18081511ef62a161d
+  checksum: 4264ae92c0b3e59c7e309001e93079b26937aab181835fb7af79f906b22cd33b6196d96556dafb4e985742dd401e99139572242e9847661fdbc96556b9e6902d
   languageName: node
   linkType: hard
 
 "ws@npm:^6.1.0":
-  version: 6.2.2
-  resolution: "ws@npm:6.2.2"
+  version: 6.2.3
+  resolution: "ws@npm:6.2.3"
   dependencies:
     async-limiter: "npm:~1.0.0"
-  checksum: bb791ac02ad7e59fd4208cc6dd3a5bf7a67dff4611a128ed33365996f9fc24fa0d699043559f1798b4bc8045639fd21a1fd3ceca81de560124444abd8e321afc
+  checksum: 19f8d1608317f4c98f63da6eebaa85260a6fe1ba459cbfedd83ebe436368177fb1e2944761e2392c6b7321cbb7a375c8a81f9e1be35d555b6b4647eb61eadd46
   languageName: node
   linkType: hard
 
-"ws@npm:^7, ws@npm:^7.2.0, ws@npm:^7.4.5, ws@npm:^7.4.6, ws@npm:^7.5.0":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+"ws@npm:^7, ws@npm:^7.2.0, ws@npm:^7.4.5, ws@npm:^7.4.6, ws@npm:^7.5.0, ws@npm:^7.5.10":
+  version: 7.5.10
+  resolution: "ws@npm:7.5.10"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -36103,7 +36073,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 171e35012934bd8788150a7f46f963e50bac43a4dc524ee714c20f258693ac4d3ba2abadb00838fdac42a47af9e958c7ae7e6f4bc56db047ba897b8a2268cf7c
+  checksum: 9c796b84ba80ffc2c2adcdfc9c8e9a219ba99caa435c9a8d45f9ac593bba325563b3f83edc5eb067cc6d21b9a6bf2c930adf76dd40af5f58a5ca6859e81858f0
   languageName: node
   linkType: hard
 

From 4b90d22ceaa7f13d7983486a0a573e8b206f874b Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 20 Jun 2024 23:24:56 -0230
Subject: [PATCH 067/236] fix (cherry-pick): Fix unit and e2e tests that were
 expected the date based privacy policy components to not be shown (#25390)

---
 test/e2e/fixture-builder.js                   |  2 +
 ...rs-after-init-opt-in-background-state.json |  4 +-
 .../errors-after-init-opt-in-ui-state.json    |  4 +-
 ...s-before-init-opt-in-background-state.json |  2 +
 .../errors-before-init-opt-in-ui-state.json   |  2 +
 .../__snapshots__/metametrics.test.js.snap    | 85 +++++++++----------
 .../onboarding-flow/onboarding-flow.test.js   |  4 +-
 ui/pages/routes/routes.component.test.js      | 19 ++++-
 8 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index b57bb64211f6..ffa3accae3f4 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -89,6 +89,8 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
           [CHAIN_IDS.LOCALHOST]: true,
         },
         snapsInstallPrivacyWarningShown: true,
+        newPrivacyPolicyToastClickedOrClosed: true,
+        newPrivacyPolicyToastShownDate: Date.now(),
       },
       CurrencyController: {
         currentCurrency: 'usd',
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 834d3a8b40c9..c870194c20ae 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -38,6 +38,8 @@
     "showAccountBanner": true,
     "trezorModel": null,
     "onboardingDate": "object",
+    "newPrivacyPolicyToastClickedOrClosed": "boolean",
+    "newPrivacyPolicyToastShownDate": "number",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
@@ -45,8 +47,6 @@
     "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
-    "newPrivacyPolicyToastClickedOrClosed": "object",
-    "newPrivacyPolicyToastShownDate": "object",
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": "object",
     "switchedNetworkNeverShowMessage": "boolean",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 0a911d93e9e4..eec180d5a6d3 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -74,6 +74,8 @@
     "showAccountBanner": true,
     "trezorModel": null,
     "onboardingDate": "object",
+    "newPrivacyPolicyToastClickedOrClosed": "boolean",
+    "newPrivacyPolicyToastShownDate": "number",
     "hadAdvancedGasFeesSetPriorToMigration92_3": false,
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
@@ -81,8 +83,6 @@
     "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
-    "newPrivacyPolicyToastClickedOrClosed": "object",
-    "newPrivacyPolicyToastShownDate": "object",
     "signatureSecurityAlertResponses": "object",
     "switchedNetworkDetails": "object",
     "switchedNetworkNeverShowMessage": "boolean",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index c9f273d36453..ffa164c2ab47 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -34,6 +34,8 @@
         "0x5": true,
         "0x539": true
       },
+      "newPrivacyPolicyToastClickedOrClosed": "boolean",
+      "newPrivacyPolicyToastShownDate": "number",
       "snapsInstallPrivacyWarningShown": true
     },
     "CurrencyController": {
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index 47d7d4f9a536..dc22147eb71a 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -34,6 +34,8 @@
         "0x5": true,
         "0x539": true
       },
+      "newPrivacyPolicyToastClickedOrClosed": "boolean",
+      "newPrivacyPolicyToastShownDate": "number",
       "snapsInstallPrivacyWarningShown": true
     },
     "CurrencyController": {
diff --git a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
index f669f81f59d7..9aded5cd817c 100644
--- a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
+++ b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
@@ -4,7 +4,7 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
 <div>
   <div
     class="onboarding-metametrics"
-    data-testid="onboarding-legacy-metametrics"
+    data-testid="onboarding-metametrics"
   >
     <h2
       class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h2 typography--weight-bold typography--style-normal typography--align-center typography--color-text-default"
@@ -12,37 +12,23 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
       Help us improve MetaMask
     </h2>
     <p
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-left typography--color-text-default"
     >
-      MetaMask would like to gather usage data to better understand how our users interact with MetaMask. This data will be used to provide the service, which includes improving the service based on your use.
+      We’d like to gather basic usage and diagnostics data to improve MetaMask. Know that we never sell the data you provide here.
     </p>
     <p
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-left typography--color-text-default"
     >
-      MetaMask will...
+      When we gather metrics, it will always be...
     </p>
     <ul>
-      <li>
-        <span
-          class="mm-box mm-icon mm-icon--size-md mm-box--margin-inline-end-3 mm-box--display-inline-block mm-box--color-success-default"
-          style="mask-image: url('./images/icons/check.svg');"
-        />
-        Always allow you to opt-out via Settings
-      </li>
-      <li>
-        <span
-          class="mm-box mm-icon mm-icon--size-md mm-box--margin-inline-end-3 mm-box--display-inline-block mm-box--color-success-default"
-          style="mask-image: url('./images/icons/check.svg');"
-        />
-        Send anonymized click and pageview events
-      </li>
       <li>
         <div
           class="box box--flex-direction-row"
         >
           <span
-            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
-            style="mask-image: url('./images/icons/close.svg');"
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/check.svg');"
           />
           <span>
              
@@ -50,9 +36,9 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
             <span
               class="box box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
             >
-              Never
+              Private:
             </span>
-             collect information we don’t need to provide the service (such as keys, addresses, transaction hashes, or balances)
+             clicks and views on the app are stored, but other details (like your public address) are not.
              
           </span>
         </div>
@@ -62,8 +48,8 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
           class="box box--flex-direction-row"
         >
           <span
-            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
-            style="mask-image: url('./images/icons/close.svg');"
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/check.svg');"
           />
           <span>
              
@@ -71,9 +57,9 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
             <span
               class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
             >
-              Never
+              General:
             </span>
-             collect your full IP address*
+             we temporarily use your IP address to detect a general location (like your country or region), but it's never stored.
              
           </span>
         </div>
@@ -83,8 +69,8 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
           class="box box--flex-direction-row"
         >
           <span
-            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-error-default"
-            style="mask-image: url('./images/icons/close.svg');"
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-2 mm-box--display-inline-block mm-box--color-success-default"
+            style="mask-image: url('./images/icons/check.svg');"
           />
           <span>
              
@@ -92,42 +78,47 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
             <span
               class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--span typography--weight-bold typography--style-normal typography--color-text-default"
             >
-              Never
+              Optional:
             </span>
-             sell data.  Ever!
+             you decide if you want to share or delete your usage data via settings any time.
              
           </span>
         </div>
          
       </li>
     </ul>
-    <h6
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+    <label
+      class="mm-box mm-text mm-checkbox mm-text--body-md mm-box--padding-bottom-3 mm-box--display-inline-flex mm-box--align-items-center mm-box--color-text-default"
+      for="metametrics-opt-in"
     >
-      This data is aggregated and is therefore anonymous for the purposes of General Data Protection Regulation (EU) 2016/679.
-    </h6>
+      <span
+        class="mm-checkbox__input-wrapper"
+      >
+        <input
+          class="mm-box mm-checkbox__input mm-box--margin-0 mm-box--margin-right-2 mm-box--display-flex mm-box--background-color-transparent mm-box--rounded-sm mm-box--border-color-border-default mm-box--border-width-2 box--border-style-solid"
+          id="metametrics-opt-in"
+          title="We’ll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features)."
+          type="checkbox"
+        />
+      </span>
+      <span>
+        We’ll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features).
+      </span>
+    </label>
     <h6
-      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-center typography--color-text-alternative"
+      class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__terms typography--h6 typography--weight-normal typography--style-normal typography--align-left typography--color-text-alternative"
     >
       <span>
          
-        * When you use Infura as your default RPC provider in MetaMask, Infura will collect your IP address and your Ethereum wallet address when you send a transaction. We don’t store this information in a way that allows our systems to associate those two pieces of data. For more information on how MetaMask and Infura interact from a data collection perspective, see our update 
-        <a
-          href="https://consensys.io/blog/consensys-data-retention-update"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          here
-        </a>
-        . For more information on our privacy practices in general, see our 
+        We’ll let you know if we decide to use this data for other purposes. You can review our 
         <a
           href="https://metamask.io/privacy.html"
           rel="noopener noreferrer"
           target="_blank"
         >
-          Privacy Policy here
+          Privacy Policy
         </a>
-        .
+         for more information. Remember, you can go to settings and opt out at any time.
          
       </span>
     </h6>
diff --git a/ui/pages/onboarding-flow/onboarding-flow.test.js b/ui/pages/onboarding-flow/onboarding-flow.test.js
index cc471f5febd5..a02ba4f9b5ea 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.test.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.test.js
@@ -244,9 +244,7 @@ describe('Onboarding Flow', () => {
       ONBOARDING_METAMETRICS,
     );
 
-    const onboardingMetametrics = queryByTestId(
-      'onboarding-legacy-metametrics',
-    );
+    const onboardingMetametrics = queryByTestId('onboarding-metametrics');
     expect(onboardingMetametrics).toBeInTheDocument();
   });
 
diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js
index c1d238bd1000..5ecfaff0d247 100644
--- a/ui/pages/routes/routes.component.test.js
+++ b/ui/pages/routes/routes.component.test.js
@@ -102,6 +102,10 @@ describe('Routes Component', () => {
           ...mockSendState.send,
           stage: SEND_STAGES.ADD_RECIPIENT,
         },
+        metamask: {
+          ...mockSendState.metamask,
+          newPrivacyPolicyToastShownDate: new Date('0'),
+        },
       };
 
       const { getByTestId } = await render(['/send'], state);
@@ -122,6 +126,7 @@ describe('Routes Component', () => {
             nickname: GOERLI_DISPLAY_NAME,
             type: NETWORK_TYPES.GOERLI,
           },
+          newPrivacyPolicyToastShownDate: new Date('0'),
         },
       };
       const { getByTestId } = await render(['/send'], state);
@@ -146,6 +151,7 @@ describe('Routes Component', () => {
             nickname: GOERLI_DISPLAY_NAME,
             type: NETWORK_TYPES.GOERLI,
           },
+          newPrivacyPolicyToastShownDate: new Date('0'),
         },
       };
       const { getByTestId } = await render(['/send'], state);
@@ -173,6 +179,7 @@ describe('Routes Component', () => {
             ticker: 'ETH',
             type: NETWORK_TYPES.MAINNET,
           },
+          newPrivacyPolicyToastShownDate: new Date('0'),
         },
         send: {
           ...mockSendState.send,
@@ -189,7 +196,7 @@ describe('Routes Component', () => {
 });
 
 describe('toast display', () => {
-  const testState = {
+  const getToastDisplayTestState = (date) => ({
     ...mockState,
     metamask: {
       ...mockState.metamask,
@@ -198,17 +205,21 @@ describe('toast display', () => {
       completedOnboarding: true,
       usedNetworks: [],
       swapsState: { swapsFeatureIsLive: true },
+      newPrivacyPolicyToastShownDate: date,
     },
-  };
+  });
 
   it('renders toastContainer on default route', async () => {
-    await render([DEFAULT_ROUTE], testState);
+    await render([DEFAULT_ROUTE], getToastDisplayTestState(new Date('9999')));
     const toastContainer = document.querySelector('.toasts-container');
     expect(toastContainer).toBeInTheDocument();
   });
 
   it('does not render toastContainer on confirmation route', async () => {
-    await render([CONFIRMATION_V_NEXT_ROUTE], testState);
+    await render(
+      [CONFIRMATION_V_NEXT_ROUTE],
+      getToastDisplayTestState(new Date(0)),
+    );
     const toastContainer = document.querySelector('.toasts-container');
     expect(toastContainer).not.toBeInTheDocument();
   });

From 40448241f6bd13b79e48c668b5a04c0126a22171 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 20 Jun 2024 21:05:57 +0530
Subject: [PATCH 068/236] cherry-pick: update blockaid to version 1.4.8
 (#25442)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Update blockaid to version 1.4.8

## **Related issues**

Fixes: NA

## **Manual testing steps**
NA

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 package.json                                         |  2 +-
 .../__snapshots__/blockaid-banner-alert.test.js.snap | 12 ++++++------
 yarn.lock                                            | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 5baeff7120cc..f2961f9d7f21 100644
--- a/package.json
+++ b/package.json
@@ -259,7 +259,7 @@
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
-    "@blockaid/ppom_release": "^1.4.7",
+    "@blockaid/ppom_release": "^1.4.8",
     "@contentful/rich-text-html-renderer": "^16.3.5",
     "@ensdomains/content-hash": "^2.5.7",
     "@ethereumjs/tx": "^4.1.1",
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 37e59a751325..15e9a2a366cd 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
@@ -54,7 +54,7 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
                 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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                 >
@@ -151,7 +151,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.7%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
                   rel="noopener noreferrer"
                   target="_blank"
                 >
@@ -248,7 +248,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                 >
@@ -346,7 +346,7 @@ exports[`Blockaid Banner Alert should render details section even when features
                   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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                   >
@@ -457,7 +457,7 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
                   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.7%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"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                   >
@@ -556,7 +556,7 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
                   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.7%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.4.8%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"
                   >
diff --git a/yarn.lock b/yarn.lock
index af1eef1dc5a4..e4eff83b34d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1729,10 +1729,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@blockaid/ppom_release@npm:^1.4.7":
-  version: 1.4.7
-  resolution: "@blockaid/ppom_release@npm:1.4.7"
-  checksum: 2d376796afe4dc4e008418120977f22202b52d32ab2d036e8ab511a7673afeffff8b36e9b194cceeb4ffceb3808dcc6a276e1e55fd39e37833b3e7c288fec295
+"@blockaid/ppom_release@npm:^1.4.8":
+  version: 1.4.8
+  resolution: "@blockaid/ppom_release@npm:1.4.8"
+  checksum: a8b7e94e54fdfd4a0fdde096f9302c7bbba18eec7b02e1f1163ec3848d25f12b3a7ff41be3f949ef7b77317c611aaec680d15c50f51b1f03244e3b1c2b9c4aed
   languageName: node
   linkType: hard
 
@@ -25301,7 +25301,7 @@ __metadata:
     "@babel/preset-typescript": "npm:^7.23.2"
     "@babel/register": "npm:^7.22.15"
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch"
-    "@blockaid/ppom_release": "npm:^1.4.7"
+    "@blockaid/ppom_release": "npm:^1.4.8"
     "@contentful/rich-text-html-renderer": "npm:^16.3.5"
     "@ensdomains/content-hash": "npm:^2.5.7"
     "@ethereumjs/tx": "npm:^4.1.1"

From 5a905dd4e804ae445c2719a469260bb9d8796b9d Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 21 Jun 2024 15:00:15 -0230
Subject: [PATCH 069/236] v11.16.13

---
 CHANGELOG.md | 7 ++++++-
 package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e80a262e0a34..ffe6ec8da36d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.13]
+### Changed
+- Update Blockaid feature for latest security protections ([#25442](https://github.com/MetaMask/metamask-extension/pull/25442))
+
 ## [11.16.12]
 
 ## [11.16.11]
@@ -4814,7 +4818,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.13...HEAD
+[11.16.13]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...v11.16.13
 [11.16.12]: https://github.com/MetaMask/metamask-extension/compare/v11.16.11...v11.16.12
 [11.16.11]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...v11.16.11
 [11.16.10]: https://github.com/MetaMask/metamask-extension/compare/v11.16.9...v11.16.10
diff --git a/package.json b/package.json
index f2961f9d7f21..c3dbfebec380 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.12",
+  "version": "11.16.13",
   "private": true,
   "repository": {
     "type": "git",

From 8c105a048774935796c9e7f5cafd816a1905e7ef Mon Sep 17 00:00:00 2001
From: jiexi <jiexiluan@gmail.com>
Date: Fri, 21 Jun 2024 12:39:01 -0700
Subject: [PATCH 070/236] V12 cherrypick fix infinite loop confirmation
 notification hardware wallet (#25475)

Cherrypicks https://github.com/MetaMask/metamask-extension/pull/25454

Fixes: https://github.com/MetaMask/metamask-extension/issues/25412
Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2677

Merge conflict (veryminor) in:
* `app/scripts/lib/setupSentry.js`
* `ui/pages/home/home.container.js`

Co-authored-by: Alex Donesky <adonesky@gmail.com>
---
 app/scripts/lib/setupSentry.js                |  3 +++
 app/scripts/metamask-controller.js            |  1 +
 test/e2e/default-fixture.js                   |  3 +++
 test/e2e/fixture-builder.js                   |  3 +++
 ...rs-after-init-opt-in-background-state.json |  3 +++
 .../errors-after-init-opt-in-ui-state.json    |  1 +
 ...s-before-init-opt-in-background-state.json |  3 +++
 .../errors-before-init-opt-in-ui-state.json   |  3 +++
 ui/pages/home/home.component.js               |  6 +++--
 ui/pages/home/home.container.js               |  5 +++++
 ui/pages/routes/routes.component.test.js      |  2 ++
 ui/selectors/selectors.js                     |  4 ++++
 ui/selectors/transactions.js                  | 22 +++++--------------
 ui/selectors/transactions.test.js             |  4 ++--
 14 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 86a0f31c9ca1..3dd4f11e643c 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -267,6 +267,9 @@ export const SENTRY_BACKGROUND_STATE = {
   PushPlatformNotificationsController: {
     fcmToken: false,
   },
+  QueuedRequestController: {
+    queuedRequestCount: true,
+  },
   SelectedNetworkController: { domains: false },
   SignatureController: {
     unapprovedMsgCount: true,
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 0731a771a3d0..7a43f01fdcf1 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -2276,6 +2276,7 @@ export default class MetamaskController extends EventEmitter {
         AuthenticationController: this.authenticationController,
         UserStorageController: this.userStorageController,
         MetamaskNotificationsController: this.metamaskNotificationsController,
+        QueuedRequestController: this.queuedRequestController,
         PushPlatformNotificationsController:
           this.pushPlatformNotificationsController,
         ...resetOnRestartStore,
diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js
index 96b28c6896d1..ac8748ff0a84 100644
--- a/test/e2e/default-fixture.js
+++ b/test/e2e/default-fixture.js
@@ -221,6 +221,9 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) {
         useMultiAccountBalanceChecker: true,
         useRequestQueue: true,
       },
+      QueuedRequestController: {
+        queuedRequestCount: 0,
+      },
       SelectedNetworkController: {
         domains: {},
       },
diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js
index 283ed7678edf..1389a738f93d 100644
--- a/test/e2e/fixture-builder.js
+++ b/test/e2e/fixture-builder.js
@@ -100,6 +100,9 @@ function onboardingFixture() {
         useMultiAccountBalanceChecker: true,
         useRequestQueue: true,
       },
+      QueuedRequestController: {
+        queuedRequestCount: 0,
+      },
       SelectedNetworkController: {
         domains: {},
       },
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 0e02c3ddf794..0fb145d3fe62 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -207,6 +207,9 @@
     "selectedAddress": "string"
   },
   "PushPlatformNotificationsController": { "fcmToken": "string" },
+  "QueuedRequestController": {
+    "queuedRequestCount": 0
+  },
   "SelectedNetworkController": { "domains": "object" },
   "SignatureController": {
     "unapprovedMsgs": "object",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index f00c2b601230..19a73249cc2b 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -82,6 +82,7 @@
     "nftsDropdownState": {},
     "termsOfUseLastAgreed": "number",
     "qrHardware": {},
+    "queuedRequestCount": 0,
     "usedNetworks": { "0x1": true, "0x5": true, "0x539": true },
     "snapsInstallPrivacyWarningShown": true,
     "surveyLinkLastClickedOrClosed": "object",
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
index dd90d1071776..2909bf1d3597 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json
@@ -131,6 +131,9 @@
       "useMultiAccountBalanceChecker": true,
       "useRequestQueue": true
     },
+    "QueuedRequestController": {
+      "queuedRequestCount": 0
+    },
     "SelectedNetworkController": { "domains": "object" },
     "SmartTransactionsController": {
       "smartTransactionsState": {
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
index fc4bb1d65eed..b41e6d6333d1 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-ui-state.json
@@ -131,6 +131,9 @@
       "useMultiAccountBalanceChecker": true,
       "useRequestQueue": true
     },
+    "QueuedRequestController": {
+      "queuedRequestCount": 0
+    },
     "SelectedNetworkController": { "domains": "object" },
     "SmartTransactionsController": {
       "smartTransactionsState": {
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 13243a2db061..073b9f9eacdd 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -88,7 +88,7 @@ import FlaskHomeFooter from './flask/flask-home-footer.component';
 
 function shouldCloseNotificationPopup({
   isNotification,
-  totalUnapprovedCount,
+  totalUnapprovedAndQueuedRequestCount,
   hasApprovalFlows,
   isSigningQRHardwareTransaction,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -96,9 +96,11 @@ function shouldCloseNotificationPopup({
   institutionalConnectRequests,
   ///: END:ONLY_INCLUDE_IF
 }) {
+  // we can't use totalUnapproved because there are also queued requests
+
   let shouldClose =
     isNotification &&
-    totalUnapprovedCount === 0 &&
+    totalUnapprovedAndQueuedRequestCount === 0 &&
     !hasApprovalFlows &&
     !isSigningQRHardwareTransaction;
 
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 015673a5f918..50204a2fc18e 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -46,6 +46,7 @@ import {
   getNewTokensImportedError,
   hasPendingApprovals,
   getSelectedInternalAccount,
+  getQueuedRequestCount,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   getAccountType,
   ///: END:ONLY_INCLUDE_IF
@@ -112,6 +113,9 @@ const mapStateToProps = (state) => {
   const { address: selectedAddress } = getSelectedInternalAccount(state);
   const { forgottenPassword } = metamask;
   const totalUnapprovedCount = getTotalUnapprovedCount(state);
+  const queuedRequestCount = getQueuedRequestCount(state);
+  const totalUnapprovedAndQueuedRequestCount =
+    totalUnapprovedCount + queuedRequestCount;
   const swapsEnabled = getSwapsFeatureIsLive(state);
   const pendingConfirmations = getUnapprovedTemplatedConfirmations(state);
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -173,6 +177,7 @@ const mapStateToProps = (state) => {
     selectedAddress,
     firstPermissionsRequestId,
     totalUnapprovedCount,
+    totalUnapprovedAndQueuedRequestCount,
     participateInMetaMetrics,
     hasApprovalFlows: getApprovalFlows(state)?.length > 0,
     connectedStatusPopoverHasBeenShown,
diff --git a/ui/pages/routes/routes.component.test.js b/ui/pages/routes/routes.component.test.js
index 5119ad5c5c42..816121d02e9d 100644
--- a/ui/pages/routes/routes.component.test.js
+++ b/ui/pages/routes/routes.component.test.js
@@ -134,6 +134,8 @@ describe('toast display', () => {
       approvalFlows: [],
       completedOnboarding: true,
       usedNetworks: [],
+      pendingApprovals: {},
+      pendingApprovalCount: 0,
       swapsState: { swapsFeatureIsLive: true },
       newPrivacyPolicyToastShownDate: date,
     },
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 423e98e8fcfa..216c7a84003a 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -771,6 +771,10 @@ export function getTotalUnapprovedCount(state) {
   return state.metamask.pendingApprovalCount ?? 0;
 }
 
+export function getQueuedRequestCount(state) {
+  return state.metamask.queuedRequestCount ?? 0;
+}
+
 export function getTotalUnapprovedMessagesCount(state) {
   const {
     unapprovedMsgCount = 0,
diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
index 4d2d188533e3..602d8fcef3ec 100644
--- a/ui/selectors/transactions.js
+++ b/ui/selectors/transactions.js
@@ -597,22 +597,6 @@ export const submittedPendingTransactionsSelector = createSelector(
     ),
 );
 
-const hasUnapprovedTransactionsInCurrentNetwork = (state) => {
-  const unapprovedTxs = getUnapprovedTransactions(state);
-  const unapprovedTxRequests = getApprovalRequestsByType(
-    state,
-    ApprovalType.Transaction,
-  );
-
-  const chainId = getCurrentChainId(state);
-
-  const filteredUnapprovedTxInCurrentNetwork = unapprovedTxRequests.filter(
-    ({ id }) => unapprovedTxs[id] && unapprovedTxs[id].chainId === chainId,
-  );
-
-  return filteredUnapprovedTxInCurrentNetwork.length > 0;
-};
-
 const TRANSACTION_APPROVAL_TYPES = [
   ApprovalType.EthDecrypt,
   ApprovalType.EthGetEncryptionPublicKey,
@@ -622,8 +606,12 @@ const TRANSACTION_APPROVAL_TYPES = [
 ];
 
 export function hasTransactionPendingApprovals(state) {
+  const unapprovedTxRequests = getApprovalRequestsByType(
+    state,
+    ApprovalType.Transaction,
+  );
   return (
-    hasUnapprovedTransactionsInCurrentNetwork(state) ||
+    unapprovedTxRequests.length > 0 ||
     hasPendingApprovals(state, TRANSACTION_APPROVAL_TYPES)
   );
 }
diff --git a/ui/selectors/transactions.test.js b/ui/selectors/transactions.test.js
index 3f8593bc06a4..6fe8d1441053 100644
--- a/ui/selectors/transactions.test.js
+++ b/ui/selectors/transactions.test.js
@@ -510,10 +510,10 @@ describe('Transaction Selectors', () => {
       expect(result).toBe(true);
     });
 
-    it('should return false if there is a pending transaction on different network', () => {
+    it('should return true if there is a pending transaction on different network', () => {
       mockedState.metamask.transactions[0].chainId = 'differentChainId';
       const result = hasTransactionPendingApprovals(mockedState);
-      expect(result).toBe(false);
+      expect(result).toBe(true);
     });
 
     it.each([

From b733dc4d217bf2f89337c2772c5f08b411a8e98a Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Fri, 21 Jun 2024 17:09:45 -0400
Subject: [PATCH 071/236] fix: disable multiple send transactions (#25468)
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**

Multiple transactions break STX logic; we need to prevent these
transactions from being submitted concurrently. While the confirmations
screen covers this, the swap+send flow bypasses this screen altogether,
so we need to add logic to prevent submission via the instant submit
button (i.e. submit for swap+send).

<!--
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/25468?quickstart=1)

## **Related issues**

Fixes: #25349

## **Manual testing steps**

1. Submit a smart transactions (e.g., basic send on mainnet)
2. Go to the send flow and fill out the form for a swap+send
3. Ensure that the submit button is disabled with a tooltip: "A previous
transaction is still being signed or submitted"
4. Ensure that the send flow is not reset to the recipient stage when
the transactions complete
5. Ensure that a transaction can now be submitted as normal

## **Screenshots/Recordings**

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

### **Before**

See: #25349

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

### **After**


https://github.com/MetaMask/metamask-extension/assets/44588480/8f2b662c-2e55-433c-8c4a-50aaeb912d22


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

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/multichain/pages/send/send.js | 19 +++++++++++++++++--
 ui/store/actions.ts                         | 16 +++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ui/components/multichain/pages/send/send.js b/ui/components/multichain/pages/send/send.js
index c47a22e6ef69..c724a042b1d3 100644
--- a/ui/components/multichain/pages/send/send.js
+++ b/ui/components/multichain/pages/send/send.js
@@ -40,6 +40,7 @@ import {
 import {
   TokenStandard,
   AssetType,
+  SmartTransactionStatus,
 } from '../../../../../shared/constants/transaction';
 import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import { INSUFFICIENT_FUNDS_ERROR } from '../../../../pages/confirmations/send/send.constants';
@@ -56,6 +57,7 @@ import { getMostRecentOverviewPage } from '../../../../ducks/history/history';
 import { AssetPickerAmount } from '../..';
 import useUpdateSwapsState from '../../../../hooks/useUpdateSwapsState';
 import { getIsDraftSwapAndSend } from '../../../../ducks/send/helpers';
+import { smartTransactionsListSelector } from '../../../../selectors';
 import {
   SendPageAccountPicker,
   SendPageRecipientContent,
@@ -256,13 +258,20 @@ export const SendPage = () => {
   const sendErrors = useSelector(getSendErrors);
   const isInvalidSendForm = useSelector(isSendFormInvalid);
 
+  const smartTransactions = useSelector(smartTransactionsListSelector);
+
+  const isSmartTransactionPending = smartTransactions?.find(
+    ({ status }) => status === SmartTransactionStatus.pending,
+  );
+
   const isGasTooLow =
     sendErrors.gasFee === INSUFFICIENT_FUNDS_ERROR &&
     sendErrors.amount !== INSUFFICIENT_FUNDS_ERROR;
 
   const submitDisabled =
     (isInvalidSendForm && !isGasTooLow) ||
-    requireContractAddressAcknowledgement;
+    requireContractAddressAcknowledgement ||
+    (isSwapAndSend && isSmartTransactionPending);
 
   const isSendFormShown =
     draftTransactionExists &&
@@ -281,7 +290,13 @@ export const SendPage = () => {
     [dispatch],
   );
 
-  const tooltipTitle = isSwapAndSend ? t('sendSwapSubmissionWarning') : '';
+  let tooltipTitle = '';
+
+  if (isSwapAndSend) {
+    tooltipTitle = isSmartTransactionPending
+      ? t('isSigningOrSubmitting')
+      : t('sendSwapSubmissionWarning');
+  }
 
   return (
     <Page className="multichain-send-page">
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 7921e5579a0c..26a78f504a20 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -72,6 +72,7 @@ import {
   // that does not have an explicit export statement. lets see if it breaks the
   // compiler
   DraftTransaction,
+  SEND_STAGES,
 } from '../ducks/send';
 import { switchedToUnconnectedAccount } from '../ducks/alerts/unconnected-account';
 import {
@@ -1075,9 +1076,13 @@ export function updateAndApproveTx(
   unknown,
   AnyAction
 > {
-  return (dispatch: MetaMaskReduxDispatch) => {
+  return (dispatch: MetaMaskReduxDispatch, getState) => {
     !dontShowLoadingIndicator &&
       dispatch(showLoadingIndication(loadingIndicatorMessage));
+
+    const getIsSendActive = () =>
+      Boolean(getState().send.stage !== SEND_STAGES.INACTIVE);
+
     return new Promise((resolve, reject) => {
       const actionId = generateActionId();
       callBackgroundMethod(
@@ -1085,7 +1090,10 @@ export function updateAndApproveTx(
         [String(txMeta.id), { txMeta, actionId }, { waitForResult: true }],
         (err) => {
           dispatch(updateTransactionParams(txMeta.id, txMeta.txParams));
-          dispatch(resetSendState());
+
+          if (!getIsSendActive()) {
+            dispatch(resetSendState());
+          }
 
           if (err) {
             dispatch(goHome());
@@ -1101,7 +1109,9 @@ export function updateAndApproveTx(
       .then(() => updateMetamaskStateFromBackground())
       .then((newState) => dispatch(updateMetamaskState(newState)))
       .then(() => {
-        dispatch(resetSendState());
+        if (!getIsSendActive()) {
+          dispatch(resetSendState());
+        }
         dispatch(completedTx(txMeta.id));
         dispatch(hideLoadingIndication());
         dispatch(updateCustomNonce(''));

From f7b4771f71a98640cddf3ebf88e3f196c2efc101 Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Fri, 21 Jun 2024 18:12:43 -0400
Subject: [PATCH 072/236] fix: disable unsupported swap+send networks (#25474)
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**

Swap+Send relies on a function in the newest swap+send contracts (i.e.
once Swap+Send is deployed on all current swap networks, Swap+Send
network support should be 1-to-1 with that of Swaps). However, we are
still waiting on the API to be updated for these new contracts so we
cannot operate under the assumption that all of these networks will be
deployed by the time Swap+Send begins rolling out in production.

To mitigate this concern, we can utilize a property in Swaps' feature
flag endpoint (see: https://swap.dev-api.cx.metamask.io/featureFlags)
when the send flow is initialized to determine if that network should be
disabled despite having swaps support.

<!--
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/25474?quickstart=1)

## **Related issues**

Fixes: #25107

## **Manual testing steps**

1. Set `SWAPS_USE_DEV_APIS=true` in `.metamaskrc` (the endpoint update
hasn't been deployed to prod as of writing)
2. Switch to an unsupported network (e.g., zkSync)
3. Verify that, when entering the swaps flow, that network is disabled
(i.e., the destination asset picker is disabled)
4. Switch to a supported network (e.g., BNB)
5. Verify that the network is not disabled in the send flow

## **Screenshots/Recordings**

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

### **Before**

#### zkSync (network enabled despite no support)

<img width="405" alt="Screenshot 2024-06-21 at 2 01 27 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/fbbac5d5-860f-49a4-9bf3-1f4722a975f0">


#### BNB (network enabled)

<img width="405" alt="Screenshot 2024-06-21 at 2 00 48 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/06fbc608-829e-443f-80d2-8bd4e152843c">

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

### **After**

#### zkSync (network disabled)

<img width="405" alt="Screenshot 2024-06-21 at 1 59 48 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/7910a56c-3744-4aef-9964-085c83f6c391">

#### BNB (network enabled)

<img width="405" alt="Screenshot 2024-06-21 at 2 00 11 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/e3fd781f-e3f0-4e7d-bc1b-ed3cc2148dc8">

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

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 test/data/mock-send-state.json                |  1 +
 test/data/mock-state.json                     |  1 +
 .../send/components/recipient-content.tsx     |  5 +++
 ui/ducks/send/send.js                         | 21 ++++++++++-
 ui/ducks/send/send.test.js                    | 35 +++++++++++++++++++
 ui/ducks/send/swap-and-send-utils.ts          | 30 ++++++++++++++++
 6 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/test/data/mock-send-state.json b/test/data/mock-send-state.json
index f1caf9b7eeee..c8604c96c055 100644
--- a/test/data/mock-send-state.json
+++ b/test/data/mock-send-state.json
@@ -1245,6 +1245,7 @@
   "send": {
     "amountMode": "INPUT",
     "currentTransactionUUID": "1-tx",
+    "disabledSwapAndSendNetworks": [],
     "draftTransactions": {
       "1-tx": {
         "amount": {
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index 88fee4835864..fe39047c7667 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -1947,6 +1947,7 @@
   "send": {
     "amountMode": "INPUT",
     "currentTransactionUUID": null,
+    "disabledSwapAndSendNetworks": [],
     "draftTransactions": {},
     "eip1559support": false,
     "gasEstimateIsLoading": true,
diff --git a/ui/components/multichain/pages/send/components/recipient-content.tsx b/ui/components/multichain/pages/send/components/recipient-content.tsx
index 90a73a932c4b..097214d7cd25 100644
--- a/ui/components/multichain/pages/send/components/recipient-content.tsx
+++ b/ui/components/multichain/pages/send/components/recipient-content.tsx
@@ -11,6 +11,7 @@ import {
   acknowledgeRecipientWarning,
   getBestQuote,
   getCurrentDraftTransaction,
+  getIsSwapAndSendDisabledForNetwork,
   getSendAsset,
   getSwapsBlockedTokens,
 } from '../../../../../ducks/send';
@@ -46,12 +47,16 @@ export const SendPageRecipientContent = ({
 
   const isBasicFunctionality = useSelector(getUseExternalServices);
   const isSwapsChain = useSelector(getIsSwapsChain);
+  const isSwapAndSendDisabledForNetwork = useSelector(
+    getIsSwapAndSendDisabledForNetwork,
+  );
   const swapsBlockedTokens = useSelector(getSwapsBlockedTokens);
   const memoizedSwapsBlockedTokens = useMemo(() => {
     return new Set(swapsBlockedTokens);
   }, [swapsBlockedTokens]);
   const isSwapAllowed =
     isSwapsChain &&
+    !isSwapAndSendDisabledForNetwork &&
     [AssetType.token, AssetType.native].includes(sendAsset.type) &&
     isBasicFunctionality &&
     !memoizedSwapsBlockedTokens.has(sendAsset.details?.address?.toLowerCase());
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 9c45334a9625..39e5974c8060 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -140,7 +140,10 @@ import {
   DEFAULT_ROUTE,
 } from '../../helpers/constants/routes';
 import { fetchBlockedTokens } from '../../pages/swaps/swaps.util';
-import { getSwapAndSendQuotes } from './swap-and-send-utils';
+import {
+  getDisabledSwapAndSendNetworksFromAPI,
+  getSwapAndSendQuotes,
+} from './swap-and-send-utils';
 import {
   estimateGasLimitForSend,
   generateTransactionParams,
@@ -463,6 +466,7 @@ export const draftTransactionInitialState = {
  *  clean up AND during initialization. When a transaction is edited a new UUID
  *  is generated for it and the state of that transaction is copied into a new
  *  entry in the draftTransactions object.
+ * @property {string[]} disabledSwapAndSendNetworks - list of networks that are disabled for swap and send
  * @property {{[key: string]: DraftTransaction}} draftTransactions - An object keyed
  *  by UUID with draftTransactions as the values.
  * @property {boolean} eip1559support - tracks whether the current network
@@ -505,6 +509,7 @@ export const draftTransactionInitialState = {
 export const initialState = {
   amountMode: AMOUNT_MODES.INPUT,
   currentTransactionUUID: null,
+  disabledSwapAndSendNetworks: [],
   draftTransactions: {},
   eip1559support: false,
   gasEstimateIsLoading: true,
@@ -763,11 +768,15 @@ export const initializeSendState = createAsyncThunk(
         ? (await fetchBlockedTokens(chainId)).map((t) => t.toLowerCase())
         : [];
 
+    const disabledSwapAndSendNetworks =
+      await getDisabledSwapAndSendNetworksFromAPI();
+
     return {
       account,
       chainId: getCurrentChainId(state),
       tokens: getTokens(state),
       chainHasChanged,
+      disabledSwapAndSendNetworks,
       gasFeeEstimates,
       gasEstimateType,
       gasLimit,
@@ -1980,6 +1989,8 @@ const slice = createSlice({
           });
         }
         state.swapsBlockedTokens = action.payload.swapsBlockedTokens;
+        state.disabledSwapAndSendNetworks =
+          action.payload.disabledSwapAndSendNetworks;
         if (state.amountMode === AMOUNT_MODES.MAX) {
           slice.caseReducers.updateAmountToMax(state);
         }
@@ -3520,6 +3531,14 @@ export function getSwapsBlockedTokens(state) {
   return state[name].swapsBlockedTokens;
 }
 
+export const getIsSwapAndSendDisabledForNetwork = createSelector(
+  (state) => state.metamask.providerConfig,
+  (state) => state[name]?.disabledSwapAndSendNetworks ?? [],
+  ({ chainId }, disabledSwapAndSendNetworks) => {
+    return disabledSwapAndSendNetworks.includes(chainId);
+  },
+);
+
 export const getSendAnalyticProperties = createSelector(
   (state) => state.metamask.providerConfig,
   getCurrentDraftTransaction,
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index 62d43eba56e6..6eac025e8f0a 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -35,6 +35,7 @@ import {
   INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
 } from '../../../test/jest/mocks';
 import { ETH_EOA_METHODS } from '../../../shared/constants/eth-methods';
+import * as Utils from './swap-and-send-utils';
 import sendReducer, {
   initialState,
   initializeSendState,
@@ -81,6 +82,7 @@ import sendReducer, {
   getSender,
   getSwapsBlockedTokens,
   updateSendQuote,
+  getIsSwapAndSendDisabledForNetwork,
 } from './send';
 import { draftTransactionInitialState, editExistingTransaction } from '.';
 
@@ -171,6 +173,9 @@ describe('Send Slice', () => {
     jest
       .spyOn(Actions, 'getLayer1GasFee')
       .mockReturnValue({ type: 'GET_LAYER_1_GAS_FEE' });
+    jest
+      .spyOn(Utils, 'getDisabledSwapAndSendNetworksFromAPI')
+      .mockReturnValue([]);
   });
 
   describe('Reducers', () => {
@@ -4485,6 +4490,36 @@ describe('Send Slice', () => {
           }),
         ).toStrictEqual(['target']);
       });
+
+      it('has a selector to get if swap+send is disabled for that network', () => {
+        expect(
+          getIsSwapAndSendDisabledForNetwork({
+            metamask: {
+              providerConfig: {
+                chainId: 'disabled network',
+              },
+            },
+            send: {
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+              disabledSwapAndSendNetworks: ['disabled network'],
+            },
+          }),
+        ).toStrictEqual(true);
+
+        expect(
+          getIsSwapAndSendDisabledForNetwork({
+            metamask: {
+              providerConfig: {
+                chainId: 'enabled network',
+              },
+            },
+            send: {
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+              disabledSwapAndSendNetworks: ['disabled network'],
+            },
+          }),
+        ).toStrictEqual(false);
+      });
     });
   });
 });
diff --git a/ui/ducks/send/swap-and-send-utils.ts b/ui/ducks/send/swap-and-send-utils.ts
index b6bd4e479d9f..9ab6486a7ed1 100644
--- a/ui/ducks/send/swap-and-send-utils.ts
+++ b/ui/ducks/send/swap-and-send-utils.ts
@@ -1,5 +1,6 @@
 import { isNumber } from 'lodash';
 import {
+  ALLOWED_PROD_SWAPS_CHAIN_IDS,
   SWAPS_API_V2_BASE_URL,
   SWAPS_CLIENT_ID,
   SWAPS_DEV_API_V2_BASE_URL,
@@ -18,6 +19,10 @@ import {
   hexToDecimal,
 } from '../../../shared/modules/conversion.utils';
 import { isValidHexAddress } from '../../../shared/modules/hexstring-utils';
+import {
+  fetchSwapsFeatureFlags,
+  getNetworkNameByChainId,
+} from '../../pages/swaps/swaps.util';
 
 type Address = `0x${string}`;
 
@@ -208,3 +213,28 @@ export async function getSwapAndSendQuotes(request: Request): Promise<Quote[]> {
 
   return newQuotes;
 }
+
+export async function getDisabledSwapAndSendNetworksFromAPI(): Promise<
+  string[]
+> {
+  try {
+    const blockedChains: string[] = [];
+
+    const featureFlagResponse = await fetchSwapsFeatureFlags();
+
+    ALLOWED_PROD_SWAPS_CHAIN_IDS.forEach((chainId) => {
+      // explicitly look for disabled so that chains aren't turned off accidentally
+      if (
+        featureFlagResponse[getNetworkNameByChainId(chainId)]?.v2?.swapAndSend
+          ?.enabled === false
+      ) {
+        blockedChains.push(chainId);
+      }
+    });
+
+    return blockedChains;
+  } catch (error) {
+    // assume no networks are blocked since the quotes will not be fetched on an unavailable network anyways
+    return [];
+  }
+}

From 3ddc5fd006d6dec4d5709b4c6e1ce6791a8c3d59 Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Fri, 21 Jun 2024 18:48:21 -0400
Subject: [PATCH 073/236] fix: ellipsify long NFT IDs (#25479)
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**

Long token IDs will overflow the padding and breaking the styling. This
PR truncates long token IDs from the middle.

<!--
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/25479?quickstart=1)

## **Related issues**

Fixes: #25370

## **Manual testing steps**

1. Go to the send flow
2. Select an NFT (721 or 1155) with a token ID long enough to overflow
the component
3. Ensure that it is truncated with and ellipsis in the middle

## **Screenshots/Recordings**

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

### **Before**

<img width="405" alt="Screenshot 2024-06-21 at 6 00 32 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/4c491710-f636-4980-8f9a-a22001e1380f">

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

### **After**

<img width="405" alt="Screenshot 2024-06-21 at 6 01 51 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/911e494a-e940-49a6-9855-412babfc0557">

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

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../asset-picker/asset-picker.test.tsx        | 40 +++++++++++++++++++
 .../asset-picker/asset-picker.tsx             |  8 +++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx
index 08864f10edf8..208395b2228b 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.test.tsx
@@ -157,6 +157,46 @@ describe('AssetPicker', () => {
     expect(getByText('?')).toBeInTheDocument();
   });
 
+  it('nft: does not truncates if token ID is under length 13', () => {
+    const asset = {
+      type: AssetType.NFT,
+      details: {
+        address: 'token address',
+        decimals: 2,
+        tokenId: 1234567890,
+      },
+      balance: '100',
+    };
+    const mockAssetChange = jest.fn();
+
+    const { getByText } = render(
+      <Provider store={store()}>
+        <AssetPicker asset={asset} onAssetChange={() => mockAssetChange()} />
+      </Provider>,
+    );
+    expect(getByText('#1234567890')).toBeInTheDocument();
+  });
+
+  it('nft: truncates if token ID is too long', () => {
+    const asset = {
+      type: AssetType.NFT,
+      details: {
+        address: 'token address',
+        decimals: 2,
+        tokenId: 1234567890123456,
+      },
+      balance: '100',
+    };
+    const mockAssetChange = jest.fn();
+
+    const { getByText } = render(
+      <Provider store={store()}>
+        <AssetPicker asset={asset} onAssetChange={() => mockAssetChange()} />
+      </Provider>,
+    );
+    expect(getByText('#123456...3456')).toBeInTheDocument();
+  });
+
   it('render if disabled', () => {
     const asset = {
       type: AssetType.token,
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 5867fc86b870..a3b1f965cb34 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -36,6 +36,9 @@ import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../../../shared/constants/metametrics';
+import { ellipsify } from '../../../../pages/confirmations/send/send.utils';
+
+const ELLIPSIFY_LENGTH = 13; // 6 (start) + 4 (end) + 3 (...)
 
 export type AssetPickerProps = {
   asset: Asset;
@@ -168,7 +171,10 @@ export function AssetPicker({
                 variant={TextVariant.bodySm}
                 color={TextColor.textAlternative}
               >
-                #{asset.details.tokenId}
+                #
+                {String(asset.details.tokenId).length < ELLIPSIFY_LENGTH
+                  ? asset.details.tokenId
+                  : ellipsify(String(asset.details.tokenId), 6, 4)}
               </Text>
             )}
           </Tooltip>

From af3e2cdfcad19e9275b59e583b7de0036fd49ef5 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 24 Jun 2024 16:18:32 -0230
Subject: [PATCH 074/236] v11.16.14

---
 CHANGELOG.md | 7 ++++++-
 package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffe6ec8da36d..ee06afc67f84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.14]
+### Fixed
+- Fix bug preventing connection of Trezor hardware wallets on firefox ([#25487](https://github.com/MetaMask/metamask-extension/pull/25487))
+
 ## [11.16.13]
 ### Changed
 - Update Blockaid feature for latest security protections ([#25442](https://github.com/MetaMask/metamask-extension/pull/25442))
@@ -4818,7 +4822,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.13...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.14...HEAD
+[11.16.14]: https://github.com/MetaMask/metamask-extension/compare/v11.16.13...v11.16.14
 [11.16.13]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...v11.16.13
 [11.16.12]: https://github.com/MetaMask/metamask-extension/compare/v11.16.11...v11.16.12
 [11.16.11]: https://github.com/MetaMask/metamask-extension/compare/v11.16.10...v11.16.11
diff --git a/package.json b/package.json
index c3dbfebec380..97e811ad9b49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.13",
+  "version": "11.16.14",
   "private": true,
   "repository": {
     "type": "git",

From c910b91ebd37d88fa7dbdd2f974f8bb4d82b79c9 Mon Sep 17 00:00:00 2001
From: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
Date: Mon, 24 Jun 2024 17:14:11 -0400
Subject: [PATCH 075/236] fix(swaps): fix to round gas values to integer
 (#25488) (#25495)
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.
-->

This is a cherry pick PR for #25488

<!--
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/25488?quickstart=1)

Fixes:

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

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

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

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

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [x] 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.

---------


<!--
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/25495?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Nicolas Ferro <nicolaspatricioferro@gmail.com>
---
 shared/lib/swaps-utils.js                     | 36 ++++++++++++++
 shared/lib/swaps-utils.test.js                | 48 ++++++++++++++++++-
 shared/lib/ui-utils.js                        |  3 ++
 ui/ducks/swaps/swaps.js                       | 27 +++++------
 .../swaps/prepare-swap-page/review-quote.js   | 30 +++++-------
 ui/pages/swaps/view-quote/view-quote.js       | 23 ++++-----
 6 files changed, 118 insertions(+), 49 deletions(-)

diff --git a/shared/lib/swaps-utils.js b/shared/lib/swaps-utils.js
index 5b5107b4495d..868549a2b143 100644
--- a/shared/lib/swaps-utils.js
+++ b/shared/lib/swaps-utils.js
@@ -17,6 +17,8 @@ import { addHexPrefix } from '../../app/scripts/lib/util';
 import { decimalToHex } from '../modules/conversion.utils';
 import fetchWithCache from './fetch-with-cache';
 
+const FALLBACK_GAS_MULTIPLIER = 1.5;
+
 const TEST_CHAIN_IDS = [CHAIN_IDS.GOERLI, CHAIN_IDS.LOCALHOST];
 
 const clientIdHeader = { 'X-Client-Id': SWAPS_CLIENT_ID };
@@ -317,3 +319,37 @@ export async function fetchTradesInfo(
 
   return newQuotes;
 }
+
+/**
+ * Given a gas estimate, gas multiplier, max gas, and custom max gas, returns the max gas limit
+ * to use for a transaction.
+ *
+ * @param {string} gasEstimate - The gas estimate for the transaction.
+ * @param {number} gasMultiplier - The gas multiplier to use.
+ * @param {number} maxGas - The max gas limit to use.
+ * @param {string} customMaxGas - The custom max gas limit to use.
+ * @returns {string} The max gas limit to use for the transaction.
+ */
+
+export function calculateMaxGasLimit(
+  gasEstimate,
+  gasMultiplier = FALLBACK_GAS_MULTIPLIER,
+  maxGas,
+  customMaxGas,
+) {
+  const gasLimitForMax = new BigNumber(gasEstimate || 0, 16)
+    .round(0)
+    .toString(16);
+
+  const usedGasLimitWithMultiplier = new BigNumber(gasLimitForMax, 16)
+    .times(gasMultiplier, 10)
+    .round(0)
+    .toString(16);
+
+  const nonCustomMaxGasLimit = gasEstimate
+    ? usedGasLimitWithMultiplier
+    : `0x${decimalToHex(maxGas || 0)}`;
+  const maxGasLimit = customMaxGas || nonCustomMaxGasLimit;
+
+  return maxGasLimit;
+}
diff --git a/shared/lib/swaps-utils.test.js b/shared/lib/swaps-utils.test.js
index 5979f1e931e1..2132a2751750 100644
--- a/shared/lib/swaps-utils.test.js
+++ b/shared/lib/swaps-utils.test.js
@@ -10,7 +10,11 @@ import {
   TOKENS,
   MOCK_TRADE_RESPONSE_2,
 } from '../../ui/pages/swaps/swaps-util-test-constants';
-import { fetchTradesInfo, shouldEnableDirectWrapping } from './swaps-utils';
+import {
+  fetchTradesInfo,
+  shouldEnableDirectWrapping,
+  calculateMaxGasLimit,
+} from './swaps-utils';
 
 jest.mock('./storage-helpers', () => ({
   getStorageItem: jest.fn(),
@@ -224,4 +228,46 @@ describe('Swaps Utils', () => {
       expect(shouldEnableDirectWrapping(CHAIN_IDS.MAINNET)).toBe(false);
     });
   });
+
+  describe('calculateMaxGasLimit', () => {
+    const gasEstimate = '0x37b15';
+    const maxGas = 273740;
+    let expectedMaxGas = '42d4c';
+    let gasMultiplier = 1.2;
+    let customMaxGas = '';
+
+    it('should return the max gas limit', () => {
+      const result = calculateMaxGasLimit(
+        gasEstimate,
+        gasMultiplier,
+        maxGas,
+        customMaxGas,
+      );
+      expect(result).toStrictEqual(expectedMaxGas);
+    });
+
+    it('should return the custom max gas limit', () => {
+      customMaxGas = '46d4c';
+      const result = calculateMaxGasLimit(
+        gasEstimate,
+        gasMultiplier,
+        maxGas,
+        customMaxGas,
+      );
+      expect(result).toStrictEqual(customMaxGas);
+    });
+
+    it('should return the max gas limit with a gas multiplier of 4.5', () => {
+      gasMultiplier = 4.5;
+      expectedMaxGas = 'fa9df';
+      customMaxGas = '';
+      const result = calculateMaxGasLimit(
+        gasEstimate,
+        gasMultiplier,
+        maxGas,
+        customMaxGas,
+      );
+      expect(result).toStrictEqual(expectedMaxGas);
+    });
+  });
 });
diff --git a/shared/lib/ui-utils.js b/shared/lib/ui-utils.js
index b27cfc9e22fe..cbb28bf0bd16 100644
--- a/shared/lib/ui-utils.js
+++ b/shared/lib/ui-utils.js
@@ -19,3 +19,6 @@ export const SECURITY_ALERTS_LEARN_MORE_LINK =
 
 export const TRANSACTION_SIMULATIONS_LEARN_MORE_LINK =
   'https://support.metamask.io/transactions-and-gas/transactions/simulations/';
+
+export const GAS_FEES_LEARN_MORE_URL =
+  'https://community.metamask.io/t/what-is-gas-why-do-transactions-take-so-long/3172';
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index 56a7273e8d5b..59fadda433d5 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -94,6 +94,7 @@ import {
 } from '../../../shared/lib/transactions-controller-utils';
 import { EtherDenomination } from '../../../shared/constants/common';
 import { Numeric } from '../../../shared/modules/Numeric';
+import { calculateMaxGasLimit } from '../../../shared/lib/swaps-utils';
 
 export const GAS_PRICES_LOADING_STATES = {
   INITIAL: 'INITIAL',
@@ -102,8 +103,6 @@ export const GAS_PRICES_LOADING_STATES = {
   COMPLETED: 'COMPLETED',
 };
 
-export const FALLBACK_GAS_MULTIPLIER = 1.5;
-
 const initialState = {
   aggregatorMetadata: null,
   approveTxId: null,
@@ -1106,20 +1105,16 @@ export const signAndSendTransactions = (
     const usedQuote = getUsedQuote(state);
     const usedTradeTxParams = usedQuote.trade;
 
-    const estimatedGasLimit = new BigNumber(
-      usedQuote?.gasEstimate || 0,
-      16,
-    ).toString(16);
-
-    const maxGasLimit =
-      customSwapsGas ||
-      (usedQuote?.gasEstimate
-        ? `0x${estimatedGasLimit}`
-        : `0x${decimalToHex(
-            new BigNumber(usedQuote?.maxGas)
-              .mul(usedQuote?.gasMultiplier || FALLBACK_GAS_MULTIPLIER)
-              .toString() || 0,
-          )}`);
+    const estimatedGasLimit = new BigNumber(usedQuote?.gasEstimate || 0, 16)
+      .round(0)
+      .toString(16);
+
+    const maxGasLimit = calculateMaxGasLimit(
+      usedQuote?.gasEstimate,
+      usedQuote?.gasMultiplier,
+      usedQuote?.maxGas,
+      customSwapsGas,
+    );
 
     const usedGasPrice = getUsedSwapsGasPrice(state);
     usedTradeTxParams.gas = maxGasLimit;
diff --git a/ui/pages/swaps/prepare-swap-page/review-quote.js b/ui/pages/swaps/prepare-swap-page/review-quote.js
index a2a471e19917..5fb2badd8bcb 100644
--- a/ui/pages/swaps/prepare-swap-page/review-quote.js
+++ b/ui/pages/swaps/prepare-swap-page/review-quote.js
@@ -22,7 +22,6 @@ import { usePrevious } from '../../../hooks/usePrevious';
 import { useGasFeeInputs } from '../../confirmations/hooks/useGasFeeInputs';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
-  FALLBACK_GAS_MULTIPLIER,
   getQuotes,
   getSelectedQuote,
   getApproveTxParams,
@@ -135,7 +134,11 @@ import {
   toPrecisionWithoutTrailingZeros,
 } from '../../../../shared/lib/transactions-controller-utils';
 import { addHexPrefix } from '../../../../app/scripts/lib/util';
-import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
+import {
+  calcTokenValue,
+  calculateMaxGasLimit,
+} from '../../../../shared/lib/swaps-utils';
+import { GAS_FEES_LEARN_MORE_URL } from '../../../../shared/lib/ui-utils';
 import ExchangeRateDisplay from '../exchange-rate-display';
 import InfoTooltip from '../../../components/ui/info-tooltip';
 import useRamps from '../../../hooks/experiences/useRamps';
@@ -144,9 +147,6 @@ import SlippageNotificationModal from './slippage-notification-modal';
 
 let intervalId;
 
-const GAS_FEES_LEARN_MORE_URL =
-  'https://community.metamask.io/t/what-is-gas-why-do-transactions-take-so-long/3172';
-
 export default function ReviewQuote({ setReceiveToAmount }) {
   const history = useHistory();
   const dispatch = useDispatch();
@@ -297,20 +297,12 @@ export default function ReviewQuote({ setReceiveToAmount }) {
     usedQuote?.gasEstimateWithRefund ||
     `0x${decimalToHex(usedQuote?.averageGas || 0)}`;
 
-  const estimatedGasLimit = new BigNumber(
-    usedQuote?.gasEstimate || 0,
-    16,
-  ).toString(16);
-
-  const nonCustomMaxGasLimit = usedQuote?.gasEstimate
-    ? `0x${estimatedGasLimit}`
-    : `0x${decimalToHex(
-        new BigNumber(usedQuote?.maxGas)
-          .mul(usedQuote?.gasMultiplier || FALLBACK_GAS_MULTIPLIER)
-          .toString() || 0,
-      )}`;
-
-  const maxGasLimit = customMaxGas || nonCustomMaxGasLimit;
+  const maxGasLimit = calculateMaxGasLimit(
+    usedQuote?.gasEstimate,
+    usedQuote?.gasMultiplier,
+    usedQuote?.maxGas,
+    customMaxGas,
+  );
 
   let maxFeePerGas;
   let maxPriorityFeePerGas;
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index 3525cb457f94..f67f727317a1 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -22,7 +22,6 @@ import { useGasFeeInputs } from '../../confirmations/hooks/useGasFeeInputs';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import FeeCard from '../fee-card';
 import {
-  FALLBACK_GAS_MULTIPLIER,
   getQuotes,
   getSelectedQuote,
   getApproveTxParams,
@@ -109,7 +108,10 @@ import {
   toPrecisionWithoutTrailingZeros,
 } from '../../../../shared/lib/transactions-controller-utils';
 import { addHexPrefix } from '../../../../app/scripts/lib/util';
-import { calcTokenValue } from '../../../../shared/lib/swaps-utils';
+import {
+  calcTokenValue,
+  calculateMaxGasLimit,
+} from '../../../../shared/lib/swaps-utils';
 import {
   addHexes,
   decGWEIToHexWEI,
@@ -230,17 +232,12 @@ export default function ViewQuote() {
     usedQuote?.gasEstimateWithRefund ||
     `0x${decimalToHex(usedQuote?.averageGas || 0)}`;
 
-  const gasLimitForMax = usedQuote?.gasEstimate || `0x0`;
-
-  const usedGasLimitWithMultiplier = new BigNumber(gasLimitForMax, 16)
-    .times(usedQuote?.gasMultiplier || FALLBACK_GAS_MULTIPLIER, 10)
-    .round(0)
-    .toString(16);
-
-  const nonCustomMaxGasLimit = usedQuote?.gasEstimate
-    ? usedGasLimitWithMultiplier
-    : `0x${decimalToHex(usedQuote?.maxGas || 0)}`;
-  const maxGasLimit = customMaxGas || nonCustomMaxGasLimit;
+  const maxGasLimit = calculateMaxGasLimit(
+    usedQuote?.gasEstimate,
+    usedQuote?.gasMultiplier,
+    usedQuote?.maxGas,
+    customMaxGas,
+  );
 
   let maxFeePerGas;
   let maxPriorityFeePerGas;

From e3bee97b53421232ef7080d1387824d7d800c0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Tue, 25 Jun 2024 15:38:04 +0100
Subject: [PATCH 076/236] chore: updates MMI packages to latest versions
 (#25502)
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.
-->

Updates packages from MMI to their latest versions.

Fixes:

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

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

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

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

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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>
---
 lavamoat/browserify/mmi/policy.json |   1 -
 package.json                        |  12 +--
 yarn.lock                           | 112 +++++++++++++---------------
 3 files changed, 57 insertions(+), 68 deletions(-)

diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 91e5cd60f2b8..85d10ae42994 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -767,7 +767,6 @@
         "console.debug": true,
         "console.error": true,
         "console.log": true,
-        "console.warn": true,
         "fetch": true
       },
       "packages": {
diff --git a/package.json b/package.json
index 97e811ad9b49..da1073ed970a 100644
--- a/package.json
+++ b/package.json
@@ -274,14 +274,14 @@
     "@lavamoat/lavadome-react": "0.0.17",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@metamask-institutional/custody-controller": "^0.2.27",
-    "@metamask-institutional/custody-keyring": "^2.0.0",
-    "@metamask-institutional/extension": "^0.3.24",
-    "@metamask-institutional/institutional-features": "^1.3.2",
+    "@metamask-institutional/custody-controller": "^0.2.30",
+    "@metamask-institutional/custody-keyring": "^2.0.3",
+    "@metamask-institutional/extension": "^0.3.27",
+    "@metamask-institutional/institutional-features": "^1.3.5",
     "@metamask-institutional/portfolio-dashboard": "^1.4.1",
     "@metamask-institutional/rpc-allowlist": "^1.0.3",
-    "@metamask-institutional/sdk": "^0.1.26",
-    "@metamask-institutional/transaction-update": "^0.2.2",
+    "@metamask-institutional/sdk": "^0.1.30",
+    "@metamask-institutional/transaction-update": "^0.2.5",
     "@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 e4eff83b34d3..6c2542e6f286 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3942,60 +3942,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-controller@npm:^0.2.27":
-  version: 0.2.27
-  resolution: "@metamask-institutional/custody-controller@npm:0.2.27"
+"@metamask-institutional/custody-controller@npm:^0.2.30":
+  version: 0.2.30
+  resolution: "@metamask-institutional/custody-controller@npm:0.2.30"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
-    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.3"
+    "@metamask-institutional/sdk": "npm:^0.1.30"
     "@metamask-institutional/types": "npm:^1.1.0"
-    "@metamask/obs-store": "npm:^8.0.0"
-  checksum: b834477c4551fdbd56143742038f1b101cb72b1655380a63d6d84416af949b259109a22967d3233009d737400f656c91ba100dcb61522eb14e6715564f07e404
+    "@metamask/obs-store": "npm:^9.0.0"
+  checksum: 10/3d5ad6675d09f67bff924461b2d72f6c406a8cf86523119bcc8dea0f473501b8644f2dafd3babfcc4d2a0cbeb44d32b1a15dad701b481daac34c5eb4e5bcdd4b
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-keyring@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@metamask-institutional/custody-keyring@npm:2.0.0"
+"@metamask-institutional/custody-keyring@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@metamask-institutional/custody-keyring@npm:2.0.3"
   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.27"
+    "@metamask-institutional/sdk": "npm:^0.1.30"
     "@metamask-institutional/types": "npm:^1.1.0"
-    "@metamask/obs-store": "npm:^8.0.0"
+    "@metamask/obs-store": "npm:^9.0.0"
     crypto: "npm:^1.0.1"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 14563443d157d97554ab4456c69ecba52aacde9659bcdc5b20724a3cf7c626c3ef624446823ceafbf3aa25307e89f0dc09636e8db49f49f48d5d7c6b37f52bf9
+  checksum: 10/987beeeed67fb92a436eb1318f48ec2cc0ceb1ae944b7f5b2e492dcdc28a4298c5a8d25a520022ac52f87a411f7341961100be47a9626fbb1674aed349d98737
   languageName: node
   linkType: hard
 
-"@metamask-institutional/extension@npm:^0.3.24":
-  version: 0.3.24
-  resolution: "@metamask-institutional/extension@npm:0.3.24"
+"@metamask-institutional/extension@npm:^0.3.27":
+  version: 0.3.27
+  resolution: "@metamask-institutional/extension@npm:0.3.27"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-controller": "npm:^0.2.27"
-    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
+    "@metamask-institutional/custody-controller": "npm:^0.2.30"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.3"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
-    "@metamask-institutional/sdk": "npm:^0.1.27"
-    "@metamask-institutional/transaction-update": "npm:^0.2.2"
+    "@metamask-institutional/sdk": "npm:^0.1.30"
+    "@metamask-institutional/transaction-update": "npm:^0.2.5"
     "@metamask-institutional/types": "npm:^1.1.0"
     jest-create-mock-instance: "npm:^2.0.0"
     jest-fetch-mock: "npm:3.0.3"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 7ec773d3f98b61d4d6b877e39eec239aca3cb5accaa2211728ddbad32fb6dba5f1c2e7ac7e90e1606bf94995f78dd323cb64a06fa587fd435b7e1592515f73ab
+  checksum: 10/dc9eefe8045607cd415b9db4a8df833c9a523e9d06a3a0e49e4c6e85063924db1f117725a91c926f19ce26d0701fc175ea4ad38fb13a8a3b092434bcd7fd7882
   languageName: node
   linkType: hard
 
-"@metamask-institutional/institutional-features@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "@metamask-institutional/institutional-features@npm:1.3.2"
+"@metamask-institutional/institutional-features@npm:^1.3.5":
+  version: 1.3.5
+  resolution: "@metamask-institutional/institutional-features@npm:1.3.5"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
-    "@metamask/obs-store": "npm:^8.0.0"
-  checksum: be5e8722c1180cf7127ee4c7cab0b26a60cb56e7bf0147836b496496bc6ada4de3e0265b97118ba4229ae6a847188097ed7175d51d689c5898e381fe54707aa9
+    "@metamask-institutional/custody-keyring": "npm:^2.0.3"
+    "@metamask/obs-store": "npm:^9.0.0"
+  checksum: 10/1a154dbbfc71c9fee43d755d901423e3ea17ad149679225481fdc2d73ae95960e1805a792dbe660dd778703614ea5fd7390314bd7099c8ede510db1d23bc08ab
   languageName: node
   linkType: hard
 
@@ -4013,9 +4013,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/sdk@npm:^0.1.26, @metamask-institutional/sdk@npm:^0.1.27":
-  version: 0.1.27
-  resolution: "@metamask-institutional/sdk@npm:0.1.27"
+"@metamask-institutional/sdk@npm:^0.1.30":
+  version: 0.1.30
+  resolution: "@metamask-institutional/sdk@npm:0.1.30"
   dependencies:
     "@metamask-institutional/simplecache": "npm:^1.1.0"
     "@metamask-institutional/types": "npm:^1.1.0"
@@ -4023,7 +4023,7 @@ __metadata:
     "@types/node": "npm:^20.11.17"
     bignumber.js: "npm:^9.1.1"
     jsonwebtoken: "npm:^9.0.0"
-  checksum: 9de0d737cab194c8f16a63f92bade1265667f2042c4449bdde60240afb09cdfb71c2b583fbd629a9c72c43530b8d6816def91601aa517c8b47b0b2d473095397
+  checksum: 10/3f36925fa9399a0ea06e2a64ea89accfb34f0a17581ab69652b4f325a948db10e88faebcca4f7c2d9f5f1f1c7f98bd8f970b7a489218dfd1be8cebc669a2f67e
   languageName: node
   linkType: hard
 
@@ -4034,17 +4034,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/transaction-update@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "@metamask-institutional/transaction-update@npm:0.2.2"
+"@metamask-institutional/transaction-update@npm:^0.2.5":
+  version: 0.2.5
+  resolution: "@metamask-institutional/transaction-update@npm:0.2.5"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
-    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
-    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.3"
+    "@metamask-institutional/sdk": "npm:^0.1.30"
     "@metamask-institutional/types": "npm:^1.1.0"
-    "@metamask-institutional/websocket-client": "npm:^0.2.2"
-    "@metamask/obs-store": "npm:^8.0.0"
-  checksum: 31c62a2d207e8e3c2469b870eecb18ff2db450eda8b28c2d428a69cc9eee8a477142f74abebad50c62a6e0f1132dafa8db6b8bf95f43677a401a54b4d3cd5fd0
+    "@metamask-institutional/websocket-client": "npm:^0.2.5"
+    "@metamask/obs-store": "npm:^9.0.0"
+  checksum: 10/9dbcf7c38a03becf61ab013f78df225da1f6de12976f328e7809c0edda5ab9e1aeee2b4d5b9430c15d5dc9f7040fa703c560c58073d601110895388c1c15d7a8
   languageName: node
   linkType: hard
 
@@ -4055,15 +4055,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/websocket-client@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "@metamask-institutional/websocket-client@npm:0.2.2"
+"@metamask-institutional/websocket-client@npm:^0.2.5":
+  version: 0.2.5
+  resolution: "@metamask-institutional/websocket-client@npm:0.2.5"
   dependencies:
-    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
-    "@metamask-institutional/sdk": "npm:^0.1.27"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.3"
+    "@metamask-institutional/sdk": "npm:^0.1.30"
     "@metamask-institutional/types": "npm:^1.1.0"
     mock-socket: "npm:^9.2.1"
-  checksum: 652ffded926f5064e543e15e01992ec37a588783bc711a6f74404c1984ac5406fa83ab19187f00ae9b81a182cb46be08b0be388f583d68d6b45500969b5b2f46
+  checksum: 10/4743ccbb3a92a5b7ddccfd9f72741910bb93cc769023c8b9ee7944bb82f79938e45b10af5f7754b2898dc218c0e3874cb38aa628f96685fc69d956900723755d
   languageName: node
   linkType: hard
 
@@ -5444,16 +5444,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/obs-store@npm:^8.0.0, @metamask/obs-store@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "@metamask/obs-store@npm:8.1.0"
-  dependencies:
-    "@metamask/safe-event-emitter": "npm:^2.0.0"
-    through2: "npm:^2.0.3"
-  checksum: 92356067fa3517526d656f2f0bdfbc4d39f65e27fb30d84240cfc9c1aa9cd5d743498952df18ed8efbb8887b6cc1bc1fab37bde3fb0fc059539e0dfcc67ff86f
-  languageName: node
-  linkType: hard
-
 "@metamask/obs-store@npm:^9.0.0":
   version: 9.0.0
   resolution: "@metamask/obs-store@npm:9.0.0"
@@ -25320,14 +25310,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.27"
-    "@metamask-institutional/custody-keyring": "npm:^2.0.0"
-    "@metamask-institutional/extension": "npm:^0.3.24"
-    "@metamask-institutional/institutional-features": "npm:^1.3.2"
+    "@metamask-institutional/custody-controller": "npm:^0.2.30"
+    "@metamask-institutional/custody-keyring": "npm:^2.0.3"
+    "@metamask-institutional/extension": "npm:^0.3.27"
+    "@metamask-institutional/institutional-features": "npm:^1.3.5"
     "@metamask-institutional/portfolio-dashboard": "npm:^1.4.1"
     "@metamask-institutional/rpc-allowlist": "npm:^1.0.3"
-    "@metamask-institutional/sdk": "npm:^0.1.26"
-    "@metamask-institutional/transaction-update": "npm:^0.2.2"
+    "@metamask-institutional/sdk": "npm:^0.1.30"
+    "@metamask-institutional/transaction-update": "npm:^0.2.5"
     "@metamask/abi-utils": "npm:^2.0.2"
     "@metamask/accounts-controller": "npm:^11.0.0"
     "@metamask/address-book-controller": "npm:^3.1.7"

From 9184f58aeb6e9882c4bd7a35b76c67fcda78d34f Mon Sep 17 00:00:00 2001
From: jiexi <jiexiluan@gmail.com>
Date: Tue, 25 Jun 2024 12:09:15 -0700
Subject: [PATCH 077/236] V12 cherrypick: bump @metamask/queued-request
 controller to ^2.0.0 to fix confirmation popup focus in request queue
 (#25514)

Cherrypicks https://github.com/MetaMask/metamask-extension/pull/25497

Fixes confirmation notification not receiving focus when a request is
enqueued

No merge conflicts
---
 app/scripts/metamask-controller.js                     |  1 +
 package.json                                           |  2 +-
 .../dapp1-switch-dapp2-eth-request-accounts.spec.js    |  2 +-
 yarn.lock                                              | 10 +++++-----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 7a43f01fdcf1..aa165151f736 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -452,6 +452,7 @@ export default class MetamaskController extends EventEmitter {
       shouldRequestSwitchNetwork: ({ method }) =>
         methodsRequiringNetworkSwitch.includes(method),
       clearPendingConfirmations,
+      showApprovalRequest: opts.showUserConfirmation,
     });
 
     this.approvalController = new ApprovalController({
diff --git a/package.json b/package.json
index b1bd0fe251dd..75b51bccadbd 100644
--- a/package.json
+++ b/package.json
@@ -329,7 +329,7 @@
     "@metamask/post-message-stream": "^8.0.0",
     "@metamask/ppom-validator": "^0.30.0",
     "@metamask/providers": "^14.0.2",
-    "@metamask/queued-request-controller": "^1.0.0",
+    "@metamask/queued-request-controller": "^2.0.0",
     "@metamask/rate-limit-controller": "^5.0.1",
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
diff --git a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js
index 60690d4ab66b..e448c995e077 100644
--- a/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js
+++ b/test/e2e/tests/request-queuing/dapp1-switch-dapp2-eth-request-accounts.spec.js
@@ -67,7 +67,7 @@ describe('Request Queuing Dapp 1 Send Tx -> Dapp 2 Request Accounts Tx', functio
         assert.deepStrictEqual(accountsBeforeConnect, '');
 
         // Reject the pending confirmation from the first dapp
-        await switchToNotificationWindow(driver);
+        await switchToNotificationWindow(driver, 4);
         await driver.clickElement({ text: 'Reject', tag: 'button' });
 
         // Wait for switch confirmation to close then request accounts confirmation to show for the second dapp
diff --git a/yarn.lock b/yarn.lock
index d18a17c67c4a..030b52ea622a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6086,9 +6086,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/queued-request-controller@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@metamask/queued-request-controller@npm:1.0.0"
+"@metamask/queued-request-controller@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask/queued-request-controller@npm:2.0.0"
   dependencies:
     "@metamask/base-controller": "npm:^6.0.0"
     "@metamask/controller-utils": "npm:^11.0.0"
@@ -6099,7 +6099,7 @@ __metadata:
   peerDependencies:
     "@metamask/network-controller": ^19.0.0
     "@metamask/selected-network-controller": ^15.0.0
-  checksum: 10/84b5442035ef4843ad5c3effdb961c9725c07fa3caf37928c4315ffb4929160a1032b8e0f814061fa8487f499d147766f3cfdd4172c8a3941c2996b11628a46b
+  checksum: 10/b618fa05465a52e5b689d932d99b47552b5987a9141d58260966611f1057190132f14b1a2123c48399f218fc57c577e1c86375e8ee2b43871cdc597fbaeedb7a
   languageName: node
   linkType: hard
 
@@ -25092,7 +25092,7 @@ __metadata:
     "@metamask/post-message-stream": "npm:^8.0.0"
     "@metamask/ppom-validator": "npm:^0.30.0"
     "@metamask/providers": "npm:^14.0.2"
-    "@metamask/queued-request-controller": "npm:^1.0.0"
+    "@metamask/queued-request-controller": "npm:^2.0.0"
     "@metamask/rate-limit-controller": "npm:^5.0.1"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"

From d2aa2eb9a729c1b6295b483708f38ce1b62ed32f Mon Sep 17 00:00:00 2001
From: Antonio Regadas <antonio.regadas@consensys.net>
Date: Tue, 25 Jun 2024 15:49:43 +0100
Subject: [PATCH 078/236] v11.16.15

---
 CHANGELOG.md | 7 ++++++-
 package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee06afc67f84..2bc5d4e59f60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.15]
+### Changed
+- Updates MMI packages, support for a custodian has been removed ([#25502](https://github.com/MetaMask/metamask-extension/pull/25502))
+
 ## [11.16.14]
 ### Fixed
 - Fix bug preventing connection of Trezor hardware wallets on firefox ([#25487](https://github.com/MetaMask/metamask-extension/pull/25487))
@@ -4822,7 +4826,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.14...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.15...HEAD
+[11.16.15]: https://github.com/MetaMask/metamask-extension/compare/v11.16.14...v11.16.15
 [11.16.14]: https://github.com/MetaMask/metamask-extension/compare/v11.16.13...v11.16.14
 [11.16.13]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...v11.16.13
 [11.16.12]: https://github.com/MetaMask/metamask-extension/compare/v11.16.11...v11.16.12
diff --git a/package.json b/package.json
index da1073ed970a..adf526229c23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.14",
+  "version": "11.16.15",
   "private": true,
   "repository": {
     "type": "git",

From 12417ce200c5a5e32b20dee07289ef5e84bf0858 Mon Sep 17 00:00:00 2001
From: Antonio Regadas <antonio.regadas@consensys.net>
Date: Tue, 25 Jun 2024 15:54:52 +0100
Subject: [PATCH 079/236] chore: restores yarn lock from master

---
 yarn.lock | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6c2542e6f286..16e910a709b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3951,7 +3951,7 @@ __metadata:
     "@metamask-institutional/sdk": "npm:^0.1.30"
     "@metamask-institutional/types": "npm:^1.1.0"
     "@metamask/obs-store": "npm:^9.0.0"
-  checksum: 10/3d5ad6675d09f67bff924461b2d72f6c406a8cf86523119bcc8dea0f473501b8644f2dafd3babfcc4d2a0cbeb44d32b1a15dad701b481daac34c5eb4e5bcdd4b
+  checksum: 3d5ad6675d09f67bff924461b2d72f6c406a8cf86523119bcc8dea0f473501b8644f2dafd3babfcc4d2a0cbeb44d32b1a15dad701b481daac34c5eb4e5bcdd4b
   languageName: node
   linkType: hard
 
@@ -3967,7 +3967,7 @@ __metadata:
     "@metamask/obs-store": "npm:^9.0.0"
     crypto: "npm:^1.0.1"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 10/987beeeed67fb92a436eb1318f48ec2cc0ceb1ae944b7f5b2e492dcdc28a4298c5a8d25a520022ac52f87a411f7341961100be47a9626fbb1674aed349d98737
+  checksum: 987beeeed67fb92a436eb1318f48ec2cc0ceb1ae944b7f5b2e492dcdc28a4298c5a8d25a520022ac52f87a411f7341961100be47a9626fbb1674aed349d98737
   languageName: node
   linkType: hard
 
@@ -3985,7 +3985,7 @@ __metadata:
     jest-create-mock-instance: "npm:^2.0.0"
     jest-fetch-mock: "npm:3.0.3"
     lodash.clonedeep: "npm:^4.5.0"
-  checksum: 10/dc9eefe8045607cd415b9db4a8df833c9a523e9d06a3a0e49e4c6e85063924db1f117725a91c926f19ce26d0701fc175ea4ad38fb13a8a3b092434bcd7fd7882
+  checksum: dc9eefe8045607cd415b9db4a8df833c9a523e9d06a3a0e49e4c6e85063924db1f117725a91c926f19ce26d0701fc175ea4ad38fb13a8a3b092434bcd7fd7882
   languageName: node
   linkType: hard
 
@@ -3995,7 +3995,7 @@ __metadata:
   dependencies:
     "@metamask-institutional/custody-keyring": "npm:^2.0.3"
     "@metamask/obs-store": "npm:^9.0.0"
-  checksum: 10/1a154dbbfc71c9fee43d755d901423e3ea17ad149679225481fdc2d73ae95960e1805a792dbe660dd778703614ea5fd7390314bd7099c8ede510db1d23bc08ab
+  checksum: 1a154dbbfc71c9fee43d755d901423e3ea17ad149679225481fdc2d73ae95960e1805a792dbe660dd778703614ea5fd7390314bd7099c8ede510db1d23bc08ab
   languageName: node
   linkType: hard
 
@@ -4023,7 +4023,7 @@ __metadata:
     "@types/node": "npm:^20.11.17"
     bignumber.js: "npm:^9.1.1"
     jsonwebtoken: "npm:^9.0.0"
-  checksum: 10/3f36925fa9399a0ea06e2a64ea89accfb34f0a17581ab69652b4f325a948db10e88faebcca4f7c2d9f5f1f1c7f98bd8f970b7a489218dfd1be8cebc669a2f67e
+  checksum: 3f36925fa9399a0ea06e2a64ea89accfb34f0a17581ab69652b4f325a948db10e88faebcca4f7c2d9f5f1f1c7f98bd8f970b7a489218dfd1be8cebc669a2f67e
   languageName: node
   linkType: hard
 
@@ -4044,7 +4044,7 @@ __metadata:
     "@metamask-institutional/types": "npm:^1.1.0"
     "@metamask-institutional/websocket-client": "npm:^0.2.5"
     "@metamask/obs-store": "npm:^9.0.0"
-  checksum: 10/9dbcf7c38a03becf61ab013f78df225da1f6de12976f328e7809c0edda5ab9e1aeee2b4d5b9430c15d5dc9f7040fa703c560c58073d601110895388c1c15d7a8
+  checksum: 9dbcf7c38a03becf61ab013f78df225da1f6de12976f328e7809c0edda5ab9e1aeee2b4d5b9430c15d5dc9f7040fa703c560c58073d601110895388c1c15d7a8
   languageName: node
   linkType: hard
 
@@ -4063,7 +4063,7 @@ __metadata:
     "@metamask-institutional/sdk": "npm:^0.1.30"
     "@metamask-institutional/types": "npm:^1.1.0"
     mock-socket: "npm:^9.2.1"
-  checksum: 10/4743ccbb3a92a5b7ddccfd9f72741910bb93cc769023c8b9ee7944bb82f79938e45b10af5f7754b2898dc218c0e3874cb38aa628f96685fc69d956900723755d
+  checksum: 4743ccbb3a92a5b7ddccfd9f72741910bb93cc769023c8b9ee7944bb82f79938e45b10af5f7754b2898dc218c0e3874cb38aa628f96685fc69d956900723755d
   languageName: node
   linkType: hard
 
@@ -5444,6 +5444,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/obs-store@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "@metamask/obs-store@npm:8.1.0"
+  dependencies:
+    "@metamask/safe-event-emitter": "npm:^2.0.0"
+    through2: "npm:^2.0.3"
+  checksum: 92356067fa3517526d656f2f0bdfbc4d39f65e27fb30d84240cfc9c1aa9cd5d743498952df18ed8efbb8887b6cc1bc1fab37bde3fb0fc059539e0dfcc67ff86f
+  languageName: node
+  linkType: hard
+
 "@metamask/obs-store@npm:^9.0.0":
   version: 9.0.0
   resolution: "@metamask/obs-store@npm:9.0.0"

From e1ce504fd2bccca3ce6eae4f9b47792c47aeef66 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Tue, 25 Jun 2024 15:30:29 +0000
Subject: [PATCH 080/236] Update LavaMoat policies

---
 lavamoat/browserify/mmi/policy.json | 78 +++++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 5 deletions(-)

diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 85d10ae42994..d710d9df76dd 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -712,8 +712,25 @@
     "@metamask-institutional/custody-controller": {
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@metamask-institutional/custody-keyring": true,
-        "@metamask/obs-store": true
+        "@metamask-institutional/custody-controller>@metamask/obs-store": true,
+        "@metamask-institutional/custody-keyring": true
+      }
+    },
+    "@metamask-institutional/custody-controller>@metamask/obs-store": {
+      "packages": {
+        "@metamask-institutional/custody-controller>@metamask/obs-store>readable-stream": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask-institutional/custody-controller>@metamask/obs-store>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
       }
     },
     "@metamask-institutional/custody-keyring": {
@@ -725,9 +742,9 @@
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask-institutional/custody-keyring>@metamask-institutional/configuration-client": true,
+        "@metamask-institutional/custody-keyring>@metamask/obs-store": true,
         "@metamask-institutional/sdk": true,
         "@metamask-institutional/sdk>@metamask-institutional/types": true,
-        "@metamask/obs-store": true,
         "browserify>crypto-browserify": true,
         "gulp-sass>lodash.clonedeep": true,
         "webpack>events": true
@@ -739,6 +756,23 @@
         "fetch": true
       }
     },
+    "@metamask-institutional/custody-keyring>@metamask/obs-store": {
+      "packages": {
+        "@metamask-institutional/custody-keyring>@metamask/obs-store>readable-stream": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask-institutional/custody-keyring>@metamask/obs-store>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
+      }
+    },
     "@metamask-institutional/extension": {
       "globals": {
         "console.log": true
@@ -753,7 +787,24 @@
     "@metamask-institutional/institutional-features": {
       "packages": {
         "@metamask-institutional/custody-keyring": true,
-        "@metamask/obs-store": true
+        "@metamask-institutional/institutional-features>@metamask/obs-store": true
+      }
+    },
+    "@metamask-institutional/institutional-features>@metamask/obs-store": {
+      "packages": {
+        "@metamask-institutional/institutional-features>@metamask/obs-store>readable-stream": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask-institutional/institutional-features>@metamask/obs-store>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
       }
     },
     "@metamask-institutional/rpc-allowlist": {
@@ -786,7 +837,7 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@metamask-institutional/sdk": true,
         "@metamask-institutional/transaction-update>@metamask-institutional/websocket-client": true,
-        "@metamask/obs-store": true,
+        "@metamask-institutional/transaction-update>@metamask/obs-store": true,
         "webpack>events": true
       }
     },
@@ -801,6 +852,23 @@
         "webpack>events": true
       }
     },
+    "@metamask-institutional/transaction-update>@metamask/obs-store": {
+      "packages": {
+        "@metamask-institutional/transaction-update>@metamask/obs-store>readable-stream": true,
+        "@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask-institutional/transaction-update>@metamask/obs-store>readable-stream": {
+      "packages": {
+        "browserify>browser-resolve": true,
+        "browserify>buffer": true,
+        "browserify>process": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream>util-deprecate": true,
+        "webpack>events": true
+      }
+    },
     "@metamask/abi-utils": {
       "packages": {
         "@metamask/utils": true,

From 35f5a7127846e0961ba0f1e21552bb5ba26b11a2 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 26 Jun 2024 11:28:50 -0230
Subject: [PATCH 081/236] fix (cherry-pick): 25457 firefox extension not work
 for trezor connect (#25487) (#25494)

Cherry-picks f90eed6 / #25457 into Version-v11.16.15

Co-authored-by: Xiaoming Wang <dawnseeker8@gmail.com>
---
 .../connect-hardware/select-hardware.js               | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 338ececb5e91..7317fb45b025 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -56,7 +56,16 @@ export default class SelectHardware extends Component {
 
   connect = async () => {
     if (this.state.selectedDevice) {
-      if (this.state.selectedDevice === 'trezor') {
+      // Not all browsers have usb support. In particular, Firefox does
+      // not support usb. More information on that can be found here:
+      // https://mozilla.github.io/standards-positions/#webusb
+      //
+      // The below `&& window.navigator.usb` condition ensures that we
+      // only attempt to connect Trezor via usb if we are in a browser
+      // that supports usb. If not, the connection of the hardware wallet
+      // to the browser will be handled by the Trezor connect screen. In
+      // the case of Firefox, this will depend on the Trezor bridge software
+      if (this.state.selectedDevice === 'trezor' && window.navigator.usb) {
         this.setState({ trezorRequestDevicePending: true });
         try {
           await window.navigator.usb.requestDevice({

From a3ecbf29d8a161331db977c6b6cf5f33f2bb79ce Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 26 Jun 2024 11:31:11 -0230
Subject: [PATCH 082/236] Fix changelog for 11.16.14 and 11.16.15

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bc5d4e59f60..895d1e731fd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,10 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updates MMI packages, support for a custodian has been removed ([#25502](https://github.com/MetaMask/metamask-extension/pull/25502))
 
-## [11.16.14]
 ### Fixed
 - Fix bug preventing connection of Trezor hardware wallets on firefox ([#25487](https://github.com/MetaMask/metamask-extension/pull/25487))
 
+## [11.16.14]
+### Fixed
+- Fix bug that could result in failure of some swap transactions ([#25488](https://github.com/MetaMask/metamask-extension/pull/25488))
+
 ## [11.16.13]
 ### Changed
 - Update Blockaid feature for latest security protections ([#25442](https://github.com/MetaMask/metamask-extension/pull/25442))

From f53872328558546d15644ee67041f9524105930c Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Wed, 26 Jun 2024 15:34:22 -0400
Subject: [PATCH 083/236] fix (cherry-pick for v12.0.0): disable STX for
 swap+send approvals (#25512)
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**

Cherry picks #25510

<!--
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/25512?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/scripts/lib/transaction/smart-transactions.test.ts | 7 +++++++
 app/scripts/lib/transaction/smart-transactions.ts      | 8 ++++++--
 ui/ducks/send/send.js                                  | 1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/scripts/lib/transaction/smart-transactions.test.ts b/app/scripts/lib/transaction/smart-transactions.test.ts
index 04c029c3ef8b..eed52a909f67 100644
--- a/app/scripts/lib/transaction/smart-transactions.test.ts
+++ b/app/scripts/lib/transaction/smart-transactions.test.ts
@@ -141,6 +141,13 @@ describe('submitSmartTransactionHook', () => {
     expect(result).toEqual({ transactionHash: undefined });
   });
 
+  it('falls back to regular transaction submit if the transaction type is "swapApproval"', async () => {
+    const request: SubmitSmartTransactionRequestMocked = createRequest();
+    request.transactionMeta.type = TransactionType.swapApproval;
+    const result = await submitSmartTransactionHook(request);
+    expect(result).toEqual({ transactionHash: undefined });
+  });
+
   it('falls back to regular transaction submit if /getFees throws an error', async () => {
     const request: SubmitSmartTransactionRequestMocked = createRequest();
     jest
diff --git a/app/scripts/lib/transaction/smart-transactions.ts b/app/scripts/lib/transaction/smart-transactions.ts
index 97e37965d6ea..21a95e94494d 100644
--- a/app/scripts/lib/transaction/smart-transactions.ts
+++ b/app/scripts/lib/transaction/smart-transactions.ts
@@ -121,8 +121,12 @@ class SmartTransactionHook {
   }
 
   async submit() {
-    const isUnsupportedTransactionTypeForSmartTransaction =
-      this.#transactionMeta?.type === TransactionType.swapAndSend;
+    const isUnsupportedTransactionTypeForSmartTransaction = this
+      .#transactionMeta?.type
+      ? [TransactionType.swapAndSend, TransactionType.swapApproval].includes(
+          this.#transactionMeta.type,
+        )
+      : false;
 
     // Will cause TransactionController to publish to the RPC provider as normal.
     const useRegularTransactionSubmit = { transactionHash: undefined };
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 39e5974c8060..08b6aba836ca 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -3017,6 +3017,7 @@ export function signTransaction(history) {
             { ...bestQuote.approvalNeeded, amount: '0x0' },
             {
               requireApproval: false,
+              // TODO: create new type for swap+send approvals; works as stopgap bc swaps doesn't use this type for STXs in `submitSmartTransactionHook` (via `TransactionController`)
               type: TransactionType.swapApproval,
               swaps: {
                 hasApproveTx: true,

From e89191db62d550ba9da3be63ece12320466939a7 Mon Sep 17 00:00:00 2001
From: Harika Jetpoluru <153644847+hjetpoluru@users.noreply.github.com>
Date: Thu, 27 Jun 2024 02:54:30 -0400
Subject: [PATCH 084/236] fix: flaky test `vault decrypt` due to SRP hold time
 (#25328) (#25530)

Cherry-pick PR for flaky test #25328

Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
---
 test/e2e/helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index f1769d77593a..6d3d856a9503 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -638,7 +638,7 @@ const tapAndHoldToRevealSRP = async (driver) => {
       text: tEn('holdToRevealSRP'),
       tag: 'span',
     },
-    2000,
+    3000,
   );
 };
 

From 02f7070b57d26244e4b752cf86d038228cc23e1c Mon Sep 17 00:00:00 2001
From: Harika Jetpoluru <153644847+hjetpoluru@users.noreply.github.com>
Date: Thu, 27 Jun 2024 03:07:36 -0400
Subject: [PATCH 085/236] chore: Cherry pick flaky test full screen (#25532)

Cherry-pick for flaky test #25295

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

Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
---
 test/e2e/webdriver/driver.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
index ab4bc6884273..be9c148e3a31 100644
--- a/test/e2e/webdriver/driver.js
+++ b/test/e2e/webdriver/driver.js
@@ -852,11 +852,21 @@ class Driver {
    * Retrieves the title of the window tab with the given handle ID.
    *
    * @param {int} handlerId - unique ID for the tab whose title is needed.
-   * @returns {Promise<string>} promise resolving to the tab title after command completion
+   * @param {number} retries - Number of times to retry fetching the title if not immediately available.
+   * @param {number} interval - Time in milliseconds to wait between retries.
+   * @returns {Promise<string>} Promise resolving to the tab title after command completion.
+   * @throws {Error} Throws an error if the window title does not load within the specified retries.
    */
-  async getWindowTitleByHandlerId(handlerId) {
+  async getWindowTitleByHandlerId(handlerId, retries = 5, interval = 1000) {
     await this.driver.switchTo().window(handlerId);
-    return await this.driver.getTitle();
+    for (let attempt = 1; attempt <= retries; attempt++) {
+      const title = await this.driver.getTitle();
+      if (title) {
+        return title;
+      }
+      await new Promise((resolve) => setTimeout(resolve, interval));
+    }
+    throw new Error('Window title did not load within the specified retries');
   }
 
   /**

From f5631fba1e83899f3e8d8a1bf2b1fc0de9fb87c6 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 27 Jun 2024 10:26:47 -0230
Subject: [PATCH 086/236] Patch selected network controller for v12.0.0
 (#25554)

This patch reapplies the changes previously patched on v11.16.8:
https://github.com/MetaMask/metamask-extension/pull/25127

This patch needed to be updated for v13 of the selected network
controller. I made a mistake in merge conflict resolution and am instead
updating these packages in this separate commit.

The core branch that was used to generate the patch can be seen here:
https://github.com/MetaMask/core/pull/new/patch-selected-network-controller-13.0.0-setNetworkClient-guard

~~This patch reapplies the changes previously patched on v11.16.7 and
v11.16.8:
https://github.com/MetaMask/metamask-extension/pull/25046
https://github.com/MetaMask/metamask-extension/pull/25127

These patches needed to be updated for v13 of the selected network
controller. I made a mistake in merge conflict resolution and am instead
updating these packages in this separate commit.

The core branch that was used to generate the patch can be seen here:
https://github.com/MetaMask/core/pull/new/patch-selected-network-controller-13.0.0-setNetworkClient-guard~~
---
 ...ork-controller-npm-13.0.0-b0f6db473a.patch | 1469 +++++++++++++++++
 package.json                                  |    2 +-
 yarn.lock                                     |   21 +-
 3 files changed, 1489 insertions(+), 3 deletions(-)
 create mode 100644 .yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch

diff --git a/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch b/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch
new file mode 100644
index 000000000000..4fddeda9cc57
--- /dev/null
+++ b/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch
@@ -0,0 +1,1469 @@
+diff --git a/dist/SelectedNetworkController.js b/dist/SelectedNetworkController.js
+index ca967cd382ba810dadd7ffa914d5a8aceb6f156a..4b4103f6dd6c13e72956daa9557d623ec2c832b6 100644
+--- a/dist/SelectedNetworkController.js
++++ b/dist/SelectedNetworkController.js
+@@ -4,12 +4,12 @@
+ 
+ 
+ 
+-var _chunkOGUVGN6Rjs = require('./chunk-OGUVGN6R.js');
++var _chunkCECZWJ42js = require('./chunk-CECZWJ42.js');
+ 
+ 
+ 
+ 
+ 
+ 
+-exports.METAMASK_DOMAIN = _chunkOGUVGN6Rjs.METAMASK_DOMAIN; exports.SelectedNetworkController = _chunkOGUVGN6Rjs.SelectedNetworkController; exports.SelectedNetworkControllerActionTypes = _chunkOGUVGN6Rjs.SelectedNetworkControllerActionTypes; exports.SelectedNetworkControllerEventTypes = _chunkOGUVGN6Rjs.SelectedNetworkControllerEventTypes; exports.controllerName = _chunkOGUVGN6Rjs.controllerName;
++exports.METAMASK_DOMAIN = _chunkCECZWJ42js.METAMASK_DOMAIN; exports.SelectedNetworkController = _chunkCECZWJ42js.SelectedNetworkController; exports.SelectedNetworkControllerActionTypes = _chunkCECZWJ42js.SelectedNetworkControllerActionTypes; exports.SelectedNetworkControllerEventTypes = _chunkCECZWJ42js.SelectedNetworkControllerEventTypes; exports.controllerName = _chunkCECZWJ42js.controllerName;
+ //# sourceMappingURL=SelectedNetworkController.js.map
+\ No newline at end of file
+diff --git a/dist/SelectedNetworkController.mjs b/dist/SelectedNetworkController.mjs
+index 5228bbe7acb3da6abb826f00670a1034c51a0514..d4b1f0cf8d8e6123df56be0b766e285968f8587c 100644
+--- a/dist/SelectedNetworkController.mjs
++++ b/dist/SelectedNetworkController.mjs
+@@ -4,7 +4,7 @@ import {
+   SelectedNetworkControllerActionTypes,
+   SelectedNetworkControllerEventTypes,
+   controllerName
+-} from "./chunk-S4D42VCM.mjs";
++} from "./chunk-7DSTEJNI.mjs";
+ export {
+   METAMASK_DOMAIN,
+   SelectedNetworkController,
+diff --git a/dist/SelectedNetworkMiddleware.js b/dist/SelectedNetworkMiddleware.js
+index 919f26ef57e8c6af5c63d1e0c8e85c43ec241e4a..0b9e434874a1ead6b596fa933597145ee40362d2 100644
+--- a/dist/SelectedNetworkMiddleware.js
++++ b/dist/SelectedNetworkMiddleware.js
+@@ -1,8 +1,8 @@
+ "use strict";Object.defineProperty(exports, "__esModule", {value: true});
+ 
+-var _chunk6W2ETVOHjs = require('./chunk-6W2ETVOH.js');
+-require('./chunk-OGUVGN6R.js');
++var _chunkANSSZMDIjs = require('./chunk-ANSSZMDI.js');
++require('./chunk-CECZWJ42.js');
+ 
+ 
+-exports.createSelectedNetworkMiddleware = _chunk6W2ETVOHjs.createSelectedNetworkMiddleware;
++exports.createSelectedNetworkMiddleware = _chunkANSSZMDIjs.createSelectedNetworkMiddleware;
+ //# sourceMappingURL=SelectedNetworkMiddleware.js.map
+\ No newline at end of file
+diff --git a/dist/SelectedNetworkMiddleware.mjs b/dist/SelectedNetworkMiddleware.mjs
+index a9031b4aa2589009c2f23d03f1d23a01044c4178..c3302c19f429473963d663e87340b33d9b2caf98 100644
+--- a/dist/SelectedNetworkMiddleware.mjs
++++ b/dist/SelectedNetworkMiddleware.mjs
+@@ -1,7 +1,7 @@
+ import {
+   createSelectedNetworkMiddleware
+-} from "./chunk-ZY7ETPVE.mjs";
+-import "./chunk-S4D42VCM.mjs";
++} from "./chunk-HFN7TKJS.mjs";
++import "./chunk-7DSTEJNI.mjs";
+ export {
+   createSelectedNetworkMiddleware
+ };
+diff --git a/dist/chunk-6W2ETVOH.js b/dist/chunk-6W2ETVOH.js
+deleted file mode 100644
+index 9714addd232767e296dd378a5cc0d57cafc9b882..0000000000000000000000000000000000000000
+--- a/dist/chunk-6W2ETVOH.js
++++ /dev/null
+@@ -1,23 +0,0 @@
+-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+-
+-var _chunkOGUVGN6Rjs = require('./chunk-OGUVGN6R.js');
+-
+-// src/SelectedNetworkMiddleware.ts
+-var createSelectedNetworkMiddleware = (messenger) => {
+-  const getNetworkClientIdForDomain = (origin) => messenger.call(
+-    _chunkOGUVGN6Rjs.SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
+-    origin
+-  );
+-  return (req, _, next) => {
+-    if (!req.origin) {
+-      throw new Error("Request object is lacking an 'origin'");
+-    }
+-    req.networkClientId = getNetworkClientIdForDomain(req.origin);
+-    return next();
+-  };
+-};
+-
+-
+-
+-exports.createSelectedNetworkMiddleware = createSelectedNetworkMiddleware;
+-//# sourceMappingURL=chunk-6W2ETVOH.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-6W2ETVOH.js.map b/dist/chunk-6W2ETVOH.js.map
+deleted file mode 100644
+index 9fe4c1fd6e9b12bfd9091833618334f2c931098f..0000000000000000000000000000000000000000
+--- a/dist/chunk-6W2ETVOH.js.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/SelectedNetworkMiddleware.ts"],"names":[],"mappings":";;;;;AAYO,IAAM,kCAAkC,CAC7C,cAC2C;AAC3C,QAAM,8BAA8B,CAAC,WACnC,UAAU;AAAA,IACR,qCAAqC;AAAA,IACrC;AAAA,EACF;AAEF,SAAO,CAAC,KAA8C,GAAG,SAAS;AAChE,QAAI,CAAC,IAAI,QAAQ;AACf,YAAM,IAAI,MAAM,uCAAuC;AAAA,IACzD;AAEA,QAAI,kBAAkB,4BAA4B,IAAI,MAAM;AAC5D,WAAO,KAAK;AAAA,EACd;AACF","sourcesContent":["import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';\n\nimport type { SelectedNetworkControllerMessenger } from './SelectedNetworkController';\nimport { SelectedNetworkControllerActionTypes } from './SelectedNetworkController';\n\nexport type SelectedNetworkMiddlewareJsonRpcRequest = JsonRpcRequest & {\n  networkClientId?: NetworkClientId;\n  origin?: string;\n};\n\nexport const createSelectedNetworkMiddleware = (\n  messenger: SelectedNetworkControllerMessenger,\n): JsonRpcMiddleware<JsonRpcParams, Json> => {\n  const getNetworkClientIdForDomain = (origin: string) =>\n    messenger.call(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      origin,\n    );\n\n  return (req: SelectedNetworkMiddlewareJsonRpcRequest, _, next) => {\n    if (!req.origin) {\n      throw new Error(\"Request object is lacking an 'origin'\");\n    }\n\n    req.networkClientId = getNetworkClientIdForDomain(req.origin);\n    return next();\n  };\n};\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-7DSTEJNI.mjs b/dist/chunk-7DSTEJNI.mjs
+new file mode 100644
+index 0000000000000000000000000000000000000000..1902ab28e3c37d563704840e31fdbc885db5354c
+--- /dev/null
++++ b/dist/chunk-7DSTEJNI.mjs
+@@ -0,0 +1,284 @@
++var __accessCheck = (obj, member, msg) => {
++  if (!member.has(obj))
++    throw TypeError("Cannot " + msg);
++};
++var __privateGet = (obj, member, getter) => {
++  __accessCheck(obj, member, "read from private field");
++  return getter ? getter.call(obj) : member.get(obj);
++};
++var __privateAdd = (obj, member, value) => {
++  if (member.has(obj))
++    throw TypeError("Cannot add the same private member more than once");
++  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
++};
++var __privateSet = (obj, member, value, setter) => {
++  __accessCheck(obj, member, "write to private field");
++  setter ? setter.call(obj, value) : member.set(obj, value);
++  return value;
++};
++var __privateMethod = (obj, member, method) => {
++  __accessCheck(obj, member, "access private method");
++  return method;
++};
++
++// src/SelectedNetworkController.ts
++import { BaseController } from "@metamask/base-controller";
++import { createEventEmitterProxy } from "@metamask/swappable-obj-proxy";
++var controllerName = "SelectedNetworkController";
++var stateMetadata = {
++  domains: { persist: true, anonymous: false }
++};
++var getDefaultState = () => ({ domains: {} });
++var snapsPrefixes = ["npm:", "local:"];
++var METAMASK_DOMAIN = "metamask";
++var SelectedNetworkControllerActionTypes = {
++  getState: `${controllerName}:getState`,
++  getNetworkClientIdForDomain: `${controllerName}:getNetworkClientIdForDomain`,
++  setNetworkClientIdForDomain: `${controllerName}:setNetworkClientIdForDomain`
++};
++var SelectedNetworkControllerEventTypes = {
++  stateChange: `${controllerName}:stateChange`
++};
++var _domainProxyMap, _useRequestQueuePreference, _registerMessageHandlers, registerMessageHandlers_fn, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn, _domainHasPermissions, domainHasPermissions_fn, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn;
++var SelectedNetworkController = class extends BaseController {
++  /**
++   * Construct a SelectedNetworkController controller.
++   *
++   * @param options - The controller options.
++   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.
++   * @param options.state - The controllers initial state.
++   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.
++   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.
++   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.
++   */
++  constructor({
++    messenger,
++    state = getDefaultState(),
++    useRequestQueuePreference,
++    onPreferencesStateChange,
++    domainProxyMap
++  }) {
++    super({
++      name: controllerName,
++      metadata: stateMetadata,
++      messenger,
++      state
++    });
++    __privateAdd(this, _registerMessageHandlers);
++    __privateAdd(this, _setNetworkClientIdForDomain);
++    /**
++     * This method is used when a domain is removed from the PermissionsController.
++     * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.
++     *
++     * @param domain - The domain for which to unset the network client ID.
++     */
++    __privateAdd(this, _unsetNetworkClientIdForDomain);
++    __privateAdd(this, _domainHasPermissions);
++    // Loop through all domains and for those with permissions it points that domain's proxy
++    // to an unproxied instance of the globally selected network client.
++    // NOT the NetworkController's proxy of the globally selected networkClient
++    __privateAdd(this, _resetAllPermissionedDomains);
++    __privateAdd(this, _domainProxyMap, void 0);
++    __privateAdd(this, _useRequestQueuePreference, void 0);
++    __privateSet(this, _useRequestQueuePreference, useRequestQueuePreference);
++    __privateSet(this, _domainProxyMap, domainProxyMap);
++    __privateMethod(this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
++    this.messagingSystem.call("PermissionController:getSubjectNames").filter((domain) => this.state.domains[domain] === void 0).forEach(
++      (domain) => this.setNetworkClientIdForDomain(
++        domain,
++        this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
++      )
++    );
++    this.messagingSystem.subscribe(
++      "PermissionController:stateChange",
++      (_, patches) => {
++        patches.forEach(({ op, path }) => {
++          const isChangingSubject = path[0] === "subjects" && path[1] !== void 0;
++          if (isChangingSubject && typeof path[1] === "string") {
++            const domain = path[1];
++            if (op === "add" && this.state.domains[domain] === void 0) {
++              this.setNetworkClientIdForDomain(
++                domain,
++                this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
++              );
++            } else if (op === "remove" && this.state.domains[domain] !== void 0) {
++              __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
++            }
++          }
++        });
++      }
++    );
++    this.messagingSystem.subscribe(
++      "NetworkController:stateChange",
++      ({ selectedNetworkClientId }, patches) => {
++        patches.forEach(({ op, path }) => {
++          if (op === "remove" && path[0] === "networkConfigurations") {
++            const removedNetworkClientId = path[1];
++            Object.entries(this.state.domains).forEach(
++              ([domain, networkClientIdForDomain]) => {
++                if (networkClientIdForDomain === removedNetworkClientId) {
++                  this.setNetworkClientIdForDomain(
++                    domain,
++                    selectedNetworkClientId
++                  );
++                }
++              }
++            );
++          }
++        });
++      }
++    );
++    onPreferencesStateChange(({ useRequestQueue }) => {
++      if (__privateGet(this, _useRequestQueuePreference) !== useRequestQueue) {
++        if (!useRequestQueue) {
++          Object.keys(this.state.domains).forEach((domain) => {
++            __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
++          });
++        } else {
++          __privateMethod(this, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn).call(this);
++        }
++        __privateSet(this, _useRequestQueuePreference, useRequestQueue);
++      }
++    });
++  }
++  setNetworkClientIdForDomain(domain, networkClientId) {
++    if (!__privateGet(this, _useRequestQueuePreference)) {
++      return;
++    }
++    if (domain === METAMASK_DOMAIN) {
++      throw new Error(
++        `NetworkClientId for domain "${METAMASK_DOMAIN}" cannot be set on the SelectedNetworkController`
++      );
++    }
++    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
++      return;
++    }
++    if (!__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
++      throw new Error(
++        "NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions"
++      );
++    }
++    __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, networkClientId);
++  }
++  getNetworkClientIdForDomain(domain) {
++    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } = this.messagingSystem.call("NetworkController:getState");
++    if (!__privateGet(this, _useRequestQueuePreference)) {
++      return metamaskSelectedNetworkClientId;
++    }
++    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;
++  }
++  /**
++   * Accesses the provider and block tracker for the currently selected network.
++   *
++   * @param domain - the domain for the provider
++   * @returns The proxy and block tracker proxies.
++   */
++  getProviderAndBlockTracker(domain) {
++    if (domain === METAMASK_DOMAIN || snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
++      const networkClient = this.messagingSystem.call(
++        "NetworkController:getSelectedNetworkClient"
++      );
++      if (networkClient === void 0) {
++        throw new Error("Selected network not initialized");
++      }
++      return networkClient;
++    }
++    let networkProxy = __privateGet(this, _domainProxyMap).get(domain);
++    if (networkProxy === void 0) {
++      let networkClient;
++      if (__privateGet(this, _useRequestQueuePreference) && __privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
++        const networkClientId = this.getNetworkClientIdForDomain(domain);
++        networkClient = this.messagingSystem.call(
++          "NetworkController:getNetworkClientById",
++          networkClientId
++        );
++      } else {
++        networkClient = this.messagingSystem.call(
++          "NetworkController:getSelectedNetworkClient"
++        );
++        if (networkClient === void 0) {
++          throw new Error("Selected network not initialized");
++        }
++      }
++      networkProxy = {
++        provider: createEventEmitterProxy(networkClient.provider),
++        blockTracker: createEventEmitterProxy(networkClient.blockTracker, {
++          eventFilter: "skipInternal"
++        })
++      };
++      __privateGet(this, _domainProxyMap).set(domain, networkProxy);
++    }
++    return networkProxy;
++  }
++};
++_domainProxyMap = new WeakMap();
++_useRequestQueuePreference = new WeakMap();
++_registerMessageHandlers = new WeakSet();
++registerMessageHandlers_fn = function() {
++  this.messagingSystem.registerActionHandler(
++    SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
++    this.getNetworkClientIdForDomain.bind(this)
++  );
++  this.messagingSystem.registerActionHandler(
++    SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,
++    this.setNetworkClientIdForDomain.bind(this)
++  );
++};
++_setNetworkClientIdForDomain = new WeakSet();
++setNetworkClientIdForDomain_fn = function(domain, networkClientId) {
++  const networkClient = this.messagingSystem.call(
++    "NetworkController:getNetworkClientById",
++    networkClientId
++  );
++  const networkProxy = this.getProviderAndBlockTracker(domain);
++  networkProxy.provider.setTarget(networkClient.provider);
++  networkProxy.blockTracker.setTarget(networkClient.blockTracker);
++  this.update((state) => {
++    state.domains[domain] = networkClientId;
++  });
++};
++_unsetNetworkClientIdForDomain = new WeakSet();
++unsetNetworkClientIdForDomain_fn = function(domain) {
++  const globallySelectedNetworkClient = this.messagingSystem.call(
++    "NetworkController:getSelectedNetworkClient"
++  );
++  const networkProxy = __privateGet(this, _domainProxyMap).get(domain);
++  if (networkProxy && globallySelectedNetworkClient) {
++    networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);
++    networkProxy.blockTracker.setTarget(
++      globallySelectedNetworkClient.blockTracker
++    );
++  } else if (networkProxy) {
++    __privateGet(this, _domainProxyMap).delete(domain);
++  }
++  this.update((state) => {
++    delete state.domains[domain];
++  });
++};
++_domainHasPermissions = new WeakSet();
++domainHasPermissions_fn = function(domain) {
++  return this.messagingSystem.call(
++    "PermissionController:hasPermissions",
++    domain
++  );
++};
++_resetAllPermissionedDomains = new WeakSet();
++resetAllPermissionedDomains_fn = function() {
++  __privateGet(this, _domainProxyMap).forEach((_, domain) => {
++    const { selectedNetworkClientId } = this.messagingSystem.call(
++      "NetworkController:getState"
++    );
++    if (__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
++      __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, selectedNetworkClientId);
++    }
++  });
++};
++
++export {
++  controllerName,
++  METAMASK_DOMAIN,
++  SelectedNetworkControllerActionTypes,
++  SelectedNetworkControllerEventTypes,
++  SelectedNetworkController
++};
++//# sourceMappingURL=chunk-7DSTEJNI.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-7DSTEJNI.mjs.map b/dist/chunk-7DSTEJNI.mjs.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..33fde9b65d7c89592b3754333e6c1f62a0d90f63
+--- /dev/null
++++ b/dist/chunk-7DSTEJNI.mjs.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/SelectedNetworkController.ts"],"sourcesContent":["import type { RestrictedControllerMessenger } from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  BlockTrackerProxy,\n  NetworkClientId,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetSelectedNetworkClientAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerStateChangeEvent,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport type {\n  PermissionControllerStateChange,\n  GetSubjects as PermissionControllerGetSubjectsAction,\n  HasPermissions as PermissionControllerHasPermissions,\n} from '@metamask/permission-controller';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { Patch } from 'immer';\n\nexport const controllerName = 'SelectedNetworkController';\n\nconst stateMetadata = {\n  domains: { persist: true, anonymous: false },\n};\n\nconst getDefaultState = () => ({ domains: {} });\n\n// npm and local are currently the only valid prefixes for snap domains\n// TODO: eventually we maybe want to pull this in from snaps-utils to ensure it stays in sync\n// For now it seems like overkill to add a dependency for this one constant\n// https://github.com/MetaMask/snaps/blob/2beee7803bfe9e540788a3558b546b9f55dc3cb4/packages/snaps-utils/src/types.ts#L120\nconst snapsPrefixes = ['npm:', 'local:'] as const;\n\nexport type Domain = string;\n\nexport const METAMASK_DOMAIN = 'metamask' as const;\n\nexport const SelectedNetworkControllerActionTypes = {\n  getState: `${controllerName}:getState` as const,\n  getNetworkClientIdForDomain:\n    `${controllerName}:getNetworkClientIdForDomain` as const,\n  setNetworkClientIdForDomain:\n    `${controllerName}:setNetworkClientIdForDomain` as const,\n};\n\nexport const SelectedNetworkControllerEventTypes = {\n  stateChange: `${controllerName}:stateChange` as const,\n};\n\nexport type SelectedNetworkControllerState = {\n  domains: Record<Domain, NetworkClientId>;\n};\n\nexport type SelectedNetworkControllerStateChangeEvent = {\n  type: typeof SelectedNetworkControllerEventTypes.stateChange;\n  payload: [SelectedNetworkControllerState, Patch[]];\n};\n\nexport type SelectedNetworkControllerGetSelectedNetworkStateAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getState;\n  handler: () => SelectedNetworkControllerState;\n};\n\nexport type SelectedNetworkControllerGetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain;\n  handler: SelectedNetworkController['getNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerSetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain;\n  handler: SelectedNetworkController['setNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerActions =\n  | SelectedNetworkControllerGetSelectedNetworkStateAction\n  | SelectedNetworkControllerGetNetworkClientIdForDomainAction\n  | SelectedNetworkControllerSetNetworkClientIdForDomainAction;\n\nexport type AllowedActions =\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetStateAction\n  | PermissionControllerHasPermissions\n  | PermissionControllerGetSubjectsAction;\n\nexport type SelectedNetworkControllerEvents =\n  SelectedNetworkControllerStateChangeEvent;\n\nexport type AllowedEvents =\n  | NetworkControllerStateChangeEvent\n  | PermissionControllerStateChange;\n\nexport type SelectedNetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  SelectedNetworkControllerActions | AllowedActions,\n  SelectedNetworkControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n\nexport type SelectedNetworkControllerOptions = {\n  state?: SelectedNetworkControllerState;\n  messenger: SelectedNetworkControllerMessenger;\n  useRequestQueuePreference: boolean;\n  onPreferencesStateChange: (\n    listener: (preferencesState: { useRequestQueue: boolean }) => void,\n  ) => void;\n  domainProxyMap: Map<Domain, NetworkProxy>;\n};\n\nexport type NetworkProxy = {\n  provider: ProviderProxy;\n  blockTracker: BlockTrackerProxy;\n};\n\n/**\n * Controller for getting and setting the network for a particular domain.\n */\nexport class SelectedNetworkController extends BaseController<\n  typeof controllerName,\n  SelectedNetworkControllerState,\n  SelectedNetworkControllerMessenger\n> {\n  #domainProxyMap: Map<Domain, NetworkProxy>;\n\n  #useRequestQueuePreference: boolean;\n\n  /**\n   * Construct a SelectedNetworkController controller.\n   *\n   * @param options - The controller options.\n   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.\n   * @param options.state - The controllers initial state.\n   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.\n   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.\n   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.\n   */\n  constructor({\n    messenger,\n    state = getDefaultState(),\n    useRequestQueuePreference,\n    onPreferencesStateChange,\n    domainProxyMap,\n  }: SelectedNetworkControllerOptions) {\n    super({\n      name: controllerName,\n      metadata: stateMetadata,\n      messenger,\n      state,\n    });\n    this.#useRequestQueuePreference = useRequestQueuePreference;\n    this.#domainProxyMap = domainProxyMap;\n    this.#registerMessageHandlers();\n\n    // this is fetching all the dapp permissions from the PermissionsController and looking for any domains that are not in domains state in this controller. Then we take any missing domains and add them to state here, setting it with the globally selected networkClientId (fetched from the NetworkController)\n    this.messagingSystem\n      .call('PermissionController:getSubjectNames')\n      .filter((domain) => this.state.domains[domain] === undefined)\n      .forEach((domain) =>\n        this.setNetworkClientIdForDomain(\n          domain,\n          this.messagingSystem.call('NetworkController:getState')\n            .selectedNetworkClientId,\n        ),\n      );\n\n    this.messagingSystem.subscribe(\n      'PermissionController:stateChange',\n      (_, patches) => {\n        patches.forEach(({ op, path }) => {\n          const isChangingSubject =\n            path[0] === 'subjects' && path[1] !== undefined;\n          if (isChangingSubject && typeof path[1] === 'string') {\n            const domain = path[1];\n            if (op === 'add' && this.state.domains[domain] === undefined) {\n              this.setNetworkClientIdForDomain(\n                domain,\n                this.messagingSystem.call('NetworkController:getState')\n                  .selectedNetworkClientId,\n              );\n            } else if (\n              op === 'remove' &&\n              this.state.domains[domain] !== undefined\n            ) {\n              this.#unsetNetworkClientIdForDomain(domain);\n            }\n          }\n        });\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'NetworkController:stateChange',\n      ({ selectedNetworkClientId }, patches) => {\n        patches.forEach(({ op, path }) => {\n          // if a network is removed, update the networkClientId for all domains that were using it to the selected network\n          if (op === 'remove' && path[0] === 'networkConfigurations') {\n            const removedNetworkClientId = path[1] as NetworkClientId;\n            Object.entries(this.state.domains).forEach(\n              ([domain, networkClientIdForDomain]) => {\n                if (networkClientIdForDomain === removedNetworkClientId) {\n                  this.setNetworkClientIdForDomain(\n                    domain,\n                    selectedNetworkClientId,\n                  );\n                }\n              },\n            );\n          }\n        });\n      },\n    );\n\n    onPreferencesStateChange(({ useRequestQueue }) => {\n      if (this.#useRequestQueuePreference !== useRequestQueue) {\n        if (!useRequestQueue) {\n          // Loop through all domains and points each domain's proxy\n          // to the NetworkController's own proxy of the globally selected networkClient\n          Object.keys(this.state.domains).forEach((domain) => {\n            this.#unsetNetworkClientIdForDomain(domain);\n          });\n        } else {\n          this.#resetAllPermissionedDomains();\n        }\n        this.#useRequestQueuePreference = useRequestQueue;\n      }\n    });\n  }\n\n  #registerMessageHandlers(): void {\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      this.getNetworkClientIdForDomain.bind(this),\n    );\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,\n      this.setNetworkClientIdForDomain.bind(this),\n    );\n  }\n\n  #setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    const networkClient = this.messagingSystem.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    const networkProxy = this.getProviderAndBlockTracker(domain);\n    networkProxy.provider.setTarget(networkClient.provider);\n    networkProxy.blockTracker.setTarget(networkClient.blockTracker);\n\n    this.update((state) => {\n      state.domains[domain] = networkClientId;\n    });\n  }\n\n  /**\n   * This method is used when a domain is removed from the PermissionsController.\n   * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.\n   *\n   * @param domain - The domain for which to unset the network client ID.\n   */\n  #unsetNetworkClientIdForDomain(domain: Domain) {\n    const globallySelectedNetworkClient = this.messagingSystem.call(\n      'NetworkController:getSelectedNetworkClient',\n    );\n    const networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy && globallySelectedNetworkClient) {\n      networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);\n      networkProxy.blockTracker.setTarget(\n        globallySelectedNetworkClient.blockTracker,\n      );\n    } else if (networkProxy) {\n      this.#domainProxyMap.delete(domain);\n    }\n    this.update((state) => {\n      delete state.domains[domain];\n    });\n  }\n\n  #domainHasPermissions(domain: Domain): boolean {\n    return this.messagingSystem.call(\n      'PermissionController:hasPermissions',\n      domain,\n    );\n  }\n\n  // Loop through all domains and for those with permissions it points that domain's proxy\n  // to an unproxied instance of the globally selected network client.\n  // NOT the NetworkController's proxy of the globally selected networkClient\n  #resetAllPermissionedDomains() {\n    this.#domainProxyMap.forEach((_: NetworkProxy, domain: string) => {\n      const { selectedNetworkClientId } = this.messagingSystem.call(\n        'NetworkController:getState',\n      );\n      // can't use public setNetworkClientIdForDomain because it will throw an error\n      // rather than simply skip if the domain doesn't have permissions which can happen\n      // in this case since proxies are added for each site the user visits\n      if (this.#domainHasPermissions(domain)) {\n        this.#setNetworkClientIdForDomain(domain, selectedNetworkClientId);\n      }\n    });\n  }\n\n  setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    // Core PR: https://github.com/MetaMask/core/pull/4388\n    // Patch Branch: patch-selected-network-controller-13.0.0-setNetworkClient-guard\n    if (!this.#useRequestQueuePreference) {\n      return;\n    }\n    if (domain === METAMASK_DOMAIN) {\n      throw new Error(\n        `NetworkClientId for domain \"${METAMASK_DOMAIN}\" cannot be set on the SelectedNetworkController`,\n      );\n    }\n\n    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {\n      return;\n    }\n\n    if (!this.#domainHasPermissions(domain)) {\n      throw new Error(\n        'NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions',\n      );\n    }\n\n    this.#setNetworkClientIdForDomain(domain, networkClientId);\n  }\n\n  getNetworkClientIdForDomain(domain: Domain): NetworkClientId {\n    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } =\n      this.messagingSystem.call('NetworkController:getState');\n    if (!this.#useRequestQueuePreference) {\n      return metamaskSelectedNetworkClientId;\n    }\n    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @param domain - the domain for the provider\n   * @returns The proxy and block tracker proxies.\n   */\n  getProviderAndBlockTracker(domain: Domain): NetworkProxy {\n    // If the domain is 'metamask' or a snap, return the NetworkController's globally selected network client proxy\n    if (\n      domain === METAMASK_DOMAIN ||\n      snapsPrefixes.some((prefix) => domain.startsWith(prefix))\n    ) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getSelectedNetworkClient',\n      );\n      if (networkClient === undefined) {\n        throw new Error('Selected network not initialized');\n      }\n      return networkClient;\n    }\n\n    let networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy === undefined) {\n      let networkClient;\n      if (\n        this.#useRequestQueuePreference &&\n        this.#domainHasPermissions(domain)\n      ) {\n        const networkClientId = this.getNetworkClientIdForDomain(domain);\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getNetworkClientById',\n          networkClientId,\n        );\n      } else {\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getSelectedNetworkClient',\n        );\n        if (networkClient === undefined) {\n          throw new Error('Selected network not initialized');\n        }\n      }\n      networkProxy = {\n        provider: createEventEmitterProxy(networkClient.provider),\n        blockTracker: createEventEmitterProxy(networkClient.blockTracker, {\n          eventFilter: 'skipInternal',\n        }),\n      };\n      this.#domainProxyMap.set(domain, networkProxy);\n    }\n    return networkProxy;\n  }\n}\n"],"mappings":"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","names":[]}
+\ No newline at end of file
+diff --git a/dist/chunk-ANSSZMDI.js b/dist/chunk-ANSSZMDI.js
+new file mode 100644
+index 0000000000000000000000000000000000000000..46fa6599a0d673a526cc2d054a47733fc0570e64
+--- /dev/null
++++ b/dist/chunk-ANSSZMDI.js
+@@ -0,0 +1,23 @@
++"use strict";Object.defineProperty(exports, "__esModule", {value: true});
++
++var _chunkCECZWJ42js = require('./chunk-CECZWJ42.js');
++
++// src/SelectedNetworkMiddleware.ts
++var createSelectedNetworkMiddleware = (messenger) => {
++  const getNetworkClientIdForDomain = (origin) => messenger.call(
++    _chunkCECZWJ42js.SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
++    origin
++  );
++  return (req, _, next) => {
++    if (!req.origin) {
++      throw new Error("Request object is lacking an 'origin'");
++    }
++    req.networkClientId = getNetworkClientIdForDomain(req.origin);
++    return next();
++  };
++};
++
++
++
++exports.createSelectedNetworkMiddleware = createSelectedNetworkMiddleware;
++//# sourceMappingURL=chunk-ANSSZMDI.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-ANSSZMDI.js.map b/dist/chunk-ANSSZMDI.js.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..9fe4c1fd6e9b12bfd9091833618334f2c931098f
+--- /dev/null
++++ b/dist/chunk-ANSSZMDI.js.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/SelectedNetworkMiddleware.ts"],"names":[],"mappings":";;;;;AAYO,IAAM,kCAAkC,CAC7C,cAC2C;AAC3C,QAAM,8BAA8B,CAAC,WACnC,UAAU;AAAA,IACR,qCAAqC;AAAA,IACrC;AAAA,EACF;AAEF,SAAO,CAAC,KAA8C,GAAG,SAAS;AAChE,QAAI,CAAC,IAAI,QAAQ;AACf,YAAM,IAAI,MAAM,uCAAuC;AAAA,IACzD;AAEA,QAAI,kBAAkB,4BAA4B,IAAI,MAAM;AAC5D,WAAO,KAAK;AAAA,EACd;AACF","sourcesContent":["import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';\n\nimport type { SelectedNetworkControllerMessenger } from './SelectedNetworkController';\nimport { SelectedNetworkControllerActionTypes } from './SelectedNetworkController';\n\nexport type SelectedNetworkMiddlewareJsonRpcRequest = JsonRpcRequest & {\n  networkClientId?: NetworkClientId;\n  origin?: string;\n};\n\nexport const createSelectedNetworkMiddleware = (\n  messenger: SelectedNetworkControllerMessenger,\n): JsonRpcMiddleware<JsonRpcParams, Json> => {\n  const getNetworkClientIdForDomain = (origin: string) =>\n    messenger.call(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      origin,\n    );\n\n  return (req: SelectedNetworkMiddlewareJsonRpcRequest, _, next) => {\n    if (!req.origin) {\n      throw new Error(\"Request object is lacking an 'origin'\");\n    }\n\n    req.networkClientId = getNetworkClientIdForDomain(req.origin);\n    return next();\n  };\n};\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-CECZWJ42.js b/dist/chunk-CECZWJ42.js
+new file mode 100644
+index 0000000000000000000000000000000000000000..3471ce2b3b927414a25b81b864ddad0cdaeeb26a
+--- /dev/null
++++ b/dist/chunk-CECZWJ42.js
+@@ -0,0 +1,284 @@
++"use strict";Object.defineProperty(exports, "__esModule", {value: true});var __accessCheck = (obj, member, msg) => {
++  if (!member.has(obj))
++    throw TypeError("Cannot " + msg);
++};
++var __privateGet = (obj, member, getter) => {
++  __accessCheck(obj, member, "read from private field");
++  return getter ? getter.call(obj) : member.get(obj);
++};
++var __privateAdd = (obj, member, value) => {
++  if (member.has(obj))
++    throw TypeError("Cannot add the same private member more than once");
++  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
++};
++var __privateSet = (obj, member, value, setter) => {
++  __accessCheck(obj, member, "write to private field");
++  setter ? setter.call(obj, value) : member.set(obj, value);
++  return value;
++};
++var __privateMethod = (obj, member, method) => {
++  __accessCheck(obj, member, "access private method");
++  return method;
++};
++
++// src/SelectedNetworkController.ts
++var _basecontroller = require('@metamask/base-controller');
++var _swappableobjproxy = require('@metamask/swappable-obj-proxy');
++var controllerName = "SelectedNetworkController";
++var stateMetadata = {
++  domains: { persist: true, anonymous: false }
++};
++var getDefaultState = () => ({ domains: {} });
++var snapsPrefixes = ["npm:", "local:"];
++var METAMASK_DOMAIN = "metamask";
++var SelectedNetworkControllerActionTypes = {
++  getState: `${controllerName}:getState`,
++  getNetworkClientIdForDomain: `${controllerName}:getNetworkClientIdForDomain`,
++  setNetworkClientIdForDomain: `${controllerName}:setNetworkClientIdForDomain`
++};
++var SelectedNetworkControllerEventTypes = {
++  stateChange: `${controllerName}:stateChange`
++};
++var _domainProxyMap, _useRequestQueuePreference, _registerMessageHandlers, registerMessageHandlers_fn, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn, _domainHasPermissions, domainHasPermissions_fn, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn;
++var SelectedNetworkController = class extends _basecontroller.BaseController {
++  /**
++   * Construct a SelectedNetworkController controller.
++   *
++   * @param options - The controller options.
++   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.
++   * @param options.state - The controllers initial state.
++   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.
++   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.
++   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.
++   */
++  constructor({
++    messenger,
++    state = getDefaultState(),
++    useRequestQueuePreference,
++    onPreferencesStateChange,
++    domainProxyMap
++  }) {
++    super({
++      name: controllerName,
++      metadata: stateMetadata,
++      messenger,
++      state
++    });
++    __privateAdd(this, _registerMessageHandlers);
++    __privateAdd(this, _setNetworkClientIdForDomain);
++    /**
++     * This method is used when a domain is removed from the PermissionsController.
++     * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.
++     *
++     * @param domain - The domain for which to unset the network client ID.
++     */
++    __privateAdd(this, _unsetNetworkClientIdForDomain);
++    __privateAdd(this, _domainHasPermissions);
++    // Loop through all domains and for those with permissions it points that domain's proxy
++    // to an unproxied instance of the globally selected network client.
++    // NOT the NetworkController's proxy of the globally selected networkClient
++    __privateAdd(this, _resetAllPermissionedDomains);
++    __privateAdd(this, _domainProxyMap, void 0);
++    __privateAdd(this, _useRequestQueuePreference, void 0);
++    __privateSet(this, _useRequestQueuePreference, useRequestQueuePreference);
++    __privateSet(this, _domainProxyMap, domainProxyMap);
++    __privateMethod(this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
++    this.messagingSystem.call("PermissionController:getSubjectNames").filter((domain) => this.state.domains[domain] === void 0).forEach(
++      (domain) => this.setNetworkClientIdForDomain(
++        domain,
++        this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
++      )
++    );
++    this.messagingSystem.subscribe(
++      "PermissionController:stateChange",
++      (_, patches) => {
++        patches.forEach(({ op, path }) => {
++          const isChangingSubject = path[0] === "subjects" && path[1] !== void 0;
++          if (isChangingSubject && typeof path[1] === "string") {
++            const domain = path[1];
++            if (op === "add" && this.state.domains[domain] === void 0) {
++              this.setNetworkClientIdForDomain(
++                domain,
++                this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
++              );
++            } else if (op === "remove" && this.state.domains[domain] !== void 0) {
++              __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
++            }
++          }
++        });
++      }
++    );
++    this.messagingSystem.subscribe(
++      "NetworkController:stateChange",
++      ({ selectedNetworkClientId }, patches) => {
++        patches.forEach(({ op, path }) => {
++          if (op === "remove" && path[0] === "networkConfigurations") {
++            const removedNetworkClientId = path[1];
++            Object.entries(this.state.domains).forEach(
++              ([domain, networkClientIdForDomain]) => {
++                if (networkClientIdForDomain === removedNetworkClientId) {
++                  this.setNetworkClientIdForDomain(
++                    domain,
++                    selectedNetworkClientId
++                  );
++                }
++              }
++            );
++          }
++        });
++      }
++    );
++    onPreferencesStateChange(({ useRequestQueue }) => {
++      if (__privateGet(this, _useRequestQueuePreference) !== useRequestQueue) {
++        if (!useRequestQueue) {
++          Object.keys(this.state.domains).forEach((domain) => {
++            __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
++          });
++        } else {
++          __privateMethod(this, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn).call(this);
++        }
++        __privateSet(this, _useRequestQueuePreference, useRequestQueue);
++      }
++    });
++  }
++  setNetworkClientIdForDomain(domain, networkClientId) {
++    if (!__privateGet(this, _useRequestQueuePreference)) {
++      return;
++    }
++    if (domain === METAMASK_DOMAIN) {
++      throw new Error(
++        `NetworkClientId for domain "${METAMASK_DOMAIN}" cannot be set on the SelectedNetworkController`
++      );
++    }
++    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
++      return;
++    }
++    if (!__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
++      throw new Error(
++        "NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions"
++      );
++    }
++    __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, networkClientId);
++  }
++  getNetworkClientIdForDomain(domain) {
++    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } = this.messagingSystem.call("NetworkController:getState");
++    if (!__privateGet(this, _useRequestQueuePreference)) {
++      return metamaskSelectedNetworkClientId;
++    }
++    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;
++  }
++  /**
++   * Accesses the provider and block tracker for the currently selected network.
++   *
++   * @param domain - the domain for the provider
++   * @returns The proxy and block tracker proxies.
++   */
++  getProviderAndBlockTracker(domain) {
++    if (domain === METAMASK_DOMAIN || snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
++      const networkClient = this.messagingSystem.call(
++        "NetworkController:getSelectedNetworkClient"
++      );
++      if (networkClient === void 0) {
++        throw new Error("Selected network not initialized");
++      }
++      return networkClient;
++    }
++    let networkProxy = __privateGet(this, _domainProxyMap).get(domain);
++    if (networkProxy === void 0) {
++      let networkClient;
++      if (__privateGet(this, _useRequestQueuePreference) && __privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
++        const networkClientId = this.getNetworkClientIdForDomain(domain);
++        networkClient = this.messagingSystem.call(
++          "NetworkController:getNetworkClientById",
++          networkClientId
++        );
++      } else {
++        networkClient = this.messagingSystem.call(
++          "NetworkController:getSelectedNetworkClient"
++        );
++        if (networkClient === void 0) {
++          throw new Error("Selected network not initialized");
++        }
++      }
++      networkProxy = {
++        provider: _swappableobjproxy.createEventEmitterProxy.call(void 0, networkClient.provider),
++        blockTracker: _swappableobjproxy.createEventEmitterProxy.call(void 0, networkClient.blockTracker, {
++          eventFilter: "skipInternal"
++        })
++      };
++      __privateGet(this, _domainProxyMap).set(domain, networkProxy);
++    }
++    return networkProxy;
++  }
++};
++_domainProxyMap = new WeakMap();
++_useRequestQueuePreference = new WeakMap();
++_registerMessageHandlers = new WeakSet();
++registerMessageHandlers_fn = function() {
++  this.messagingSystem.registerActionHandler(
++    SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
++    this.getNetworkClientIdForDomain.bind(this)
++  );
++  this.messagingSystem.registerActionHandler(
++    SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,
++    this.setNetworkClientIdForDomain.bind(this)
++  );
++};
++_setNetworkClientIdForDomain = new WeakSet();
++setNetworkClientIdForDomain_fn = function(domain, networkClientId) {
++  const networkClient = this.messagingSystem.call(
++    "NetworkController:getNetworkClientById",
++    networkClientId
++  );
++  const networkProxy = this.getProviderAndBlockTracker(domain);
++  networkProxy.provider.setTarget(networkClient.provider);
++  networkProxy.blockTracker.setTarget(networkClient.blockTracker);
++  this.update((state) => {
++    state.domains[domain] = networkClientId;
++  });
++};
++_unsetNetworkClientIdForDomain = new WeakSet();
++unsetNetworkClientIdForDomain_fn = function(domain) {
++  const globallySelectedNetworkClient = this.messagingSystem.call(
++    "NetworkController:getSelectedNetworkClient"
++  );
++  const networkProxy = __privateGet(this, _domainProxyMap).get(domain);
++  if (networkProxy && globallySelectedNetworkClient) {
++    networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);
++    networkProxy.blockTracker.setTarget(
++      globallySelectedNetworkClient.blockTracker
++    );
++  } else if (networkProxy) {
++    __privateGet(this, _domainProxyMap).delete(domain);
++  }
++  this.update((state) => {
++    delete state.domains[domain];
++  });
++};
++_domainHasPermissions = new WeakSet();
++domainHasPermissions_fn = function(domain) {
++  return this.messagingSystem.call(
++    "PermissionController:hasPermissions",
++    domain
++  );
++};
++_resetAllPermissionedDomains = new WeakSet();
++resetAllPermissionedDomains_fn = function() {
++  __privateGet(this, _domainProxyMap).forEach((_, domain) => {
++    const { selectedNetworkClientId } = this.messagingSystem.call(
++      "NetworkController:getState"
++    );
++    if (__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
++      __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, selectedNetworkClientId);
++    }
++  });
++};
++
++
++
++
++
++
++
++exports.controllerName = controllerName; exports.METAMASK_DOMAIN = METAMASK_DOMAIN; exports.SelectedNetworkControllerActionTypes = SelectedNetworkControllerActionTypes; exports.SelectedNetworkControllerEventTypes = SelectedNetworkControllerEventTypes; exports.SelectedNetworkController = SelectedNetworkController;
++//# sourceMappingURL=chunk-CECZWJ42.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-CECZWJ42.js.map b/dist/chunk-CECZWJ42.js.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..a2eab942638757819a9cb850057450500d22f9ed
+--- /dev/null
++++ b/dist/chunk-CECZWJ42.js.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/SelectedNetworkController.ts"],"names":[],"mappings":"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","sourcesContent":["import type { RestrictedControllerMessenger } from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  BlockTrackerProxy,\n  NetworkClientId,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetSelectedNetworkClientAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerStateChangeEvent,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport type {\n  PermissionControllerStateChange,\n  GetSubjects as PermissionControllerGetSubjectsAction,\n  HasPermissions as PermissionControllerHasPermissions,\n} from '@metamask/permission-controller';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { Patch } from 'immer';\n\nexport const controllerName = 'SelectedNetworkController';\n\nconst stateMetadata = {\n  domains: { persist: true, anonymous: false },\n};\n\nconst getDefaultState = () => ({ domains: {} });\n\n// npm and local are currently the only valid prefixes for snap domains\n// TODO: eventually we maybe want to pull this in from snaps-utils to ensure it stays in sync\n// For now it seems like overkill to add a dependency for this one constant\n// https://github.com/MetaMask/snaps/blob/2beee7803bfe9e540788a3558b546b9f55dc3cb4/packages/snaps-utils/src/types.ts#L120\nconst snapsPrefixes = ['npm:', 'local:'] as const;\n\nexport type Domain = string;\n\nexport const METAMASK_DOMAIN = 'metamask' as const;\n\nexport const SelectedNetworkControllerActionTypes = {\n  getState: `${controllerName}:getState` as const,\n  getNetworkClientIdForDomain:\n    `${controllerName}:getNetworkClientIdForDomain` as const,\n  setNetworkClientIdForDomain:\n    `${controllerName}:setNetworkClientIdForDomain` as const,\n};\n\nexport const SelectedNetworkControllerEventTypes = {\n  stateChange: `${controllerName}:stateChange` as const,\n};\n\nexport type SelectedNetworkControllerState = {\n  domains: Record<Domain, NetworkClientId>;\n};\n\nexport type SelectedNetworkControllerStateChangeEvent = {\n  type: typeof SelectedNetworkControllerEventTypes.stateChange;\n  payload: [SelectedNetworkControllerState, Patch[]];\n};\n\nexport type SelectedNetworkControllerGetSelectedNetworkStateAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getState;\n  handler: () => SelectedNetworkControllerState;\n};\n\nexport type SelectedNetworkControllerGetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain;\n  handler: SelectedNetworkController['getNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerSetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain;\n  handler: SelectedNetworkController['setNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerActions =\n  | SelectedNetworkControllerGetSelectedNetworkStateAction\n  | SelectedNetworkControllerGetNetworkClientIdForDomainAction\n  | SelectedNetworkControllerSetNetworkClientIdForDomainAction;\n\nexport type AllowedActions =\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetStateAction\n  | PermissionControllerHasPermissions\n  | PermissionControllerGetSubjectsAction;\n\nexport type SelectedNetworkControllerEvents =\n  SelectedNetworkControllerStateChangeEvent;\n\nexport type AllowedEvents =\n  | NetworkControllerStateChangeEvent\n  | PermissionControllerStateChange;\n\nexport type SelectedNetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  SelectedNetworkControllerActions | AllowedActions,\n  SelectedNetworkControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n\nexport type SelectedNetworkControllerOptions = {\n  state?: SelectedNetworkControllerState;\n  messenger: SelectedNetworkControllerMessenger;\n  useRequestQueuePreference: boolean;\n  onPreferencesStateChange: (\n    listener: (preferencesState: { useRequestQueue: boolean }) => void,\n  ) => void;\n  domainProxyMap: Map<Domain, NetworkProxy>;\n};\n\nexport type NetworkProxy = {\n  provider: ProviderProxy;\n  blockTracker: BlockTrackerProxy;\n};\n\n/**\n * Controller for getting and setting the network for a particular domain.\n */\nexport class SelectedNetworkController extends BaseController<\n  typeof controllerName,\n  SelectedNetworkControllerState,\n  SelectedNetworkControllerMessenger\n> {\n  #domainProxyMap: Map<Domain, NetworkProxy>;\n\n  #useRequestQueuePreference: boolean;\n\n  /**\n   * Construct a SelectedNetworkController controller.\n   *\n   * @param options - The controller options.\n   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.\n   * @param options.state - The controllers initial state.\n   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.\n   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.\n   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.\n   */\n  constructor({\n    messenger,\n    state = getDefaultState(),\n    useRequestQueuePreference,\n    onPreferencesStateChange,\n    domainProxyMap,\n  }: SelectedNetworkControllerOptions) {\n    super({\n      name: controllerName,\n      metadata: stateMetadata,\n      messenger,\n      state,\n    });\n    this.#useRequestQueuePreference = useRequestQueuePreference;\n    this.#domainProxyMap = domainProxyMap;\n    this.#registerMessageHandlers();\n\n    // this is fetching all the dapp permissions from the PermissionsController and looking for any domains that are not in domains state in this controller. Then we take any missing domains and add them to state here, setting it with the globally selected networkClientId (fetched from the NetworkController)\n    this.messagingSystem\n      .call('PermissionController:getSubjectNames')\n      .filter((domain) => this.state.domains[domain] === undefined)\n      .forEach((domain) =>\n        this.setNetworkClientIdForDomain(\n          domain,\n          this.messagingSystem.call('NetworkController:getState')\n            .selectedNetworkClientId,\n        ),\n      );\n\n    this.messagingSystem.subscribe(\n      'PermissionController:stateChange',\n      (_, patches) => {\n        patches.forEach(({ op, path }) => {\n          const isChangingSubject =\n            path[0] === 'subjects' && path[1] !== undefined;\n          if (isChangingSubject && typeof path[1] === 'string') {\n            const domain = path[1];\n            if (op === 'add' && this.state.domains[domain] === undefined) {\n              this.setNetworkClientIdForDomain(\n                domain,\n                this.messagingSystem.call('NetworkController:getState')\n                  .selectedNetworkClientId,\n              );\n            } else if (\n              op === 'remove' &&\n              this.state.domains[domain] !== undefined\n            ) {\n              this.#unsetNetworkClientIdForDomain(domain);\n            }\n          }\n        });\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'NetworkController:stateChange',\n      ({ selectedNetworkClientId }, patches) => {\n        patches.forEach(({ op, path }) => {\n          // if a network is removed, update the networkClientId for all domains that were using it to the selected network\n          if (op === 'remove' && path[0] === 'networkConfigurations') {\n            const removedNetworkClientId = path[1] as NetworkClientId;\n            Object.entries(this.state.domains).forEach(\n              ([domain, networkClientIdForDomain]) => {\n                if (networkClientIdForDomain === removedNetworkClientId) {\n                  this.setNetworkClientIdForDomain(\n                    domain,\n                    selectedNetworkClientId,\n                  );\n                }\n              },\n            );\n          }\n        });\n      },\n    );\n\n    onPreferencesStateChange(({ useRequestQueue }) => {\n      if (this.#useRequestQueuePreference !== useRequestQueue) {\n        if (!useRequestQueue) {\n          // Loop through all domains and points each domain's proxy\n          // to the NetworkController's own proxy of the globally selected networkClient\n          Object.keys(this.state.domains).forEach((domain) => {\n            this.#unsetNetworkClientIdForDomain(domain);\n          });\n        } else {\n          this.#resetAllPermissionedDomains();\n        }\n        this.#useRequestQueuePreference = useRequestQueue;\n      }\n    });\n  }\n\n  #registerMessageHandlers(): void {\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      this.getNetworkClientIdForDomain.bind(this),\n    );\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,\n      this.setNetworkClientIdForDomain.bind(this),\n    );\n  }\n\n  #setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    const networkClient = this.messagingSystem.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    const networkProxy = this.getProviderAndBlockTracker(domain);\n    networkProxy.provider.setTarget(networkClient.provider);\n    networkProxy.blockTracker.setTarget(networkClient.blockTracker);\n\n    this.update((state) => {\n      state.domains[domain] = networkClientId;\n    });\n  }\n\n  /**\n   * This method is used when a domain is removed from the PermissionsController.\n   * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.\n   *\n   * @param domain - The domain for which to unset the network client ID.\n   */\n  #unsetNetworkClientIdForDomain(domain: Domain) {\n    const globallySelectedNetworkClient = this.messagingSystem.call(\n      'NetworkController:getSelectedNetworkClient',\n    );\n    const networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy && globallySelectedNetworkClient) {\n      networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);\n      networkProxy.blockTracker.setTarget(\n        globallySelectedNetworkClient.blockTracker,\n      );\n    } else if (networkProxy) {\n      this.#domainProxyMap.delete(domain);\n    }\n    this.update((state) => {\n      delete state.domains[domain];\n    });\n  }\n\n  #domainHasPermissions(domain: Domain): boolean {\n    return this.messagingSystem.call(\n      'PermissionController:hasPermissions',\n      domain,\n    );\n  }\n\n  // Loop through all domains and for those with permissions it points that domain's proxy\n  // to an unproxied instance of the globally selected network client.\n  // NOT the NetworkController's proxy of the globally selected networkClient\n  #resetAllPermissionedDomains() {\n    this.#domainProxyMap.forEach((_: NetworkProxy, domain: string) => {\n      const { selectedNetworkClientId } = this.messagingSystem.call(\n        'NetworkController:getState',\n      );\n      // can't use public setNetworkClientIdForDomain because it will throw an error\n      // rather than simply skip if the domain doesn't have permissions which can happen\n      // in this case since proxies are added for each site the user visits\n      if (this.#domainHasPermissions(domain)) {\n        this.#setNetworkClientIdForDomain(domain, selectedNetworkClientId);\n      }\n    });\n  }\n\n  setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    // Core PR: https://github.com/MetaMask/core/pull/4388\n    // Patch Branch: patch-selected-network-controller-13.0.0-setNetworkClient-guard\n    if (!this.#useRequestQueuePreference) {\n      return;\n    }\n    if (domain === METAMASK_DOMAIN) {\n      throw new Error(\n        `NetworkClientId for domain \"${METAMASK_DOMAIN}\" cannot be set on the SelectedNetworkController`,\n      );\n    }\n\n    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {\n      return;\n    }\n\n    if (!this.#domainHasPermissions(domain)) {\n      throw new Error(\n        'NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions',\n      );\n    }\n\n    this.#setNetworkClientIdForDomain(domain, networkClientId);\n  }\n\n  getNetworkClientIdForDomain(domain: Domain): NetworkClientId {\n    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } =\n      this.messagingSystem.call('NetworkController:getState');\n    if (!this.#useRequestQueuePreference) {\n      return metamaskSelectedNetworkClientId;\n    }\n    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @param domain - the domain for the provider\n   * @returns The proxy and block tracker proxies.\n   */\n  getProviderAndBlockTracker(domain: Domain): NetworkProxy {\n    // If the domain is 'metamask' or a snap, return the NetworkController's globally selected network client proxy\n    if (\n      domain === METAMASK_DOMAIN ||\n      snapsPrefixes.some((prefix) => domain.startsWith(prefix))\n    ) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getSelectedNetworkClient',\n      );\n      if (networkClient === undefined) {\n        throw new Error('Selected network not initialized');\n      }\n      return networkClient;\n    }\n\n    let networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy === undefined) {\n      let networkClient;\n      if (\n        this.#useRequestQueuePreference &&\n        this.#domainHasPermissions(domain)\n      ) {\n        const networkClientId = this.getNetworkClientIdForDomain(domain);\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getNetworkClientById',\n          networkClientId,\n        );\n      } else {\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getSelectedNetworkClient',\n        );\n        if (networkClient === undefined) {\n          throw new Error('Selected network not initialized');\n        }\n      }\n      networkProxy = {\n        provider: createEventEmitterProxy(networkClient.provider),\n        blockTracker: createEventEmitterProxy(networkClient.blockTracker, {\n          eventFilter: 'skipInternal',\n        }),\n      };\n      this.#domainProxyMap.set(domain, networkProxy);\n    }\n    return networkProxy;\n  }\n}\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-HFN7TKJS.mjs b/dist/chunk-HFN7TKJS.mjs
+new file mode 100644
+index 0000000000000000000000000000000000000000..6f4a4ec6b18571939d2b6c10ddb8ab4e5345389c
+--- /dev/null
++++ b/dist/chunk-HFN7TKJS.mjs
+@@ -0,0 +1,23 @@
++import {
++  SelectedNetworkControllerActionTypes
++} from "./chunk-7DSTEJNI.mjs";
++
++// src/SelectedNetworkMiddleware.ts
++var createSelectedNetworkMiddleware = (messenger) => {
++  const getNetworkClientIdForDomain = (origin) => messenger.call(
++    SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
++    origin
++  );
++  return (req, _, next) => {
++    if (!req.origin) {
++      throw new Error("Request object is lacking an 'origin'");
++    }
++    req.networkClientId = getNetworkClientIdForDomain(req.origin);
++    return next();
++  };
++};
++
++export {
++  createSelectedNetworkMiddleware
++};
++//# sourceMappingURL=chunk-HFN7TKJS.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-HFN7TKJS.mjs.map b/dist/chunk-HFN7TKJS.mjs.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..fbcfd73d57f291b4f129caa47ef0c9614987cc30
+--- /dev/null
++++ b/dist/chunk-HFN7TKJS.mjs.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/SelectedNetworkMiddleware.ts"],"sourcesContent":["import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';\n\nimport type { SelectedNetworkControllerMessenger } from './SelectedNetworkController';\nimport { SelectedNetworkControllerActionTypes } from './SelectedNetworkController';\n\nexport type SelectedNetworkMiddlewareJsonRpcRequest = JsonRpcRequest & {\n  networkClientId?: NetworkClientId;\n  origin?: string;\n};\n\nexport const createSelectedNetworkMiddleware = (\n  messenger: SelectedNetworkControllerMessenger,\n): JsonRpcMiddleware<JsonRpcParams, Json> => {\n  const getNetworkClientIdForDomain = (origin: string) =>\n    messenger.call(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      origin,\n    );\n\n  return (req: SelectedNetworkMiddlewareJsonRpcRequest, _, next) => {\n    if (!req.origin) {\n      throw new Error(\"Request object is lacking an 'origin'\");\n    }\n\n    req.networkClientId = getNetworkClientIdForDomain(req.origin);\n    return next();\n  };\n};\n"],"mappings":";;;;;AAYO,IAAM,kCAAkC,CAC7C,cAC2C;AAC3C,QAAM,8BAA8B,CAAC,WACnC,UAAU;AAAA,IACR,qCAAqC;AAAA,IACrC;AAAA,EACF;AAEF,SAAO,CAAC,KAA8C,GAAG,SAAS;AAChE,QAAI,CAAC,IAAI,QAAQ;AACf,YAAM,IAAI,MAAM,uCAAuC;AAAA,IACzD;AAEA,QAAI,kBAAkB,4BAA4B,IAAI,MAAM;AAC5D,WAAO,KAAK;AAAA,EACd;AACF;","names":[]}
+\ No newline at end of file
+diff --git a/dist/chunk-OGUVGN6R.js b/dist/chunk-OGUVGN6R.js
+deleted file mode 100644
+index 1fb2670b25d9230aa3b0d1d496223ccee8f48263..0000000000000000000000000000000000000000
+--- a/dist/chunk-OGUVGN6R.js
++++ /dev/null
+@@ -1,281 +0,0 @@
+-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var __accessCheck = (obj, member, msg) => {
+-  if (!member.has(obj))
+-    throw TypeError("Cannot " + msg);
+-};
+-var __privateGet = (obj, member, getter) => {
+-  __accessCheck(obj, member, "read from private field");
+-  return getter ? getter.call(obj) : member.get(obj);
+-};
+-var __privateAdd = (obj, member, value) => {
+-  if (member.has(obj))
+-    throw TypeError("Cannot add the same private member more than once");
+-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+-};
+-var __privateSet = (obj, member, value, setter) => {
+-  __accessCheck(obj, member, "write to private field");
+-  setter ? setter.call(obj, value) : member.set(obj, value);
+-  return value;
+-};
+-var __privateMethod = (obj, member, method) => {
+-  __accessCheck(obj, member, "access private method");
+-  return method;
+-};
+-
+-// src/SelectedNetworkController.ts
+-var _basecontroller = require('@metamask/base-controller');
+-var _swappableobjproxy = require('@metamask/swappable-obj-proxy');
+-var controllerName = "SelectedNetworkController";
+-var stateMetadata = {
+-  domains: { persist: true, anonymous: false }
+-};
+-var getDefaultState = () => ({ domains: {} });
+-var snapsPrefixes = ["npm:", "local:"];
+-var METAMASK_DOMAIN = "metamask";
+-var SelectedNetworkControllerActionTypes = {
+-  getState: `${controllerName}:getState`,
+-  getNetworkClientIdForDomain: `${controllerName}:getNetworkClientIdForDomain`,
+-  setNetworkClientIdForDomain: `${controllerName}:setNetworkClientIdForDomain`
+-};
+-var SelectedNetworkControllerEventTypes = {
+-  stateChange: `${controllerName}:stateChange`
+-};
+-var _domainProxyMap, _useRequestQueuePreference, _registerMessageHandlers, registerMessageHandlers_fn, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn, _domainHasPermissions, domainHasPermissions_fn, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn;
+-var SelectedNetworkController = class extends _basecontroller.BaseController {
+-  /**
+-   * Construct a SelectedNetworkController controller.
+-   *
+-   * @param options - The controller options.
+-   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.
+-   * @param options.state - The controllers initial state.
+-   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.
+-   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.
+-   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.
+-   */
+-  constructor({
+-    messenger,
+-    state = getDefaultState(),
+-    useRequestQueuePreference,
+-    onPreferencesStateChange,
+-    domainProxyMap
+-  }) {
+-    super({
+-      name: controllerName,
+-      metadata: stateMetadata,
+-      messenger,
+-      state
+-    });
+-    __privateAdd(this, _registerMessageHandlers);
+-    __privateAdd(this, _setNetworkClientIdForDomain);
+-    /**
+-     * This method is used when a domain is removed from the PermissionsController.
+-     * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.
+-     *
+-     * @param domain - The domain for which to unset the network client ID.
+-     */
+-    __privateAdd(this, _unsetNetworkClientIdForDomain);
+-    __privateAdd(this, _domainHasPermissions);
+-    // Loop through all domains and for those with permissions it points that domain's proxy
+-    // to an unproxied instance of the globally selected network client.
+-    // NOT the NetworkController's proxy of the globally selected networkClient
+-    __privateAdd(this, _resetAllPermissionedDomains);
+-    __privateAdd(this, _domainProxyMap, void 0);
+-    __privateAdd(this, _useRequestQueuePreference, void 0);
+-    __privateSet(this, _useRequestQueuePreference, useRequestQueuePreference);
+-    __privateSet(this, _domainProxyMap, domainProxyMap);
+-    __privateMethod(this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
+-    this.messagingSystem.call("PermissionController:getSubjectNames").filter((domain) => this.state.domains[domain] === void 0).forEach(
+-      (domain) => this.setNetworkClientIdForDomain(
+-        domain,
+-        this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
+-      )
+-    );
+-    this.messagingSystem.subscribe(
+-      "PermissionController:stateChange",
+-      (_, patches) => {
+-        patches.forEach(({ op, path }) => {
+-          const isChangingSubject = path[0] === "subjects" && path[1] !== void 0;
+-          if (isChangingSubject && typeof path[1] === "string") {
+-            const domain = path[1];
+-            if (op === "add" && this.state.domains[domain] === void 0) {
+-              this.setNetworkClientIdForDomain(
+-                domain,
+-                this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
+-              );
+-            } else if (op === "remove" && this.state.domains[domain] !== void 0) {
+-              __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
+-            }
+-          }
+-        });
+-      }
+-    );
+-    this.messagingSystem.subscribe(
+-      "NetworkController:stateChange",
+-      ({ selectedNetworkClientId }, patches) => {
+-        patches.forEach(({ op, path }) => {
+-          if (op === "remove" && path[0] === "networkConfigurations") {
+-            const removedNetworkClientId = path[1];
+-            Object.entries(this.state.domains).forEach(
+-              ([domain, networkClientIdForDomain]) => {
+-                if (networkClientIdForDomain === removedNetworkClientId) {
+-                  this.setNetworkClientIdForDomain(
+-                    domain,
+-                    selectedNetworkClientId
+-                  );
+-                }
+-              }
+-            );
+-          }
+-        });
+-      }
+-    );
+-    onPreferencesStateChange(({ useRequestQueue }) => {
+-      if (__privateGet(this, _useRequestQueuePreference) !== useRequestQueue) {
+-        if (!useRequestQueue) {
+-          Object.keys(this.state.domains).forEach((domain) => {
+-            __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
+-          });
+-        } else {
+-          __privateMethod(this, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn).call(this);
+-        }
+-        __privateSet(this, _useRequestQueuePreference, useRequestQueue);
+-      }
+-    });
+-  }
+-  setNetworkClientIdForDomain(domain, networkClientId) {
+-    if (domain === METAMASK_DOMAIN) {
+-      throw new Error(
+-        `NetworkClientId for domain "${METAMASK_DOMAIN}" cannot be set on the SelectedNetworkController`
+-      );
+-    }
+-    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
+-      return;
+-    }
+-    if (!__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
+-      throw new Error(
+-        "NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions"
+-      );
+-    }
+-    __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, networkClientId);
+-  }
+-  getNetworkClientIdForDomain(domain) {
+-    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } = this.messagingSystem.call("NetworkController:getState");
+-    if (!__privateGet(this, _useRequestQueuePreference)) {
+-      return metamaskSelectedNetworkClientId;
+-    }
+-    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;
+-  }
+-  /**
+-   * Accesses the provider and block tracker for the currently selected network.
+-   *
+-   * @param domain - the domain for the provider
+-   * @returns The proxy and block tracker proxies.
+-   */
+-  getProviderAndBlockTracker(domain) {
+-    if (domain === METAMASK_DOMAIN || snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
+-      const networkClient = this.messagingSystem.call(
+-        "NetworkController:getSelectedNetworkClient"
+-      );
+-      if (networkClient === void 0) {
+-        throw new Error("Selected network not initialized");
+-      }
+-      return networkClient;
+-    }
+-    let networkProxy = __privateGet(this, _domainProxyMap).get(domain);
+-    if (networkProxy === void 0) {
+-      let networkClient;
+-      if (__privateGet(this, _useRequestQueuePreference) && __privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
+-        const networkClientId = this.getNetworkClientIdForDomain(domain);
+-        networkClient = this.messagingSystem.call(
+-          "NetworkController:getNetworkClientById",
+-          networkClientId
+-        );
+-      } else {
+-        networkClient = this.messagingSystem.call(
+-          "NetworkController:getSelectedNetworkClient"
+-        );
+-        if (networkClient === void 0) {
+-          throw new Error("Selected network not initialized");
+-        }
+-      }
+-      networkProxy = {
+-        provider: _swappableobjproxy.createEventEmitterProxy.call(void 0, networkClient.provider),
+-        blockTracker: _swappableobjproxy.createEventEmitterProxy.call(void 0, networkClient.blockTracker, {
+-          eventFilter: "skipInternal"
+-        })
+-      };
+-      __privateGet(this, _domainProxyMap).set(domain, networkProxy);
+-    }
+-    return networkProxy;
+-  }
+-};
+-_domainProxyMap = new WeakMap();
+-_useRequestQueuePreference = new WeakMap();
+-_registerMessageHandlers = new WeakSet();
+-registerMessageHandlers_fn = function() {
+-  this.messagingSystem.registerActionHandler(
+-    SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
+-    this.getNetworkClientIdForDomain.bind(this)
+-  );
+-  this.messagingSystem.registerActionHandler(
+-    SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,
+-    this.setNetworkClientIdForDomain.bind(this)
+-  );
+-};
+-_setNetworkClientIdForDomain = new WeakSet();
+-setNetworkClientIdForDomain_fn = function(domain, networkClientId) {
+-  const networkClient = this.messagingSystem.call(
+-    "NetworkController:getNetworkClientById",
+-    networkClientId
+-  );
+-  const networkProxy = this.getProviderAndBlockTracker(domain);
+-  networkProxy.provider.setTarget(networkClient.provider);
+-  networkProxy.blockTracker.setTarget(networkClient.blockTracker);
+-  this.update((state) => {
+-    state.domains[domain] = networkClientId;
+-  });
+-};
+-_unsetNetworkClientIdForDomain = new WeakSet();
+-unsetNetworkClientIdForDomain_fn = function(domain) {
+-  const globallySelectedNetworkClient = this.messagingSystem.call(
+-    "NetworkController:getSelectedNetworkClient"
+-  );
+-  const networkProxy = __privateGet(this, _domainProxyMap).get(domain);
+-  if (networkProxy && globallySelectedNetworkClient) {
+-    networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);
+-    networkProxy.blockTracker.setTarget(
+-      globallySelectedNetworkClient.blockTracker
+-    );
+-  } else if (networkProxy) {
+-    __privateGet(this, _domainProxyMap).delete(domain);
+-  }
+-  this.update((state) => {
+-    delete state.domains[domain];
+-  });
+-};
+-_domainHasPermissions = new WeakSet();
+-domainHasPermissions_fn = function(domain) {
+-  return this.messagingSystem.call(
+-    "PermissionController:hasPermissions",
+-    domain
+-  );
+-};
+-_resetAllPermissionedDomains = new WeakSet();
+-resetAllPermissionedDomains_fn = function() {
+-  __privateGet(this, _domainProxyMap).forEach((_, domain) => {
+-    const { selectedNetworkClientId } = this.messagingSystem.call(
+-      "NetworkController:getState"
+-    );
+-    if (__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
+-      __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, selectedNetworkClientId);
+-    }
+-  });
+-};
+-
+-
+-
+-
+-
+-
+-
+-exports.controllerName = controllerName; exports.METAMASK_DOMAIN = METAMASK_DOMAIN; exports.SelectedNetworkControllerActionTypes = SelectedNetworkControllerActionTypes; exports.SelectedNetworkControllerEventTypes = SelectedNetworkControllerEventTypes; exports.SelectedNetworkController = SelectedNetworkController;
+-//# sourceMappingURL=chunk-OGUVGN6R.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-OGUVGN6R.js.map b/dist/chunk-OGUVGN6R.js.map
+deleted file mode 100644
+index 4e38e02bd55874905ac6ea9c5874f01f102a7ff7..0000000000000000000000000000000000000000
+--- a/dist/chunk-OGUVGN6R.js.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/SelectedNetworkController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,SAAS,sBAAsB;AAe/B,SAAS,+BAA+B;AAGjC,IAAM,iBAAiB;AAE9B,IAAM,gBAAgB;AAAA,EACpB,SAAS,EAAE,SAAS,MAAM,WAAW,MAAM;AAC7C;AAEA,IAAM,kBAAkB,OAAO,EAAE,SAAS,CAAC,EAAE;AAM7C,IAAM,gBAAgB,CAAC,QAAQ,QAAQ;AAIhC,IAAM,kBAAkB;AAExB,IAAM,uCAAuC;AAAA,EAClD,UAAU,GAAG,cAAc;AAAA,EAC3B,6BACE,GAAG,cAAc;AAAA,EACnB,6BACE,GAAG,cAAc;AACrB;AAEO,IAAM,sCAAsC;AAAA,EACjD,aAAa,GAAG,cAAc;AAChC;AA/CA;AAsHO,IAAM,4BAAN,cAAwC,eAI7C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAeA,YAAY;AAAA,IACV;AAAA,IACA,QAAQ,gBAAgB;AAAA,IACxB;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAAqC;AACnC,UAAM;AAAA,MACJ,MAAM;AAAA,MACN,UAAU;AAAA,MACV;AAAA,MACA;AAAA,IACF,CAAC;AAgFH;AAWA;AAuBA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAkBA;AAUA;AAAA;AAAA;AAAA;AAxKA;AAEA;AAyBE,uBAAK,4BAA6B;AAClC,uBAAK,iBAAkB;AACvB,0BAAK,sDAAL;AAGA,SAAK,gBACF,KAAK,sCAAsC,EAC3C,OAAO,CAAC,WAAW,KAAK,MAAM,QAAQ,MAAM,MAAM,MAAS,EAC3D;AAAA,MAAQ,CAAC,WACR,KAAK;AAAA,QACH;AAAA,QACA,KAAK,gBAAgB,KAAK,4BAA4B,EACnD;AAAA,MACL;AAAA,IACF;AAEF,SAAK,gBAAgB;AAAA,MACnB;AAAA,MACA,CAAC,GAAG,YAAY;AACd,gBAAQ,QAAQ,CAAC,EAAE,IAAI,KAAK,MAAM;AAChC,gBAAM,oBACJ,KAAK,CAAC,MAAM,cAAc,KAAK,CAAC,MAAM;AACxC,cAAI,qBAAqB,OAAO,KAAK,CAAC,MAAM,UAAU;AACpD,kBAAM,SAAS,KAAK,CAAC;AACrB,gBAAI,OAAO,SAAS,KAAK,MAAM,QAAQ,MAAM,MAAM,QAAW;AAC5D,mBAAK;AAAA,gBACH;AAAA,gBACA,KAAK,gBAAgB,KAAK,4BAA4B,EACnD;AAAA,cACL;AAAA,YACF,WACE,OAAO,YACP,KAAK,MAAM,QAAQ,MAAM,MAAM,QAC/B;AACA,oCAAK,kEAAL,WAAoC;AAAA,YACtC;AAAA,UACF;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAEA,SAAK,gBAAgB;AAAA,MACnB;AAAA,MACA,CAAC,EAAE,wBAAwB,GAAG,YAAY;AACxC,gBAAQ,QAAQ,CAAC,EAAE,IAAI,KAAK,MAAM;AAEhC,cAAI,OAAO,YAAY,KAAK,CAAC,MAAM,yBAAyB;AAC1D,kBAAM,yBAAyB,KAAK,CAAC;AACrC,mBAAO,QAAQ,KAAK,MAAM,OAAO,EAAE;AAAA,cACjC,CAAC,CAAC,QAAQ,wBAAwB,MAAM;AACtC,oBAAI,6BAA6B,wBAAwB;AACvD,uBAAK;AAAA,oBACH;AAAA,oBACA;AAAA,kBACF;AAAA,gBACF;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAEA,6BAAyB,CAAC,EAAE,gBAAgB,MAAM;AAChD,UAAI,mBAAK,gCAA+B,iBAAiB;AACvD,YAAI,CAAC,iBAAiB;AAGpB,iBAAO,KAAK,KAAK,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW;AAClD,kCAAK,kEAAL,WAAoC;AAAA,UACtC,CAAC;AAAA,QACH,OAAO;AACL,gCAAK,8DAAL;AAAA,QACF;AACA,2BAAK,4BAA6B;AAAA,MACpC;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EA8EA,4BACE,QACA,iBACA;AACA,QAAI,WAAW,iBAAiB;AAC9B,YAAM,IAAI;AAAA,QACR,+BAA+B,eAAe;AAAA,MAChD;AAAA,IACF;AAEA,QAAI,cAAc,KAAK,CAAC,WAAW,OAAO,WAAW,MAAM,CAAC,GAAG;AAC7D;AAAA,IACF;AAEA,QAAI,CAAC,sBAAK,gDAAL,WAA2B,SAAS;AACvC,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAEA,0BAAK,8DAAL,WAAkC,QAAQ;AAAA,EAC5C;AAAA,EAEA,4BAA4B,QAAiC;AAC3D,UAAM,EAAE,yBAAyB,gCAAgC,IAC/D,KAAK,gBAAgB,KAAK,4BAA4B;AACxD,QAAI,CAAC,mBAAK,6BAA4B;AACpC,aAAO;AAAA,IACT;AACA,WAAO,KAAK,MAAM,QAAQ,MAAM,KAAK;AAAA,EACvC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQA,2BAA2B,QAA8B;AAEvD,QACE,WAAW,mBACX,cAAc,KAAK,CAAC,WAAW,OAAO,WAAW,MAAM,CAAC,GACxD;AACA,YAAM,gBAAgB,KAAK,gBAAgB;AAAA,QACzC;AAAA,MACF;AACA,UAAI,kBAAkB,QAAW;AAC/B,cAAM,IAAI,MAAM,kCAAkC;AAAA,MACpD;AACA,aAAO;AAAA,IACT;AAEA,QAAI,eAAe,mBAAK,iBAAgB,IAAI,MAAM;AAClD,QAAI,iBAAiB,QAAW;AAC9B,UAAI;AACJ,UACE,mBAAK,+BACL,sBAAK,gDAAL,WAA2B,SAC3B;AACA,cAAM,kBAAkB,KAAK,4BAA4B,MAAM;AAC/D,wBAAgB,KAAK,gBAAgB;AAAA,UACnC;AAAA,UACA;AAAA,QACF;AAAA,MACF,OAAO;AACL,wBAAgB,KAAK,gBAAgB;AAAA,UACnC;AAAA,QACF;AACA,YAAI,kBAAkB,QAAW;AAC/B,gBAAM,IAAI,MAAM,kCAAkC;AAAA,QACpD;AAAA,MACF;AACA,qBAAe;AAAA,QACb,UAAU,wBAAwB,cAAc,QAAQ;AAAA,QACxD,cAAc,wBAAwB,cAAc,cAAc;AAAA,UAChE,aAAa;AAAA,QACf,CAAC;AAAA,MACH;AACA,yBAAK,iBAAgB,IAAI,QAAQ,YAAY;AAAA,IAC/C;AACA,WAAO;AAAA,EACT;AACF;AAzQE;AAEA;AAwGA;AAAA,6BAAwB,WAAS;AAC/B,OAAK,gBAAgB;AAAA,IACnB,qCAAqC;AAAA,IACrC,KAAK,4BAA4B,KAAK,IAAI;AAAA,EAC5C;AACA,OAAK,gBAAgB;AAAA,IACnB,qCAAqC;AAAA,IACrC,KAAK,4BAA4B,KAAK,IAAI;AAAA,EAC5C;AACF;AAEA;AAAA,iCAA4B,SAC1B,QACA,iBACA;AACA,QAAM,gBAAgB,KAAK,gBAAgB;AAAA,IACzC;AAAA,IACA;AAAA,EACF;AACA,QAAM,eAAe,KAAK,2BAA2B,MAAM;AAC3D,eAAa,SAAS,UAAU,cAAc,QAAQ;AACtD,eAAa,aAAa,UAAU,cAAc,YAAY;AAE9D,OAAK,OAAO,CAAC,UAAU;AACrB,UAAM,QAAQ,MAAM,IAAI;AAAA,EAC1B,CAAC;AACH;AAQA;AAAA,mCAA8B,SAAC,QAAgB;AAC7C,QAAM,gCAAgC,KAAK,gBAAgB;AAAA,IACzD;AAAA,EACF;AACA,QAAM,eAAe,mBAAK,iBAAgB,IAAI,MAAM;AACpD,MAAI,gBAAgB,+BAA+B;AACjD,iBAAa,SAAS,UAAU,8BAA8B,QAAQ;AACtE,iBAAa,aAAa;AAAA,MACxB,8BAA8B;AAAA,IAChC;AAAA,EACF,WAAW,cAAc;AACvB,uBAAK,iBAAgB,OAAO,MAAM;AAAA,EACpC;AACA,OAAK,OAAO,CAAC,UAAU;AACrB,WAAO,MAAM,QAAQ,MAAM;AAAA,EAC7B,CAAC;AACH;AAEA;AAAA,0BAAqB,SAAC,QAAyB;AAC7C,SAAO,KAAK,gBAAgB;AAAA,IAC1B;AAAA,IACA;AAAA,EACF;AACF;AAKA;AAAA,iCAA4B,WAAG;AAC7B,qBAAK,iBAAgB,QAAQ,CAAC,GAAiB,WAAmB;AAChE,UAAM,EAAE,wBAAwB,IAAI,KAAK,gBAAgB;AAAA,MACvD;AAAA,IACF;AAIA,QAAI,sBAAK,gDAAL,WAA2B,SAAS;AACtC,4BAAK,8DAAL,WAAkC,QAAQ;AAAA,IAC5C;AAAA,EACF,CAAC;AACH","sourcesContent":["import type { RestrictedControllerMessenger } from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  BlockTrackerProxy,\n  NetworkClientId,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetSelectedNetworkClientAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerStateChangeEvent,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport type {\n  PermissionControllerStateChange,\n  GetSubjects as PermissionControllerGetSubjectsAction,\n  HasPermissions as PermissionControllerHasPermissions,\n} from '@metamask/permission-controller';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { Patch } from 'immer';\n\nexport const controllerName = 'SelectedNetworkController';\n\nconst stateMetadata = {\n  domains: { persist: true, anonymous: false },\n};\n\nconst getDefaultState = () => ({ domains: {} });\n\n// npm and local are currently the only valid prefixes for snap domains\n// TODO: eventually we maybe want to pull this in from snaps-utils to ensure it stays in sync\n// For now it seems like overkill to add a dependency for this one constant\n// https://github.com/MetaMask/snaps/blob/2beee7803bfe9e540788a3558b546b9f55dc3cb4/packages/snaps-utils/src/types.ts#L120\nconst snapsPrefixes = ['npm:', 'local:'] as const;\n\nexport type Domain = string;\n\nexport const METAMASK_DOMAIN = 'metamask' as const;\n\nexport const SelectedNetworkControllerActionTypes = {\n  getState: `${controllerName}:getState` as const,\n  getNetworkClientIdForDomain:\n    `${controllerName}:getNetworkClientIdForDomain` as const,\n  setNetworkClientIdForDomain:\n    `${controllerName}:setNetworkClientIdForDomain` as const,\n};\n\nexport const SelectedNetworkControllerEventTypes = {\n  stateChange: `${controllerName}:stateChange` as const,\n};\n\nexport type SelectedNetworkControllerState = {\n  domains: Record<Domain, NetworkClientId>;\n};\n\nexport type SelectedNetworkControllerStateChangeEvent = {\n  type: typeof SelectedNetworkControllerEventTypes.stateChange;\n  payload: [SelectedNetworkControllerState, Patch[]];\n};\n\nexport type SelectedNetworkControllerGetSelectedNetworkStateAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getState;\n  handler: () => SelectedNetworkControllerState;\n};\n\nexport type SelectedNetworkControllerGetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain;\n  handler: SelectedNetworkController['getNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerSetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain;\n  handler: SelectedNetworkController['setNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerActions =\n  | SelectedNetworkControllerGetSelectedNetworkStateAction\n  | SelectedNetworkControllerGetNetworkClientIdForDomainAction\n  | SelectedNetworkControllerSetNetworkClientIdForDomainAction;\n\nexport type AllowedActions =\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetStateAction\n  | PermissionControllerHasPermissions\n  | PermissionControllerGetSubjectsAction;\n\nexport type SelectedNetworkControllerEvents =\n  SelectedNetworkControllerStateChangeEvent;\n\nexport type AllowedEvents =\n  | NetworkControllerStateChangeEvent\n  | PermissionControllerStateChange;\n\nexport type SelectedNetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  SelectedNetworkControllerActions | AllowedActions,\n  SelectedNetworkControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n\nexport type SelectedNetworkControllerOptions = {\n  state?: SelectedNetworkControllerState;\n  messenger: SelectedNetworkControllerMessenger;\n  useRequestQueuePreference: boolean;\n  onPreferencesStateChange: (\n    listener: (preferencesState: { useRequestQueue: boolean }) => void,\n  ) => void;\n  domainProxyMap: Map<Domain, NetworkProxy>;\n};\n\nexport type NetworkProxy = {\n  provider: ProviderProxy;\n  blockTracker: BlockTrackerProxy;\n};\n\n/**\n * Controller for getting and setting the network for a particular domain.\n */\nexport class SelectedNetworkController extends BaseController<\n  typeof controllerName,\n  SelectedNetworkControllerState,\n  SelectedNetworkControllerMessenger\n> {\n  #domainProxyMap: Map<Domain, NetworkProxy>;\n\n  #useRequestQueuePreference: boolean;\n\n  /**\n   * Construct a SelectedNetworkController controller.\n   *\n   * @param options - The controller options.\n   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.\n   * @param options.state - The controllers initial state.\n   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.\n   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.\n   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.\n   */\n  constructor({\n    messenger,\n    state = getDefaultState(),\n    useRequestQueuePreference,\n    onPreferencesStateChange,\n    domainProxyMap,\n  }: SelectedNetworkControllerOptions) {\n    super({\n      name: controllerName,\n      metadata: stateMetadata,\n      messenger,\n      state,\n    });\n    this.#useRequestQueuePreference = useRequestQueuePreference;\n    this.#domainProxyMap = domainProxyMap;\n    this.#registerMessageHandlers();\n\n    // this is fetching all the dapp permissions from the PermissionsController and looking for any domains that are not in domains state in this controller. Then we take any missing domains and add them to state here, setting it with the globally selected networkClientId (fetched from the NetworkController)\n    this.messagingSystem\n      .call('PermissionController:getSubjectNames')\n      .filter((domain) => this.state.domains[domain] === undefined)\n      .forEach((domain) =>\n        this.setNetworkClientIdForDomain(\n          domain,\n          this.messagingSystem.call('NetworkController:getState')\n            .selectedNetworkClientId,\n        ),\n      );\n\n    this.messagingSystem.subscribe(\n      'PermissionController:stateChange',\n      (_, patches) => {\n        patches.forEach(({ op, path }) => {\n          const isChangingSubject =\n            path[0] === 'subjects' && path[1] !== undefined;\n          if (isChangingSubject && typeof path[1] === 'string') {\n            const domain = path[1];\n            if (op === 'add' && this.state.domains[domain] === undefined) {\n              this.setNetworkClientIdForDomain(\n                domain,\n                this.messagingSystem.call('NetworkController:getState')\n                  .selectedNetworkClientId,\n              );\n            } else if (\n              op === 'remove' &&\n              this.state.domains[domain] !== undefined\n            ) {\n              this.#unsetNetworkClientIdForDomain(domain);\n            }\n          }\n        });\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'NetworkController:stateChange',\n      ({ selectedNetworkClientId }, patches) => {\n        patches.forEach(({ op, path }) => {\n          // if a network is removed, update the networkClientId for all domains that were using it to the selected network\n          if (op === 'remove' && path[0] === 'networkConfigurations') {\n            const removedNetworkClientId = path[1] as NetworkClientId;\n            Object.entries(this.state.domains).forEach(\n              ([domain, networkClientIdForDomain]) => {\n                if (networkClientIdForDomain === removedNetworkClientId) {\n                  this.setNetworkClientIdForDomain(\n                    domain,\n                    selectedNetworkClientId,\n                  );\n                }\n              },\n            );\n          }\n        });\n      },\n    );\n\n    onPreferencesStateChange(({ useRequestQueue }) => {\n      if (this.#useRequestQueuePreference !== useRequestQueue) {\n        if (!useRequestQueue) {\n          // Loop through all domains and points each domain's proxy\n          // to the NetworkController's own proxy of the globally selected networkClient\n          Object.keys(this.state.domains).forEach((domain) => {\n            this.#unsetNetworkClientIdForDomain(domain);\n          });\n        } else {\n          this.#resetAllPermissionedDomains();\n        }\n        this.#useRequestQueuePreference = useRequestQueue;\n      }\n    });\n  }\n\n  #registerMessageHandlers(): void {\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      this.getNetworkClientIdForDomain.bind(this),\n    );\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,\n      this.setNetworkClientIdForDomain.bind(this),\n    );\n  }\n\n  #setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    const networkClient = this.messagingSystem.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    const networkProxy = this.getProviderAndBlockTracker(domain);\n    networkProxy.provider.setTarget(networkClient.provider);\n    networkProxy.blockTracker.setTarget(networkClient.blockTracker);\n\n    this.update((state) => {\n      state.domains[domain] = networkClientId;\n    });\n  }\n\n  /**\n   * This method is used when a domain is removed from the PermissionsController.\n   * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.\n   *\n   * @param domain - The domain for which to unset the network client ID.\n   */\n  #unsetNetworkClientIdForDomain(domain: Domain) {\n    const globallySelectedNetworkClient = this.messagingSystem.call(\n      'NetworkController:getSelectedNetworkClient',\n    );\n    const networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy && globallySelectedNetworkClient) {\n      networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);\n      networkProxy.blockTracker.setTarget(\n        globallySelectedNetworkClient.blockTracker,\n      );\n    } else if (networkProxy) {\n      this.#domainProxyMap.delete(domain);\n    }\n    this.update((state) => {\n      delete state.domains[domain];\n    });\n  }\n\n  #domainHasPermissions(domain: Domain): boolean {\n    return this.messagingSystem.call(\n      'PermissionController:hasPermissions',\n      domain,\n    );\n  }\n\n  // Loop through all domains and for those with permissions it points that domain's proxy\n  // to an unproxied instance of the globally selected network client.\n  // NOT the NetworkController's proxy of the globally selected networkClient\n  #resetAllPermissionedDomains() {\n    this.#domainProxyMap.forEach((_: NetworkProxy, domain: string) => {\n      const { selectedNetworkClientId } = this.messagingSystem.call(\n        'NetworkController:getState',\n      );\n      // can't use public setNetworkClientIdForDomain because it will throw an error\n      // rather than simply skip if the domain doesn't have permissions which can happen\n      // in this case since proxies are added for each site the user visits\n      if (this.#domainHasPermissions(domain)) {\n        this.#setNetworkClientIdForDomain(domain, selectedNetworkClientId);\n      }\n    });\n  }\n\n  setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    if (domain === METAMASK_DOMAIN) {\n      throw new Error(\n        `NetworkClientId for domain \"${METAMASK_DOMAIN}\" cannot be set on the SelectedNetworkController`,\n      );\n    }\n\n    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {\n      return;\n    }\n\n    if (!this.#domainHasPermissions(domain)) {\n      throw new Error(\n        'NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions',\n      );\n    }\n\n    this.#setNetworkClientIdForDomain(domain, networkClientId);\n  }\n\n  getNetworkClientIdForDomain(domain: Domain): NetworkClientId {\n    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } =\n      this.messagingSystem.call('NetworkController:getState');\n    if (!this.#useRequestQueuePreference) {\n      return metamaskSelectedNetworkClientId;\n    }\n    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @param domain - the domain for the provider\n   * @returns The proxy and block tracker proxies.\n   */\n  getProviderAndBlockTracker(domain: Domain): NetworkProxy {\n    // If the domain is 'metamask' or a snap, return the NetworkController's globally selected network client proxy\n    if (\n      domain === METAMASK_DOMAIN ||\n      snapsPrefixes.some((prefix) => domain.startsWith(prefix))\n    ) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getSelectedNetworkClient',\n      );\n      if (networkClient === undefined) {\n        throw new Error('Selected network not initialized');\n      }\n      return networkClient;\n    }\n\n    let networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy === undefined) {\n      let networkClient;\n      if (\n        this.#useRequestQueuePreference &&\n        this.#domainHasPermissions(domain)\n      ) {\n        const networkClientId = this.getNetworkClientIdForDomain(domain);\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getNetworkClientById',\n          networkClientId,\n        );\n      } else {\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getSelectedNetworkClient',\n        );\n        if (networkClient === undefined) {\n          throw new Error('Selected network not initialized');\n        }\n      }\n      networkProxy = {\n        provider: createEventEmitterProxy(networkClient.provider),\n        blockTracker: createEventEmitterProxy(networkClient.blockTracker, {\n          eventFilter: 'skipInternal',\n        }),\n      };\n      this.#domainProxyMap.set(domain, networkProxy);\n    }\n    return networkProxy;\n  }\n}\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-S4D42VCM.mjs b/dist/chunk-S4D42VCM.mjs
+deleted file mode 100644
+index a2a93432c8799383bef3bbe2cf3adf1ac3bda043..0000000000000000000000000000000000000000
+--- a/dist/chunk-S4D42VCM.mjs
++++ /dev/null
+@@ -1,281 +0,0 @@
+-var __accessCheck = (obj, member, msg) => {
+-  if (!member.has(obj))
+-    throw TypeError("Cannot " + msg);
+-};
+-var __privateGet = (obj, member, getter) => {
+-  __accessCheck(obj, member, "read from private field");
+-  return getter ? getter.call(obj) : member.get(obj);
+-};
+-var __privateAdd = (obj, member, value) => {
+-  if (member.has(obj))
+-    throw TypeError("Cannot add the same private member more than once");
+-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+-};
+-var __privateSet = (obj, member, value, setter) => {
+-  __accessCheck(obj, member, "write to private field");
+-  setter ? setter.call(obj, value) : member.set(obj, value);
+-  return value;
+-};
+-var __privateMethod = (obj, member, method) => {
+-  __accessCheck(obj, member, "access private method");
+-  return method;
+-};
+-
+-// src/SelectedNetworkController.ts
+-import { BaseController } from "@metamask/base-controller";
+-import { createEventEmitterProxy } from "@metamask/swappable-obj-proxy";
+-var controllerName = "SelectedNetworkController";
+-var stateMetadata = {
+-  domains: { persist: true, anonymous: false }
+-};
+-var getDefaultState = () => ({ domains: {} });
+-var snapsPrefixes = ["npm:", "local:"];
+-var METAMASK_DOMAIN = "metamask";
+-var SelectedNetworkControllerActionTypes = {
+-  getState: `${controllerName}:getState`,
+-  getNetworkClientIdForDomain: `${controllerName}:getNetworkClientIdForDomain`,
+-  setNetworkClientIdForDomain: `${controllerName}:setNetworkClientIdForDomain`
+-};
+-var SelectedNetworkControllerEventTypes = {
+-  stateChange: `${controllerName}:stateChange`
+-};
+-var _domainProxyMap, _useRequestQueuePreference, _registerMessageHandlers, registerMessageHandlers_fn, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn, _domainHasPermissions, domainHasPermissions_fn, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn;
+-var SelectedNetworkController = class extends BaseController {
+-  /**
+-   * Construct a SelectedNetworkController controller.
+-   *
+-   * @param options - The controller options.
+-   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.
+-   * @param options.state - The controllers initial state.
+-   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.
+-   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.
+-   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.
+-   */
+-  constructor({
+-    messenger,
+-    state = getDefaultState(),
+-    useRequestQueuePreference,
+-    onPreferencesStateChange,
+-    domainProxyMap
+-  }) {
+-    super({
+-      name: controllerName,
+-      metadata: stateMetadata,
+-      messenger,
+-      state
+-    });
+-    __privateAdd(this, _registerMessageHandlers);
+-    __privateAdd(this, _setNetworkClientIdForDomain);
+-    /**
+-     * This method is used when a domain is removed from the PermissionsController.
+-     * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.
+-     *
+-     * @param domain - The domain for which to unset the network client ID.
+-     */
+-    __privateAdd(this, _unsetNetworkClientIdForDomain);
+-    __privateAdd(this, _domainHasPermissions);
+-    // Loop through all domains and for those with permissions it points that domain's proxy
+-    // to an unproxied instance of the globally selected network client.
+-    // NOT the NetworkController's proxy of the globally selected networkClient
+-    __privateAdd(this, _resetAllPermissionedDomains);
+-    __privateAdd(this, _domainProxyMap, void 0);
+-    __privateAdd(this, _useRequestQueuePreference, void 0);
+-    __privateSet(this, _useRequestQueuePreference, useRequestQueuePreference);
+-    __privateSet(this, _domainProxyMap, domainProxyMap);
+-    __privateMethod(this, _registerMessageHandlers, registerMessageHandlers_fn).call(this);
+-    this.messagingSystem.call("PermissionController:getSubjectNames").filter((domain) => this.state.domains[domain] === void 0).forEach(
+-      (domain) => this.setNetworkClientIdForDomain(
+-        domain,
+-        this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
+-      )
+-    );
+-    this.messagingSystem.subscribe(
+-      "PermissionController:stateChange",
+-      (_, patches) => {
+-        patches.forEach(({ op, path }) => {
+-          const isChangingSubject = path[0] === "subjects" && path[1] !== void 0;
+-          if (isChangingSubject && typeof path[1] === "string") {
+-            const domain = path[1];
+-            if (op === "add" && this.state.domains[domain] === void 0) {
+-              this.setNetworkClientIdForDomain(
+-                domain,
+-                this.messagingSystem.call("NetworkController:getState").selectedNetworkClientId
+-              );
+-            } else if (op === "remove" && this.state.domains[domain] !== void 0) {
+-              __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
+-            }
+-          }
+-        });
+-      }
+-    );
+-    this.messagingSystem.subscribe(
+-      "NetworkController:stateChange",
+-      ({ selectedNetworkClientId }, patches) => {
+-        patches.forEach(({ op, path }) => {
+-          if (op === "remove" && path[0] === "networkConfigurations") {
+-            const removedNetworkClientId = path[1];
+-            Object.entries(this.state.domains).forEach(
+-              ([domain, networkClientIdForDomain]) => {
+-                if (networkClientIdForDomain === removedNetworkClientId) {
+-                  this.setNetworkClientIdForDomain(
+-                    domain,
+-                    selectedNetworkClientId
+-                  );
+-                }
+-              }
+-            );
+-          }
+-        });
+-      }
+-    );
+-    onPreferencesStateChange(({ useRequestQueue }) => {
+-      if (__privateGet(this, _useRequestQueuePreference) !== useRequestQueue) {
+-        if (!useRequestQueue) {
+-          Object.keys(this.state.domains).forEach((domain) => {
+-            __privateMethod(this, _unsetNetworkClientIdForDomain, unsetNetworkClientIdForDomain_fn).call(this, domain);
+-          });
+-        } else {
+-          __privateMethod(this, _resetAllPermissionedDomains, resetAllPermissionedDomains_fn).call(this);
+-        }
+-        __privateSet(this, _useRequestQueuePreference, useRequestQueue);
+-      }
+-    });
+-  }
+-  setNetworkClientIdForDomain(domain, networkClientId) {
+-    if (domain === METAMASK_DOMAIN) {
+-      throw new Error(
+-        `NetworkClientId for domain "${METAMASK_DOMAIN}" cannot be set on the SelectedNetworkController`
+-      );
+-    }
+-    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
+-      return;
+-    }
+-    if (!__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
+-      throw new Error(
+-        "NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions"
+-      );
+-    }
+-    __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, networkClientId);
+-  }
+-  getNetworkClientIdForDomain(domain) {
+-    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } = this.messagingSystem.call("NetworkController:getState");
+-    if (!__privateGet(this, _useRequestQueuePreference)) {
+-      return metamaskSelectedNetworkClientId;
+-    }
+-    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;
+-  }
+-  /**
+-   * Accesses the provider and block tracker for the currently selected network.
+-   *
+-   * @param domain - the domain for the provider
+-   * @returns The proxy and block tracker proxies.
+-   */
+-  getProviderAndBlockTracker(domain) {
+-    if (domain === METAMASK_DOMAIN || snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {
+-      const networkClient = this.messagingSystem.call(
+-        "NetworkController:getSelectedNetworkClient"
+-      );
+-      if (networkClient === void 0) {
+-        throw new Error("Selected network not initialized");
+-      }
+-      return networkClient;
+-    }
+-    let networkProxy = __privateGet(this, _domainProxyMap).get(domain);
+-    if (networkProxy === void 0) {
+-      let networkClient;
+-      if (__privateGet(this, _useRequestQueuePreference) && __privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
+-        const networkClientId = this.getNetworkClientIdForDomain(domain);
+-        networkClient = this.messagingSystem.call(
+-          "NetworkController:getNetworkClientById",
+-          networkClientId
+-        );
+-      } else {
+-        networkClient = this.messagingSystem.call(
+-          "NetworkController:getSelectedNetworkClient"
+-        );
+-        if (networkClient === void 0) {
+-          throw new Error("Selected network not initialized");
+-        }
+-      }
+-      networkProxy = {
+-        provider: createEventEmitterProxy(networkClient.provider),
+-        blockTracker: createEventEmitterProxy(networkClient.blockTracker, {
+-          eventFilter: "skipInternal"
+-        })
+-      };
+-      __privateGet(this, _domainProxyMap).set(domain, networkProxy);
+-    }
+-    return networkProxy;
+-  }
+-};
+-_domainProxyMap = new WeakMap();
+-_useRequestQueuePreference = new WeakMap();
+-_registerMessageHandlers = new WeakSet();
+-registerMessageHandlers_fn = function() {
+-  this.messagingSystem.registerActionHandler(
+-    SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
+-    this.getNetworkClientIdForDomain.bind(this)
+-  );
+-  this.messagingSystem.registerActionHandler(
+-    SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,
+-    this.setNetworkClientIdForDomain.bind(this)
+-  );
+-};
+-_setNetworkClientIdForDomain = new WeakSet();
+-setNetworkClientIdForDomain_fn = function(domain, networkClientId) {
+-  const networkClient = this.messagingSystem.call(
+-    "NetworkController:getNetworkClientById",
+-    networkClientId
+-  );
+-  const networkProxy = this.getProviderAndBlockTracker(domain);
+-  networkProxy.provider.setTarget(networkClient.provider);
+-  networkProxy.blockTracker.setTarget(networkClient.blockTracker);
+-  this.update((state) => {
+-    state.domains[domain] = networkClientId;
+-  });
+-};
+-_unsetNetworkClientIdForDomain = new WeakSet();
+-unsetNetworkClientIdForDomain_fn = function(domain) {
+-  const globallySelectedNetworkClient = this.messagingSystem.call(
+-    "NetworkController:getSelectedNetworkClient"
+-  );
+-  const networkProxy = __privateGet(this, _domainProxyMap).get(domain);
+-  if (networkProxy && globallySelectedNetworkClient) {
+-    networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);
+-    networkProxy.blockTracker.setTarget(
+-      globallySelectedNetworkClient.blockTracker
+-    );
+-  } else if (networkProxy) {
+-    __privateGet(this, _domainProxyMap).delete(domain);
+-  }
+-  this.update((state) => {
+-    delete state.domains[domain];
+-  });
+-};
+-_domainHasPermissions = new WeakSet();
+-domainHasPermissions_fn = function(domain) {
+-  return this.messagingSystem.call(
+-    "PermissionController:hasPermissions",
+-    domain
+-  );
+-};
+-_resetAllPermissionedDomains = new WeakSet();
+-resetAllPermissionedDomains_fn = function() {
+-  __privateGet(this, _domainProxyMap).forEach((_, domain) => {
+-    const { selectedNetworkClientId } = this.messagingSystem.call(
+-      "NetworkController:getState"
+-    );
+-    if (__privateMethod(this, _domainHasPermissions, domainHasPermissions_fn).call(this, domain)) {
+-      __privateMethod(this, _setNetworkClientIdForDomain, setNetworkClientIdForDomain_fn).call(this, domain, selectedNetworkClientId);
+-    }
+-  });
+-};
+-
+-export {
+-  controllerName,
+-  METAMASK_DOMAIN,
+-  SelectedNetworkControllerActionTypes,
+-  SelectedNetworkControllerEventTypes,
+-  SelectedNetworkController
+-};
+-//# sourceMappingURL=chunk-S4D42VCM.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-S4D42VCM.mjs.map b/dist/chunk-S4D42VCM.mjs.map
+deleted file mode 100644
+index b05eba0cbdeb5af4729d92e7b8de695c2d2a75e3..0000000000000000000000000000000000000000
+--- a/dist/chunk-S4D42VCM.mjs.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/SelectedNetworkController.ts"],"sourcesContent":["import type { RestrictedControllerMessenger } from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type {\n  BlockTrackerProxy,\n  NetworkClientId,\n  NetworkControllerGetNetworkClientByIdAction,\n  NetworkControllerGetSelectedNetworkClientAction,\n  NetworkControllerGetStateAction,\n  NetworkControllerStateChangeEvent,\n  ProviderProxy,\n} from '@metamask/network-controller';\nimport type {\n  PermissionControllerStateChange,\n  GetSubjects as PermissionControllerGetSubjectsAction,\n  HasPermissions as PermissionControllerHasPermissions,\n} from '@metamask/permission-controller';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { Patch } from 'immer';\n\nexport const controllerName = 'SelectedNetworkController';\n\nconst stateMetadata = {\n  domains: { persist: true, anonymous: false },\n};\n\nconst getDefaultState = () => ({ domains: {} });\n\n// npm and local are currently the only valid prefixes for snap domains\n// TODO: eventually we maybe want to pull this in from snaps-utils to ensure it stays in sync\n// For now it seems like overkill to add a dependency for this one constant\n// https://github.com/MetaMask/snaps/blob/2beee7803bfe9e540788a3558b546b9f55dc3cb4/packages/snaps-utils/src/types.ts#L120\nconst snapsPrefixes = ['npm:', 'local:'] as const;\n\nexport type Domain = string;\n\nexport const METAMASK_DOMAIN = 'metamask' as const;\n\nexport const SelectedNetworkControllerActionTypes = {\n  getState: `${controllerName}:getState` as const,\n  getNetworkClientIdForDomain:\n    `${controllerName}:getNetworkClientIdForDomain` as const,\n  setNetworkClientIdForDomain:\n    `${controllerName}:setNetworkClientIdForDomain` as const,\n};\n\nexport const SelectedNetworkControllerEventTypes = {\n  stateChange: `${controllerName}:stateChange` as const,\n};\n\nexport type SelectedNetworkControllerState = {\n  domains: Record<Domain, NetworkClientId>;\n};\n\nexport type SelectedNetworkControllerStateChangeEvent = {\n  type: typeof SelectedNetworkControllerEventTypes.stateChange;\n  payload: [SelectedNetworkControllerState, Patch[]];\n};\n\nexport type SelectedNetworkControllerGetSelectedNetworkStateAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getState;\n  handler: () => SelectedNetworkControllerState;\n};\n\nexport type SelectedNetworkControllerGetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain;\n  handler: SelectedNetworkController['getNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerSetNetworkClientIdForDomainAction = {\n  type: typeof SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain;\n  handler: SelectedNetworkController['setNetworkClientIdForDomain'];\n};\n\nexport type SelectedNetworkControllerActions =\n  | SelectedNetworkControllerGetSelectedNetworkStateAction\n  | SelectedNetworkControllerGetNetworkClientIdForDomainAction\n  | SelectedNetworkControllerSetNetworkClientIdForDomainAction;\n\nexport type AllowedActions =\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetStateAction\n  | PermissionControllerHasPermissions\n  | PermissionControllerGetSubjectsAction;\n\nexport type SelectedNetworkControllerEvents =\n  SelectedNetworkControllerStateChangeEvent;\n\nexport type AllowedEvents =\n  | NetworkControllerStateChangeEvent\n  | PermissionControllerStateChange;\n\nexport type SelectedNetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof controllerName,\n  SelectedNetworkControllerActions | AllowedActions,\n  SelectedNetworkControllerEvents | AllowedEvents,\n  AllowedActions['type'],\n  AllowedEvents['type']\n>;\n\nexport type SelectedNetworkControllerOptions = {\n  state?: SelectedNetworkControllerState;\n  messenger: SelectedNetworkControllerMessenger;\n  useRequestQueuePreference: boolean;\n  onPreferencesStateChange: (\n    listener: (preferencesState: { useRequestQueue: boolean }) => void,\n  ) => void;\n  domainProxyMap: Map<Domain, NetworkProxy>;\n};\n\nexport type NetworkProxy = {\n  provider: ProviderProxy;\n  blockTracker: BlockTrackerProxy;\n};\n\n/**\n * Controller for getting and setting the network for a particular domain.\n */\nexport class SelectedNetworkController extends BaseController<\n  typeof controllerName,\n  SelectedNetworkControllerState,\n  SelectedNetworkControllerMessenger\n> {\n  #domainProxyMap: Map<Domain, NetworkProxy>;\n\n  #useRequestQueuePreference: boolean;\n\n  /**\n   * Construct a SelectedNetworkController controller.\n   *\n   * @param options - The controller options.\n   * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.\n   * @param options.state - The controllers initial state.\n   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.\n   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.\n   * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.\n   */\n  constructor({\n    messenger,\n    state = getDefaultState(),\n    useRequestQueuePreference,\n    onPreferencesStateChange,\n    domainProxyMap,\n  }: SelectedNetworkControllerOptions) {\n    super({\n      name: controllerName,\n      metadata: stateMetadata,\n      messenger,\n      state,\n    });\n    this.#useRequestQueuePreference = useRequestQueuePreference;\n    this.#domainProxyMap = domainProxyMap;\n    this.#registerMessageHandlers();\n\n    // this is fetching all the dapp permissions from the PermissionsController and looking for any domains that are not in domains state in this controller. Then we take any missing domains and add them to state here, setting it with the globally selected networkClientId (fetched from the NetworkController)\n    this.messagingSystem\n      .call('PermissionController:getSubjectNames')\n      .filter((domain) => this.state.domains[domain] === undefined)\n      .forEach((domain) =>\n        this.setNetworkClientIdForDomain(\n          domain,\n          this.messagingSystem.call('NetworkController:getState')\n            .selectedNetworkClientId,\n        ),\n      );\n\n    this.messagingSystem.subscribe(\n      'PermissionController:stateChange',\n      (_, patches) => {\n        patches.forEach(({ op, path }) => {\n          const isChangingSubject =\n            path[0] === 'subjects' && path[1] !== undefined;\n          if (isChangingSubject && typeof path[1] === 'string') {\n            const domain = path[1];\n            if (op === 'add' && this.state.domains[domain] === undefined) {\n              this.setNetworkClientIdForDomain(\n                domain,\n                this.messagingSystem.call('NetworkController:getState')\n                  .selectedNetworkClientId,\n              );\n            } else if (\n              op === 'remove' &&\n              this.state.domains[domain] !== undefined\n            ) {\n              this.#unsetNetworkClientIdForDomain(domain);\n            }\n          }\n        });\n      },\n    );\n\n    this.messagingSystem.subscribe(\n      'NetworkController:stateChange',\n      ({ selectedNetworkClientId }, patches) => {\n        patches.forEach(({ op, path }) => {\n          // if a network is removed, update the networkClientId for all domains that were using it to the selected network\n          if (op === 'remove' && path[0] === 'networkConfigurations') {\n            const removedNetworkClientId = path[1] as NetworkClientId;\n            Object.entries(this.state.domains).forEach(\n              ([domain, networkClientIdForDomain]) => {\n                if (networkClientIdForDomain === removedNetworkClientId) {\n                  this.setNetworkClientIdForDomain(\n                    domain,\n                    selectedNetworkClientId,\n                  );\n                }\n              },\n            );\n          }\n        });\n      },\n    );\n\n    onPreferencesStateChange(({ useRequestQueue }) => {\n      if (this.#useRequestQueuePreference !== useRequestQueue) {\n        if (!useRequestQueue) {\n          // Loop through all domains and points each domain's proxy\n          // to the NetworkController's own proxy of the globally selected networkClient\n          Object.keys(this.state.domains).forEach((domain) => {\n            this.#unsetNetworkClientIdForDomain(domain);\n          });\n        } else {\n          this.#resetAllPermissionedDomains();\n        }\n        this.#useRequestQueuePreference = useRequestQueue;\n      }\n    });\n  }\n\n  #registerMessageHandlers(): void {\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      this.getNetworkClientIdForDomain.bind(this),\n    );\n    this.messagingSystem.registerActionHandler(\n      SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,\n      this.setNetworkClientIdForDomain.bind(this),\n    );\n  }\n\n  #setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    const networkClient = this.messagingSystem.call(\n      'NetworkController:getNetworkClientById',\n      networkClientId,\n    );\n    const networkProxy = this.getProviderAndBlockTracker(domain);\n    networkProxy.provider.setTarget(networkClient.provider);\n    networkProxy.blockTracker.setTarget(networkClient.blockTracker);\n\n    this.update((state) => {\n      state.domains[domain] = networkClientId;\n    });\n  }\n\n  /**\n   * This method is used when a domain is removed from the PermissionsController.\n   * It will remove re-point the network proxy to the globally selected network in the domainProxyMap or, if no globally selected network client is available, delete the proxy.\n   *\n   * @param domain - The domain for which to unset the network client ID.\n   */\n  #unsetNetworkClientIdForDomain(domain: Domain) {\n    const globallySelectedNetworkClient = this.messagingSystem.call(\n      'NetworkController:getSelectedNetworkClient',\n    );\n    const networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy && globallySelectedNetworkClient) {\n      networkProxy.provider.setTarget(globallySelectedNetworkClient.provider);\n      networkProxy.blockTracker.setTarget(\n        globallySelectedNetworkClient.blockTracker,\n      );\n    } else if (networkProxy) {\n      this.#domainProxyMap.delete(domain);\n    }\n    this.update((state) => {\n      delete state.domains[domain];\n    });\n  }\n\n  #domainHasPermissions(domain: Domain): boolean {\n    return this.messagingSystem.call(\n      'PermissionController:hasPermissions',\n      domain,\n    );\n  }\n\n  // Loop through all domains and for those with permissions it points that domain's proxy\n  // to an unproxied instance of the globally selected network client.\n  // NOT the NetworkController's proxy of the globally selected networkClient\n  #resetAllPermissionedDomains() {\n    this.#domainProxyMap.forEach((_: NetworkProxy, domain: string) => {\n      const { selectedNetworkClientId } = this.messagingSystem.call(\n        'NetworkController:getState',\n      );\n      // can't use public setNetworkClientIdForDomain because it will throw an error\n      // rather than simply skip if the domain doesn't have permissions which can happen\n      // in this case since proxies are added for each site the user visits\n      if (this.#domainHasPermissions(domain)) {\n        this.#setNetworkClientIdForDomain(domain, selectedNetworkClientId);\n      }\n    });\n  }\n\n  setNetworkClientIdForDomain(\n    domain: Domain,\n    networkClientId: NetworkClientId,\n  ) {\n    if (domain === METAMASK_DOMAIN) {\n      throw new Error(\n        `NetworkClientId for domain \"${METAMASK_DOMAIN}\" cannot be set on the SelectedNetworkController`,\n      );\n    }\n\n    if (snapsPrefixes.some((prefix) => domain.startsWith(prefix))) {\n      return;\n    }\n\n    if (!this.#domainHasPermissions(domain)) {\n      throw new Error(\n        'NetworkClientId for domain cannot be called with a domain that has not yet been granted permissions',\n      );\n    }\n\n    this.#setNetworkClientIdForDomain(domain, networkClientId);\n  }\n\n  getNetworkClientIdForDomain(domain: Domain): NetworkClientId {\n    const { selectedNetworkClientId: metamaskSelectedNetworkClientId } =\n      this.messagingSystem.call('NetworkController:getState');\n    if (!this.#useRequestQueuePreference) {\n      return metamaskSelectedNetworkClientId;\n    }\n    return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @param domain - the domain for the provider\n   * @returns The proxy and block tracker proxies.\n   */\n  getProviderAndBlockTracker(domain: Domain): NetworkProxy {\n    // If the domain is 'metamask' or a snap, return the NetworkController's globally selected network client proxy\n    if (\n      domain === METAMASK_DOMAIN ||\n      snapsPrefixes.some((prefix) => domain.startsWith(prefix))\n    ) {\n      const networkClient = this.messagingSystem.call(\n        'NetworkController:getSelectedNetworkClient',\n      );\n      if (networkClient === undefined) {\n        throw new Error('Selected network not initialized');\n      }\n      return networkClient;\n    }\n\n    let networkProxy = this.#domainProxyMap.get(domain);\n    if (networkProxy === undefined) {\n      let networkClient;\n      if (\n        this.#useRequestQueuePreference &&\n        this.#domainHasPermissions(domain)\n      ) {\n        const networkClientId = this.getNetworkClientIdForDomain(domain);\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getNetworkClientById',\n          networkClientId,\n        );\n      } else {\n        networkClient = this.messagingSystem.call(\n          'NetworkController:getSelectedNetworkClient',\n        );\n        if (networkClient === undefined) {\n          throw new Error('Selected network not initialized');\n        }\n      }\n      networkProxy = {\n        provider: createEventEmitterProxy(networkClient.provider),\n        blockTracker: createEventEmitterProxy(networkClient.blockTracker, {\n          eventFilter: 'skipInternal',\n        }),\n      };\n      this.#domainProxyMap.set(domain, networkProxy);\n    }\n    return networkProxy;\n  }\n}\n"],"mappings":"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","names":[]}
+\ No newline at end of file
+diff --git a/dist/chunk-ZY7ETPVE.mjs b/dist/chunk-ZY7ETPVE.mjs
+deleted file mode 100644
+index 50a21cfa6988a3e32a4c1a20f9113eaec7bf99ac..0000000000000000000000000000000000000000
+--- a/dist/chunk-ZY7ETPVE.mjs
++++ /dev/null
+@@ -1,23 +0,0 @@
+-import {
+-  SelectedNetworkControllerActionTypes
+-} from "./chunk-S4D42VCM.mjs";
+-
+-// src/SelectedNetworkMiddleware.ts
+-var createSelectedNetworkMiddleware = (messenger) => {
+-  const getNetworkClientIdForDomain = (origin) => messenger.call(
+-    SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
+-    origin
+-  );
+-  return (req, _, next) => {
+-    if (!req.origin) {
+-      throw new Error("Request object is lacking an 'origin'");
+-    }
+-    req.networkClientId = getNetworkClientIdForDomain(req.origin);
+-    return next();
+-  };
+-};
+-
+-export {
+-  createSelectedNetworkMiddleware
+-};
+-//# sourceMappingURL=chunk-ZY7ETPVE.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-ZY7ETPVE.mjs.map b/dist/chunk-ZY7ETPVE.mjs.map
+deleted file mode 100644
+index fbcfd73d57f291b4f129caa47ef0c9614987cc30..0000000000000000000000000000000000000000
+--- a/dist/chunk-ZY7ETPVE.mjs.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/SelectedNetworkMiddleware.ts"],"sourcesContent":["import type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport type { Json, JsonRpcParams, JsonRpcRequest } from '@metamask/utils';\n\nimport type { SelectedNetworkControllerMessenger } from './SelectedNetworkController';\nimport { SelectedNetworkControllerActionTypes } from './SelectedNetworkController';\n\nexport type SelectedNetworkMiddlewareJsonRpcRequest = JsonRpcRequest & {\n  networkClientId?: NetworkClientId;\n  origin?: string;\n};\n\nexport const createSelectedNetworkMiddleware = (\n  messenger: SelectedNetworkControllerMessenger,\n): JsonRpcMiddleware<JsonRpcParams, Json> => {\n  const getNetworkClientIdForDomain = (origin: string) =>\n    messenger.call(\n      SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,\n      origin,\n    );\n\n  return (req: SelectedNetworkMiddlewareJsonRpcRequest, _, next) => {\n    if (!req.origin) {\n      throw new Error(\"Request object is lacking an 'origin'\");\n    }\n\n    req.networkClientId = getNetworkClientIdForDomain(req.origin);\n    return next();\n  };\n};\n"],"mappings":";;;;;AAYO,IAAM,kCAAkC,CAC7C,cAC2C;AAC3C,QAAM,8BAA8B,CAAC,WACnC,UAAU;AAAA,IACR,qCAAqC;AAAA,IACrC;AAAA,EACF;AAEF,SAAO,CAAC,KAA8C,GAAG,SAAS;AAChE,QAAI,CAAC,IAAI,QAAQ;AACf,YAAM,IAAI,MAAM,uCAAuC;AAAA,IACzD;AAEA,QAAI,kBAAkB,4BAA4B,IAAI,MAAM;AAC5D,WAAO,KAAK;AAAA,EACd;AACF;","names":[]}
+\ No newline at end of file
+diff --git a/dist/index.js b/dist/index.js
+index 4c9b1798d88466e11abbcf1c0616f2617d73ab5a..cd71df24b3f6424f640c62ce8a7938fcf15ae480 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -1,17 +1,17 @@
+ "use strict";Object.defineProperty(exports, "__esModule", {value: true});
+ 
+-var _chunk6W2ETVOHjs = require('./chunk-6W2ETVOH.js');
++var _chunkANSSZMDIjs = require('./chunk-ANSSZMDI.js');
+ 
+ 
+ 
+ 
+ 
+-var _chunkOGUVGN6Rjs = require('./chunk-OGUVGN6R.js');
++var _chunkCECZWJ42js = require('./chunk-CECZWJ42.js');
+ 
+ 
+ 
+ 
+ 
+ 
+-exports.METAMASK_DOMAIN = _chunkOGUVGN6Rjs.METAMASK_DOMAIN; exports.SelectedNetworkController = _chunkOGUVGN6Rjs.SelectedNetworkController; exports.SelectedNetworkControllerActionTypes = _chunkOGUVGN6Rjs.SelectedNetworkControllerActionTypes; exports.SelectedNetworkControllerEventTypes = _chunkOGUVGN6Rjs.SelectedNetworkControllerEventTypes; exports.createSelectedNetworkMiddleware = _chunk6W2ETVOHjs.createSelectedNetworkMiddleware;
++exports.METAMASK_DOMAIN = _chunkCECZWJ42js.METAMASK_DOMAIN; exports.SelectedNetworkController = _chunkCECZWJ42js.SelectedNetworkController; exports.SelectedNetworkControllerActionTypes = _chunkCECZWJ42js.SelectedNetworkControllerActionTypes; exports.SelectedNetworkControllerEventTypes = _chunkCECZWJ42js.SelectedNetworkControllerEventTypes; exports.createSelectedNetworkMiddleware = _chunkANSSZMDIjs.createSelectedNetworkMiddleware;
+ //# sourceMappingURL=index.js.map
+\ No newline at end of file
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 8780cadd8a535b745960ebde8d7aa49989451ef6..0c7b103ca9cb6a604bf5f831bccef3002abd7c5f 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -1,12 +1,12 @@
+ import {
+   createSelectedNetworkMiddleware
+-} from "./chunk-ZY7ETPVE.mjs";
++} from "./chunk-HFN7TKJS.mjs";
+ import {
+   METAMASK_DOMAIN,
+   SelectedNetworkController,
+   SelectedNetworkControllerActionTypes,
+   SelectedNetworkControllerEventTypes
+-} from "./chunk-S4D42VCM.mjs";
++} from "./chunk-7DSTEJNI.mjs";
+ export {
+   METAMASK_DOMAIN,
+   SelectedNetworkController,
+diff --git a/dist/tsconfig.build.tsbuildinfo b/dist/tsconfig.build.tsbuildinfo
+index 0f3a7a7e18a90ebf82da9962818a7e552c892d9c..8a2c9ef72e1d3a4302d4bda2c3e634414225fd17 100644
+--- a/dist/tsconfig.build.tsbuildinfo
++++ b/dist/tsconfig.build.tsbuildinfo
+@@ -1 +1 @@
+-{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createprovider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/basecontrollerv1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/assert.d.ts","../../../node_modules/@types/node/assert/strict.d.ts","../../../node_modules/@types/node/globals.d.ts","../../../node_modules/@types/node/async_hooks.d.ts","../../../node_modules/@types/node/buffer.d.ts","../../../node_modules/@types/node/child_process.d.ts","../../../node_modules/@types/node/cluster.d.ts","../../../node_modules/@types/node/console.d.ts","../../../node_modules/@types/node/constants.d.ts","../../../node_modules/@types/node/crypto.d.ts","../../../node_modules/@types/node/dgram.d.ts","../../../node_modules/@types/node/diagnostics_channel.d.ts","../../../node_modules/@types/node/dns.d.ts","../../../node_modules/@types/node/dns/promises.d.ts","../../../node_modules/@types/node/domain.d.ts","../../../node_modules/@types/node/events.d.ts","../../../node_modules/@types/node/fs.d.ts","../../../node_modules/@types/node/fs/promises.d.ts","../../../node_modules/@types/node/http.d.ts","../../../node_modules/@types/node/http2.d.ts","../../../node_modules/@types/node/https.d.ts","../../../node_modules/@types/node/inspector.d.ts","../../../node_modules/@types/node/module.d.ts","../../../node_modules/@types/node/net.d.ts","../../../node_modules/@types/node/os.d.ts","../../../node_modules/@types/node/path.d.ts","../../../node_modules/@types/node/perf_hooks.d.ts","../../../node_modules/@types/node/process.d.ts","../../../node_modules/@types/node/punycode.d.ts","../../../node_modules/@types/node/querystring.d.ts","../../../node_modules/@types/node/readline.d.ts","../../../node_modules/@types/node/repl.d.ts","../../../node_modules/@types/node/stream.d.ts","../../../node_modules/@types/node/stream/promises.d.ts","../../../node_modules/@types/node/stream/consumers.d.ts","../../../node_modules/@types/node/stream/web.d.ts","../../../node_modules/@types/node/string_decoder.d.ts","../../../node_modules/@types/node/test.d.ts","../../../node_modules/@types/node/timers.d.ts","../../../node_modules/@types/node/timers/promises.d.ts","../../../node_modules/@types/node/tls.d.ts","../../../node_modules/@types/node/trace_events.d.ts","../../../node_modules/@types/node/tty.d.ts","../../../node_modules/@types/node/url.d.ts","../../../node_modules/@types/node/util.d.ts","../../../node_modules/@types/node/v8.d.ts","../../../node_modules/@types/node/vm.d.ts","../../../node_modules/@types/node/wasi.d.ts","../../../node_modules/@types/node/worker_threads.d.ts","../../../node_modules/@types/node/zlib.d.ts","../../../node_modules/@types/node/globals.global.d.ts","../../../node_modules/@types/node/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asynceventemitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacytransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/basetransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionfactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerclass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/restrictedcontrollermessenger.d.ts","../../base-controller/dist/types/controllermessenger.d.ts","../../base-controller/dist/types/basecontrollerv2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/utils.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createeventemitterproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createswappableproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../network-controller/dist/types/constants.d.ts","../../../node_modules/@metamask/safe-event-emitter/index.d.ts","../../json-rpc-engine/dist/types/jsonrpcengine.d.ts","../../json-rpc-engine/dist/types/createasyncmiddleware.d.ts","../../json-rpc-engine/dist/types/createscaffoldmiddleware.d.ts","../../json-rpc-engine/dist/types/getuniqueid.d.ts","../../json-rpc-engine/dist/types/idremapmiddleware.d.ts","../../json-rpc-engine/dist/types/mergemiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/eth-block-tracker/dist/blocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/pollingblocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/subscribeblocktracker.d.ts","../../../node_modules/eth-block-tracker/dist/index.d.ts","../../network-controller/dist/types/types.d.ts","../../network-controller/dist/types/create-auto-managed-network-client.d.ts","../../network-controller/dist/types/networkcontroller.d.ts","../../network-controller/dist/types/create-network-client.d.ts","../../network-controller/dist/types/index.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/utils.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/classes.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/errors.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/error-constants.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/index.d.ts","../../approval-controller/dist/types/approvalcontroller.d.ts","../../approval-controller/dist/types/errors.d.ts","../../approval-controller/dist/types/index.d.ts","../../permission-controller/dist/types/permission-middleware.d.ts","../../permission-controller/dist/types/subjectmetadatacontroller.d.ts","../../permission-controller/dist/types/permissioncontroller.d.ts","../../permission-controller/dist/types/permission.d.ts","../../permission-controller/dist/types/caveat.d.ts","../../permission-controller/dist/types/errors.d.ts","../../permission-controller/dist/types/utils.d.ts","../../permission-controller/dist/types/rpc-methods/getpermissions.d.ts","../../permission-controller/dist/types/rpc-methods/requestpermissions.d.ts","../../permission-controller/dist/types/rpc-methods/revokepermissions.d.ts","../../permission-controller/dist/types/rpc-methods/index.d.ts","../../permission-controller/dist/types/index.d.ts","../src/selectednetworkcontroller.ts","../src/selectednetworkmiddleware.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupsemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/difflines.d.ts","../../../node_modules/jest-diff/build/printdiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","75b22c74010ba649de1a1676a4c4b8b5bb4294fecd05089e2094429b16d7840c","e475453e7140e95542332943d3052fe4c7430ad1efce42b3e9157f1fee8cbc5f","ebfdf904255ce746c9d30117c2edef355fb19bf7650478d2405f39f0e4f302e6","f3f63b48addb8e2ea9d20bb671c3c306413b3daa39996d0ae52f63d8e32158e1","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","b4000a0a525fa921e896cbdb32ae802c9684f0fd371b5fc69e7310f7918cc2c3","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","b3d48529ae61dc27d0bfbfa2cb3e0dff8189644bd155bdf5df1e8e14669f7043","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","34693fb4a5e771e11668219221344dd1bd7d8b77ed005a1c1d965fb559be8406","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"e44ea2d6b7b853f6c81482416db43dafc11944561b810e469ae423085511ce7e","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"a7289d79eb84a59d2475b4d0136b4404be3cfdd17c3ea46b9194add1d645df01","affectsGlobalScope":true},"0bb26fa2a90ee890eed57ee812c71fa84d3d07850163ec4a204de86412cc57c1","132ca47da601c60141dd6f10bd08c70d0620177e5638439df2464ec3945b6d98",{"version":"55d2bbae076fed7269c3e16faeb32f988f558427b7a1c3bf04aa7551ab86ae90","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","cf83847c9264dcd592b6c89c1542925b899b277228687f3638614e3fa784cf76","3a41ebe7f089d50f447466b35b6cabb8b584c0994fc9809d0cd0a4ebc41e1239","7693b90b3075deaccafd5efb467bf9f2b747a3075be888652ef73e64396d8628","0c42d6cba77d9ad1cf45256ccb8489aa502fe2dbee1ec9048a29d49f5d532e73","2cf89c17245db65d175d4ef699cd68187516f9b3ae5c572fc0b9ad60f35dc223","5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"a34d65f61ec5aac5b53502c8b0bd4e00d217bccb95bf94d449e2571baa11fb8c","affectsGlobalScope":true},"8d42e5af5fb0a96a77e135ce84cc60636c9bad39d9dba043a4efe9d1bdeb3cc3","56fcc451e9065eb121c9cc4c1b9994a816306f3b0b3b1fce7ad59f0ac97a9999","8a6f12b74d3e6c4f5e1b918cb8e64ae16bc6756cf0d48bcc28a28e1bf26ca0cd","c3759b5bc5cc40f5988d86a497741a80fa91258629ae50a2b3735e774cd377cc","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","45dd82fb5aea9b12b2a90b427b28f3a014e8b2ee9b74087a5ab882841cb5fbc5",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"48b2f9302651eb31acd5be69bb4e6b35797a7fcd6b77391d10a4ccadf7dc3609","0c8c917ef15498c827bd494a0ef365e9f76deb211f8acbb86932e20489310788","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"9cdc2c6144b03822c9842505d09945bcf813b86827fdb260dd7586b63abc19bf","affectsGlobalScope":true},{"version":"2923dee3c897f03e91b54a210cdbefea7290562f0ac4b948667d4c9ee844b79e","affectsGlobalScope":true},"79169698d09a2be54b14f3bcad2575b414bf3525063fde0a1e4fcd5d6efd380e","051d939bcf77caa3cef3282708ab3a6fdfb741a7366e1d74a9e7603b67417ec3","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","a234d62ae81d012ebf23898a45672edf3e5c93ecf5a438a42b96c08dd68cde43","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","09ed02a725db002693236b6dfc49b2c6eb5557be1421d7fbe4f07cfe38211d92","09d801ff4a303d4976d4b9cb94af3a9097c4a70345e662d176975872d2998e51","c8558b01389b5f7610ac293aa612ccea2ae64d83af43b49f8142f190be1f414c","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"b10b426c56e220b5093bf8a2446ee47af47263b7b1a03f4b18e42326b231b111","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b4635ef36bee17e1304337d591c3b6b461ecdbc1876d0effbe6a581e62201fe5","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"e4507242542bd499238f693d88b2d32e22177cc508854625f87bcc9bc3fa1256","affectsGlobalScope":true},{"version":"d942354e4966a98d3a92d1b1af0b4ac06f33af3f88116743e2c304c027ca26ef","affectsGlobalScope":true},"39f0808e5be3cb38674726c21fe2eb453c55e48a901679b4ce30fef85549b892","6afd66a7432ef100027ea110449e874196381e019e30eda7e7d8ca390366b7a8","befb8a9a78ac99d8fbc3ed392810489a7b90760c7a58934e8f1c8538f581cff3","e670bdf01540d35c170fae68edfd2f288eff909936780c379d6a9103b787b22c","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"88003d9ab15507806f41b120be6d407c1afe566c2f6689ebe3a034dd5ec0c8dc","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","277983d414aa99d78655186c3ee1e1c38c302e336aff1d77b47fcdc39d8273fe","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","ca3353cc82b1981f0d25d71d7432d583a6ef882ccdea82d65fbe49af37be51cb","50679a8e27aacf72f8c40bcab15d7ef5e83494089b4726b83eec4554344d5cdc","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","5d697a4b315cc5bb3042ae869abffd10c3b0d7b182cda0e4c45d8819937e5796","563fa27fdaec8f195b84f71a7af0ef48d30d5cc830575db86da86a63a470c8e6","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","299567f84bfedd1468dca2755a829cb19e607a6811673788807dc8921e211bc9","795d9fb85aad92221504db74dd179b506bd189bba0c104426f7e7bb8a66ffee5","1311bc194e0a69fe61031e852c1c0b439e2a2a3d1d5e2d8ff795499b9f283459","4b7ce19369d7e7fae76720c2c6c7f671bf3fa0f7093edb864f1ac358ca7c456c","c972ef44deca1fa8fab465915ffa00f82e126aacf3dfc8979c03b1b066ce5bb6","30285a1011c6d6b52f3ba3abb0a984be8148c05cdefb8eb6eb562335a3991f35","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","3f450762fd7c34ed545e738abccb0af6a703572a10521643cf8fc88e3724c99c","fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","d6e6620a30d582182acc3f0a992a0c311adc589f111096aea11ab83fc09a5ccc","6213b8f686f56beab22b59a0f468590fd3a4c5fa931236a017efeca91d7c9584","c451cec9a588b1f105a5ea2c6063d4fca112b9d70105cacdadda0e1ef67e9379","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","a12eaa942232703a8a8477a2f240ad5a2c26c595012ea8f128224e77984099c4","4070c2f1c3434fcf84886e04d30d82cd650ee443e53b82b404b144175cf8741e","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","8129a34006218a6f3cdc81bbd438d5429eb18b08b4338a26977ac3b4df129d75","30d2170e1a718b5035611af55e3618b4ba8f42f0749bb52ee593da6082c4e2ce","98ef38666d88ec9699a722053e07ede65d3042f693fe7ff8c786e53dbb6fd43b","a3b8b6be7620897d1e481e8650c980a210a138fceb6e710eaf95fd9dd0dfe94a","12c89d0e32758c120a569045f21cf5b77244f86792611ced8de7f86b37e77781","9f9e5bae412fa5909fae636d6733aee27a108cc2ed5b13980611016336774d3c","662fe197bba64bd3f17ee118058cd2d0d2dbe33d7c0c865fd6365d90bfc44e1e","030519c351f800551cac2658038804969ca4584d2c0175a710602ac234ca1340","0278a6939ca83cd040b08ff8c5fc7838b6693ddc52f22526bf158e6b10e0246c","c2d6206e5ba4fd3063b01218c2b3b997afc1cfbeb49fcee991fa8595842ce53d","29c188a2c660f99f1b4835022e011c4268d7af989d4b7dda33c0a69ca1a777f8","1ed0bf138e87912d741e28333b58cbf814ae863783b3b404d2454cbabb9c5fc0","3452ee7d8ef0b1bbd47b2a56924a1dc3c79dc84a19d212e9dc496f92e4943aa0","99510e20e3d4816e283e59e8f0f31f603b2f026648240ffdb1ca9f24be678419","037d1fbeb96dc35600814be14d0fbf31acf35f1d7b443ea33514937de69c2bf2","64d1859b7dd9f419ba08e064c2b16b1a5edde0316d6c2bb1833c9381d4dffc3d","69b0f96ca137c0dba05f321a159141ad36f79cfba2fffcc29d131e280275e6f2","7bb64cf513a2b1cf7a94f81ca201f3d76a9b17af556f0cfc4e2707443e6caa66","a9add2a29da4cd0b617ae89f196b3f2172a031aeb086922cdf097236eef8b008","99afac3e6e683ee3111e499f9919953e9489cb39cad74363717aa3805e91db51","c49f92b83968f4ee0b6026396a9b6e2d6fee8b660d08a90efb03355ce3433a7a","4fdc6afe4d7ef6aeb32ac0818d47e99f98a31d0696abc4cb2af489c78ac1ba1d","d73d5a0e854037d43781b2d5d33f4b95ee509e0ddede677aade79fbee6a97cdc","35d14e1ae04be300828b1a1614316b9312a009cfd5e29fa56f94c2a9f60b12df","d160fe745f9c3b72d7b9036fdb2b6b500a520d43e36bb842c927b6fe59ea2c23",{"version":"4a415bf08be658b3f7ab2c2754a077e36a32e08aabb73aad26de47a45c0fa81e","signature":"3a4f9e7087c566703447928d15c234bd0bcc63a2a50b6ec39ed37c9bc0342310"},{"version":"506bcad28e45e13c23c2c25c9691e0dc42d8755a0e24b9a48586f51b5bebae8f","signature":"3a12771c76c5ed979438dc0e390224bd3d8661bcbea18114f77c4c6d9de5b8b2"},{"version":"6fbdb35bc3b9cfb225c48108b5bacb5c0d67bbcb677cf13b912e15a852551023","signature":"ee06131adf64c6cd201de36563174cff0e160b81438be186a7bd85e6c2b54fa7"},"a5aaeca001d2f69093d04aac4db321e4c338fd9b20cbc4f0b0af3dc6ae0f235b","cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","29a46d003ca3c721e6405f00dee7e3de91b14e09701eba5d887bf76fb2d47d38","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","9990f9e566bc3c2c6e38df81294fb756e7f5b7b0e5bb17ab75384e190548b4b6",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","df95e00612c1faa5e0e7ef0dba589b18665bbeb3221db2b6cee1fe4d0e61921f","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","675e702f2032766a91eeadee64f51014c64688525da99dccd8178f0c599f13a8","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","19c816167e076e7c24f074389c6cf3ed87bdbb917d1ea439ca281f9d26db2439","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","98f9d826db9cd99d27a01a59ee5f22863df00ccf1aaf43e1d7db80ebf716f7c3","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","dcd91d3b697cb650b95db5471189b99815af5db2a1cd28760f91e0b12ede8ed5","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","3cf0d343c2276842a5b617f22ba82af6322c7cfe8bb52238ffc0c491a3c21019","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9",{"version":"f2eff8704452659641164876c1ef0df4174659ce7311b0665798ea3f556fa9ad","affectsGlobalScope":true},"8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","2b8264b2fefd7367e0f20e2c04eed5d3038831fe00f5efbc110ff0131aab899b","a73a445c1e0a6d0f8b48e8eb22dc9d647896783a7f8991cbbc31c0d94bf1f5a2","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","cd1d2f103b79002cd94b85a640a103f094227a2c4c53bc8af1fdbf4e13d9729e","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","3dce33e7eb25594863b8e615f14a45ab98190d85953436750644212d8a18c066","2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","f83b320cceccfc48457a818d18fc9a006ab18d0bdd727aa2c2e73dc1b4a45e98","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e","70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","ed44ba6b95f08b758748be7902e0cc54178b1337c56d0e2469c77b03f63ac73b"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[120,247],[120],[91,120,127,128,129,144],[120,128,129,145,146],[120,127,128],[120,127,144,147,150],[120,127,147,150,151],[120,148,149,150,152,153],[120,127,150],[120,127,144,147,148,149,152],[120,127,135],[120,127],[91,120,127],[80,120,127],[120,131,132,133,134,135,136,137,138,139,140,141,142,143],[120,127,133,134],[120,127,133,135],[120,166,224],[120,224,225],[120,224,225,226,227],[120,166],[120,198],[120,198,199,200],[64,120],[67,120],[64,67,120],[65,66,67,68,69,70,71,72,73,74,75,120,155,158,159,160,161,162,163,164,165],[58,64,65,120],[67,73,75,120,154],[120,157],[67,68,120],[64,120,161],[120,193,194],[120,247,248,249,250,251],[120,247,249],[120,156],[120,254,255,256],[92,120,127],[120,259],[120,260],[120,271],[120,265,270],[120,274,276,277,278,279,280,281,282,283,284,285,286],[120,274,275,277,278,279,280,281,282,283,284,285,286],[120,275,276,277,278,279,280,281,282,283,284,285,286],[120,274,275,276,278,279,280,281,282,283,284,285,286],[120,274,275,276,277,279,280,281,282,283,284,285,286],[120,274,275,276,277,278,280,281,282,283,284,285,286],[120,274,275,276,277,278,279,281,282,283,284,285,286],[120,274,275,276,277,278,279,280,282,283,284,285,286],[120,274,275,276,277,278,279,280,281,283,284,285,286],[120,274,275,276,277,278,279,280,281,282,284,285,286],[120,274,275,276,277,278,279,280,281,282,283,285,286],[120,274,275,276,277,278,279,280,281,282,283,284,286],[120,274,275,276,277,278,279,280,281,282,283,284,285],[76,120],[79,120],[80,85,111,120],[81,91,92,99,108,119,120],[81,82,91,99,120],[83,120],[84,85,92,100,120],[85,108,116,120],[86,88,91,99,120],[87,120],[88,89,120],[90,91,120],[91,120],[91,92,93,108,119,120],[91,92,93,108,120],[91,94,99,108,119,120],[91,92,94,95,99,108,116,119,120],[94,96,108,116,119,120],[76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126],[91,97,120],[98,119,120,124],[88,91,99,108,120],[100,120],[101,120],[79,102,120],[103,118,120,124],[104,120],[105,120],[91,106,120],[106,107,120,122],[80,91,108,109,110,120],[80,108,110,120],[108,109,120],[111,120],[112,120],[91,114,115,120],[114,115,120],[85,99,116,120],[117,120],[99,118,120],[80,94,105,119,120],[85,120],[108,120,121],[120,122],[120,123],[80,85,91,93,102,108,119,120,122,124],[108,120,125],[120,127,292],[120,295,334],[120,295,319,334],[120,334],[120,295],[120,295,320,334],[120,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333],[120,320,334],[120,335],[120,339],[120,203],[120,215,216,217],[120,203,214,215],[120,178],[120,178,179,180,181,182],[120,167,168,169,170,171,172,173,174,175,176,177],[120,263,266],[120,263,266,267,268],[120,265],[120,262,269],[120,264],[57,59,60,61,62,63,120],[57,58,120],[59,120],[58,59,120],[57,59,120],[120,166,187,228],[120,229,230],[120,166,183,184,185],[120,184],[56,120,184,185,186],[120,185],[120,188],[120,188,189,192,196],[120,195],[120,166,190,191],[120,211,212,213],[120,210,211],[120,166,210,211],[120,166,203,210],[120,166,204],[120,204,205,206,207,208,209],[120,166,203],[120,219],[120,202,219,221,222],[120,166,187,190,197,201,202,219,220],[120,166,197,214,218],[120,166,235],[120,166,228,235],[120,233,234,235,236,237,238,242],[120,166,210,243],[120,166,187,197,233,234,236],[120,166,187,197,231,232,233,235,236],[120,234,235,238],[120,239,240,241,243],[120,235,238],[120,166,235,238],[120,166,187,234],[120,166,210,235,236],[120,244,245],[120,183,187,201,223,243],[120,166,210,223,244],[244,245],[183,187,223,243],[166,210,223,244]],"referencedMap":[[249,1],[247,2],[145,3],[128,2],[147,4],[129,5],[146,2],[151,6],[152,7],[148,7],[154,8],[149,7],[153,9],[150,10],[136,11],[133,12],[140,13],[134,11],[131,14],[139,2],[144,15],[141,2],[142,2],[143,2],[138,12],[135,16],[132,2],[137,17],[190,2],[225,18],[227,2],[226,19],[228,20],[224,21],[203,13],[199,22],[200,22],[201,23],[198,2],[65,24],[66,24],[68,25],[69,24],[70,24],[71,26],[72,2],[73,2],[74,2],[67,24],[166,27],[75,28],[155,29],[158,30],[159,2],[160,2],[161,2],[162,2],[163,2],[164,31],[165,32],[193,2],[195,33],[194,2],[252,34],[248,1],[250,35],[251,1],[191,12],[157,36],[253,2],[254,2],[257,37],[255,2],[258,38],[259,2],[260,39],[261,40],[272,41],[271,42],[256,2],[273,2],[275,43],[276,44],[274,45],[277,46],[278,47],[279,48],[280,49],[281,50],[282,51],[283,52],[284,53],[285,54],[286,55],[287,2],[156,2],[76,56],[77,56],[79,57],[80,58],[81,59],[82,60],[83,61],[84,62],[85,63],[86,64],[87,65],[88,66],[89,66],[90,67],[91,68],[92,69],[93,70],[78,2],[126,2],[94,71],[95,72],[96,73],[127,74],[97,75],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[110,87],[109,88],[111,89],[112,90],[113,2],[114,91],[115,92],[116,93],[117,94],[118,95],[119,96],[120,97],[121,98],[122,99],[123,100],[124,101],[125,102],[288,2],[289,12],[290,2],[291,2],[293,103],[292,2],[294,12],[319,104],[320,105],[295,106],[298,106],[317,104],[318,104],[308,104],[307,107],[305,104],[300,104],[313,104],[311,104],[315,104],[299,104],[312,104],[316,104],[301,104],[302,104],[314,104],[296,104],[303,104],[304,104],[306,104],[310,104],[321,108],[309,104],[297,104],[334,109],[333,2],[328,108],[330,110],[329,108],[322,108],[323,108],[325,108],[327,108],[331,110],[332,110],[324,110],[326,110],[336,111],[335,2],[337,2],[338,2],[339,2],[340,112],[130,2],[262,2],[215,113],[218,114],[216,115],[217,115],[177,2],[174,116],[176,116],[175,116],[173,116],[183,117],[178,118],[182,2],[179,2],[181,2],[180,2],[169,116],[170,116],[171,116],[167,2],[168,2],[172,116],[263,2],[267,119],[269,120],[268,119],[266,121],[270,122],[265,123],[264,2],[57,2],[64,124],[59,125],[60,126],[61,126],[62,127],[63,127],[58,128],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[33,2],[30,2],[31,2],[32,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[229,129],[230,2],[231,130],[56,2],[186,131],[185,132],[187,133],[184,134],[189,135],[197,136],[196,137],[188,2],[192,138],[214,139],[212,140],[213,141],[211,142],[205,143],[206,143],[207,2],[208,143],[210,144],[204,145],[209,143],[202,2],[220,146],[222,146],[223,147],[221,148],[219,149],[236,150],[237,151],[243,152],[232,153],[235,154],[234,155],[239,156],[242,157],[240,158],[241,159],[233,160],[238,161],[246,162],[244,163],[245,164],[47,2],[48,2],[49,2],[50,2],[51,2],[52,2],[43,2],[53,2],[54,2],[55,2],[44,2],[45,2],[46,2]],"exportedModulesMap":[[249,1],[247,2],[145,3],[128,2],[147,4],[129,5],[146,2],[151,6],[152,7],[148,7],[154,8],[149,7],[153,9],[150,10],[136,11],[133,12],[140,13],[134,11],[131,14],[139,2],[144,15],[141,2],[142,2],[143,2],[138,12],[135,16],[132,2],[137,17],[190,2],[225,18],[227,2],[226,19],[228,20],[224,21],[203,13],[199,22],[200,22],[201,23],[198,2],[65,24],[66,24],[68,25],[69,24],[70,24],[71,26],[72,2],[73,2],[74,2],[67,24],[166,27],[75,28],[155,29],[158,30],[159,2],[160,2],[161,2],[162,2],[163,2],[164,31],[165,32],[193,2],[195,33],[194,2],[252,34],[248,1],[250,35],[251,1],[191,12],[157,36],[253,2],[254,2],[257,37],[255,2],[258,38],[259,2],[260,39],[261,40],[272,41],[271,42],[256,2],[273,2],[275,43],[276,44],[274,45],[277,46],[278,47],[279,48],[280,49],[281,50],[282,51],[283,52],[284,53],[285,54],[286,55],[287,2],[156,2],[76,56],[77,56],[79,57],[80,58],[81,59],[82,60],[83,61],[84,62],[85,63],[86,64],[87,65],[88,66],[89,66],[90,67],[91,68],[92,69],[93,70],[78,2],[126,2],[94,71],[95,72],[96,73],[127,74],[97,75],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[110,87],[109,88],[111,89],[112,90],[113,2],[114,91],[115,92],[116,93],[117,94],[118,95],[119,96],[120,97],[121,98],[122,99],[123,100],[124,101],[125,102],[288,2],[289,12],[290,2],[291,2],[293,103],[292,2],[294,12],[319,104],[320,105],[295,106],[298,106],[317,104],[318,104],[308,104],[307,107],[305,104],[300,104],[313,104],[311,104],[315,104],[299,104],[312,104],[316,104],[301,104],[302,104],[314,104],[296,104],[303,104],[304,104],[306,104],[310,104],[321,108],[309,104],[297,104],[334,109],[333,2],[328,108],[330,110],[329,108],[322,108],[323,108],[325,108],[327,108],[331,110],[332,110],[324,110],[326,110],[336,111],[335,2],[337,2],[338,2],[339,2],[340,112],[130,2],[262,2],[215,113],[218,114],[216,115],[217,115],[177,2],[174,116],[176,116],[175,116],[173,116],[183,117],[178,118],[182,2],[179,2],[181,2],[180,2],[169,116],[170,116],[171,116],[167,2],[168,2],[172,116],[263,2],[267,119],[269,120],[268,119],[266,121],[270,122],[265,123],[264,2],[57,2],[64,124],[59,125],[60,126],[61,126],[62,127],[63,127],[58,128],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[33,2],[30,2],[31,2],[32,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[229,129],[230,2],[231,130],[56,2],[186,131],[185,132],[187,133],[184,134],[189,135],[197,136],[196,137],[188,2],[192,138],[214,139],[212,140],[213,141],[211,142],[205,143],[206,143],[207,2],[208,143],[210,144],[204,145],[209,143],[202,2],[220,146],[222,146],[223,147],[221,148],[219,149],[236,150],[237,151],[243,152],[232,153],[235,154],[234,155],[239,156],[242,157],[240,158],[241,159],[233,160],[238,161],[246,165],[244,166],[245,167],[47,2],[48,2],[49,2],[50,2],[51,2],[52,2],[43,2],[53,2],[54,2],[55,2],[44,2],[45,2],[46,2]],"semanticDiagnosticsPerFile":[249,247,145,128,147,129,146,151,152,148,154,149,153,150,136,133,140,134,131,139,144,141,142,143,138,135,132,137,190,225,227,226,228,224,203,199,200,201,198,65,66,68,69,70,71,72,73,74,67,166,75,155,158,159,160,161,162,163,164,165,193,195,194,252,248,250,251,191,157,253,254,257,255,258,259,260,261,272,271,256,273,275,276,274,277,278,279,280,281,282,283,284,285,286,287,156,76,77,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,78,126,94,95,96,127,97,98,99,100,101,102,103,104,105,106,107,108,110,109,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,288,289,290,291,293,292,294,319,320,295,298,317,318,308,307,305,300,313,311,315,299,312,316,301,302,314,296,303,304,306,310,321,309,297,334,333,328,330,329,322,323,325,327,331,332,324,326,336,335,337,338,339,340,130,262,215,218,216,217,177,174,176,175,173,183,178,182,179,181,180,169,170,171,167,168,172,263,267,269,268,266,270,265,264,57,64,59,60,61,62,63,58,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,33,30,31,32,34,7,35,40,41,36,37,38,39,1,42,229,230,231,56,186,185,187,184,189,197,196,188,192,214,212,213,211,205,206,207,208,210,204,209,202,220,222,223,221,219,236,237,243,232,235,234,239,242,240,241,233,238,246,244,245,47,48,49,50,51,52,43,53,54,55,44,45,46],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.9.5"}
+\ No newline at end of file
++{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createProvider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/BaseControllerV1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/assert.d.ts","../../../node_modules/@types/node/assert/strict.d.ts","../../../node_modules/@types/node/globals.d.ts","../../../node_modules/@types/node/async_hooks.d.ts","../../../node_modules/@types/node/buffer.d.ts","../../../node_modules/@types/node/child_process.d.ts","../../../node_modules/@types/node/cluster.d.ts","../../../node_modules/@types/node/console.d.ts","../../../node_modules/@types/node/constants.d.ts","../../../node_modules/@types/node/crypto.d.ts","../../../node_modules/@types/node/dgram.d.ts","../../../node_modules/@types/node/diagnostics_channel.d.ts","../../../node_modules/@types/node/dns.d.ts","../../../node_modules/@types/node/dns/promises.d.ts","../../../node_modules/@types/node/domain.d.ts","../../../node_modules/@types/node/events.d.ts","../../../node_modules/@types/node/fs.d.ts","../../../node_modules/@types/node/fs/promises.d.ts","../../../node_modules/@types/node/http.d.ts","../../../node_modules/@types/node/http2.d.ts","../../../node_modules/@types/node/https.d.ts","../../../node_modules/@types/node/inspector.d.ts","../../../node_modules/@types/node/module.d.ts","../../../node_modules/@types/node/net.d.ts","../../../node_modules/@types/node/os.d.ts","../../../node_modules/@types/node/path.d.ts","../../../node_modules/@types/node/perf_hooks.d.ts","../../../node_modules/@types/node/process.d.ts","../../../node_modules/@types/node/punycode.d.ts","../../../node_modules/@types/node/querystring.d.ts","../../../node_modules/@types/node/readline.d.ts","../../../node_modules/@types/node/repl.d.ts","../../../node_modules/@types/node/stream.d.ts","../../../node_modules/@types/node/stream/promises.d.ts","../../../node_modules/@types/node/stream/consumers.d.ts","../../../node_modules/@types/node/stream/web.d.ts","../../../node_modules/@types/node/string_decoder.d.ts","../../../node_modules/@types/node/test.d.ts","../../../node_modules/@types/node/timers.d.ts","../../../node_modules/@types/node/timers/promises.d.ts","../../../node_modules/@types/node/tls.d.ts","../../../node_modules/@types/node/trace_events.d.ts","../../../node_modules/@types/node/tty.d.ts","../../../node_modules/@types/node/url.d.ts","../../../node_modules/@types/node/util.d.ts","../../../node_modules/@types/node/v8.d.ts","../../../node_modules/@types/node/vm.d.ts","../../../node_modules/@types/node/wasi.d.ts","../../../node_modules/@types/node/worker_threads.d.ts","../../../node_modules/@types/node/zlib.d.ts","../../../node_modules/@types/node/globals.global.d.ts","../../../node_modules/@types/node/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asyncEventEmitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacyTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/baseTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionFactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerClass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/RestrictedControllerMessenger.d.ts","../../base-controller/dist/types/ControllerMessenger.d.ts","../../base-controller/dist/types/BaseControllerV2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/utils.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createEventEmitterProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createSwappableProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../network-controller/dist/types/constants.d.ts","../../../node_modules/@metamask/safe-event-emitter/index.d.ts","../../json-rpc-engine/dist/types/JsonRpcEngine.d.ts","../../json-rpc-engine/dist/types/createAsyncMiddleware.d.ts","../../json-rpc-engine/dist/types/createScaffoldMiddleware.d.ts","../../json-rpc-engine/dist/types/getUniqueId.d.ts","../../json-rpc-engine/dist/types/idRemapMiddleware.d.ts","../../json-rpc-engine/dist/types/mergeMiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/eth-block-tracker/dist/BlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/PollingBlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/SubscribeBlockTracker.d.ts","../../../node_modules/eth-block-tracker/dist/index.d.ts","../../network-controller/dist/types/types.d.ts","../../network-controller/dist/types/create-auto-managed-network-client.d.ts","../../network-controller/dist/types/NetworkController.d.ts","../../network-controller/dist/types/create-network-client.d.ts","../../network-controller/dist/types/index.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/utils.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/classes.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/errors.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/error-constants.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/index.d.ts","../../approval-controller/dist/types/ApprovalController.d.ts","../../approval-controller/dist/types/errors.d.ts","../../approval-controller/dist/types/index.d.ts","../../permission-controller/dist/types/permission-middleware.d.ts","../../permission-controller/dist/types/SubjectMetadataController.d.ts","../../permission-controller/dist/types/PermissionController.d.ts","../../permission-controller/dist/types/Permission.d.ts","../../permission-controller/dist/types/Caveat.d.ts","../../permission-controller/dist/types/errors.d.ts","../../permission-controller/dist/types/utils.d.ts","../../permission-controller/dist/types/rpc-methods/getPermissions.d.ts","../../permission-controller/dist/types/rpc-methods/requestPermissions.d.ts","../../permission-controller/dist/types/rpc-methods/revokePermissions.d.ts","../../permission-controller/dist/types/rpc-methods/index.d.ts","../../permission-controller/dist/types/index.d.ts","../src/SelectedNetworkController.ts","../src/SelectedNetworkMiddleware.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupSemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/diffLines.d.ts","../../../node_modules/jest-diff/build/printDiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","75b22c74010ba649de1a1676a4c4b8b5bb4294fecd05089e2094429b16d7840c","e475453e7140e95542332943d3052fe4c7430ad1efce42b3e9157f1fee8cbc5f","ebfdf904255ce746c9d30117c2edef355fb19bf7650478d2405f39f0e4f302e6","f3f63b48addb8e2ea9d20bb671c3c306413b3daa39996d0ae52f63d8e32158e1","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","b4000a0a525fa921e896cbdb32ae802c9684f0fd371b5fc69e7310f7918cc2c3","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","b3d48529ae61dc27d0bfbfa2cb3e0dff8189644bd155bdf5df1e8e14669f7043","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","34693fb4a5e771e11668219221344dd1bd7d8b77ed005a1c1d965fb559be8406","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"e44ea2d6b7b853f6c81482416db43dafc11944561b810e469ae423085511ce7e","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"a7289d79eb84a59d2475b4d0136b4404be3cfdd17c3ea46b9194add1d645df01","affectsGlobalScope":true},"0bb26fa2a90ee890eed57ee812c71fa84d3d07850163ec4a204de86412cc57c1","132ca47da601c60141dd6f10bd08c70d0620177e5638439df2464ec3945b6d98",{"version":"55d2bbae076fed7269c3e16faeb32f988f558427b7a1c3bf04aa7551ab86ae90","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","cf83847c9264dcd592b6c89c1542925b899b277228687f3638614e3fa784cf76","3a41ebe7f089d50f447466b35b6cabb8b584c0994fc9809d0cd0a4ebc41e1239","7693b90b3075deaccafd5efb467bf9f2b747a3075be888652ef73e64396d8628","0c42d6cba77d9ad1cf45256ccb8489aa502fe2dbee1ec9048a29d49f5d532e73","2cf89c17245db65d175d4ef699cd68187516f9b3ae5c572fc0b9ad60f35dc223","5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"a34d65f61ec5aac5b53502c8b0bd4e00d217bccb95bf94d449e2571baa11fb8c","affectsGlobalScope":true},"8d42e5af5fb0a96a77e135ce84cc60636c9bad39d9dba043a4efe9d1bdeb3cc3","56fcc451e9065eb121c9cc4c1b9994a816306f3b0b3b1fce7ad59f0ac97a9999","8a6f12b74d3e6c4f5e1b918cb8e64ae16bc6756cf0d48bcc28a28e1bf26ca0cd","c3759b5bc5cc40f5988d86a497741a80fa91258629ae50a2b3735e774cd377cc","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","45dd82fb5aea9b12b2a90b427b28f3a014e8b2ee9b74087a5ab882841cb5fbc5",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"48b2f9302651eb31acd5be69bb4e6b35797a7fcd6b77391d10a4ccadf7dc3609","0c8c917ef15498c827bd494a0ef365e9f76deb211f8acbb86932e20489310788","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"9cdc2c6144b03822c9842505d09945bcf813b86827fdb260dd7586b63abc19bf","affectsGlobalScope":true},{"version":"2923dee3c897f03e91b54a210cdbefea7290562f0ac4b948667d4c9ee844b79e","affectsGlobalScope":true},"79169698d09a2be54b14f3bcad2575b414bf3525063fde0a1e4fcd5d6efd380e","051d939bcf77caa3cef3282708ab3a6fdfb741a7366e1d74a9e7603b67417ec3","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","a234d62ae81d012ebf23898a45672edf3e5c93ecf5a438a42b96c08dd68cde43","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","09ed02a725db002693236b6dfc49b2c6eb5557be1421d7fbe4f07cfe38211d92","09d801ff4a303d4976d4b9cb94af3a9097c4a70345e662d176975872d2998e51","c8558b01389b5f7610ac293aa612ccea2ae64d83af43b49f8142f190be1f414c","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"b10b426c56e220b5093bf8a2446ee47af47263b7b1a03f4b18e42326b231b111","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b4635ef36bee17e1304337d591c3b6b461ecdbc1876d0effbe6a581e62201fe5","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"e4507242542bd499238f693d88b2d32e22177cc508854625f87bcc9bc3fa1256","affectsGlobalScope":true},{"version":"d942354e4966a98d3a92d1b1af0b4ac06f33af3f88116743e2c304c027ca26ef","affectsGlobalScope":true},"39f0808e5be3cb38674726c21fe2eb453c55e48a901679b4ce30fef85549b892","6afd66a7432ef100027ea110449e874196381e019e30eda7e7d8ca390366b7a8","befb8a9a78ac99d8fbc3ed392810489a7b90760c7a58934e8f1c8538f581cff3","e670bdf01540d35c170fae68edfd2f288eff909936780c379d6a9103b787b22c","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"88003d9ab15507806f41b120be6d407c1afe566c2f6689ebe3a034dd5ec0c8dc","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","93b7325b49dfbf613d940ed0e471216657b2d77459dac34f1b5b1678f08f884c","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","277983d414aa99d78655186c3ee1e1c38c302e336aff1d77b47fcdc39d8273fe","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","ca3353cc82b1981f0d25d71d7432d583a6ef882ccdea82d65fbe49af37be51cb","50679a8e27aacf72f8c40bcab15d7ef5e83494089b4726b83eec4554344d5cdc","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","5d697a4b315cc5bb3042ae869abffd10c3b0d7b182cda0e4c45d8819937e5796","563fa27fdaec8f195b84f71a7af0ef48d30d5cc830575db86da86a63a470c8e6","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","299567f84bfedd1468dca2755a829cb19e607a6811673788807dc8921e211bc9","795d9fb85aad92221504db74dd179b506bd189bba0c104426f7e7bb8a66ffee5","1311bc194e0a69fe61031e852c1c0b439e2a2a3d1d5e2d8ff795499b9f283459","4b7ce19369d7e7fae76720c2c6c7f671bf3fa0f7093edb864f1ac358ca7c456c","c972ef44deca1fa8fab465915ffa00f82e126aacf3dfc8979c03b1b066ce5bb6","30285a1011c6d6b52f3ba3abb0a984be8148c05cdefb8eb6eb562335a3991f35","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","3f450762fd7c34ed545e738abccb0af6a703572a10521643cf8fc88e3724c99c","fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","d6e6620a30d582182acc3f0a992a0c311adc589f111096aea11ab83fc09a5ccc","6213b8f686f56beab22b59a0f468590fd3a4c5fa931236a017efeca91d7c9584","c451cec9a588b1f105a5ea2c6063d4fca112b9d70105cacdadda0e1ef67e9379","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","a12eaa942232703a8a8477a2f240ad5a2c26c595012ea8f128224e77984099c4","4070c2f1c3434fcf84886e04d30d82cd650ee443e53b82b404b144175cf8741e","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","8129a34006218a6f3cdc81bbd438d5429eb18b08b4338a26977ac3b4df129d75","30d2170e1a718b5035611af55e3618b4ba8f42f0749bb52ee593da6082c4e2ce","98ef38666d88ec9699a722053e07ede65d3042f693fe7ff8c786e53dbb6fd43b","a3b8b6be7620897d1e481e8650c980a210a138fceb6e710eaf95fd9dd0dfe94a","12c89d0e32758c120a569045f21cf5b77244f86792611ced8de7f86b37e77781","9f9e5bae412fa5909fae636d6733aee27a108cc2ed5b13980611016336774d3c","662fe197bba64bd3f17ee118058cd2d0d2dbe33d7c0c865fd6365d90bfc44e1e","030519c351f800551cac2658038804969ca4584d2c0175a710602ac234ca1340","0278a6939ca83cd040b08ff8c5fc7838b6693ddc52f22526bf158e6b10e0246c","c2d6206e5ba4fd3063b01218c2b3b997afc1cfbeb49fcee991fa8595842ce53d","29c188a2c660f99f1b4835022e011c4268d7af989d4b7dda33c0a69ca1a777f8","1ed0bf138e87912d741e28333b58cbf814ae863783b3b404d2454cbabb9c5fc0","3452ee7d8ef0b1bbd47b2a56924a1dc3c79dc84a19d212e9dc496f92e4943aa0","99510e20e3d4816e283e59e8f0f31f603b2f026648240ffdb1ca9f24be678419","037d1fbeb96dc35600814be14d0fbf31acf35f1d7b443ea33514937de69c2bf2","64d1859b7dd9f419ba08e064c2b16b1a5edde0316d6c2bb1833c9381d4dffc3d","69b0f96ca137c0dba05f321a159141ad36f79cfba2fffcc29d131e280275e6f2","7bb64cf513a2b1cf7a94f81ca201f3d76a9b17af556f0cfc4e2707443e6caa66","a9add2a29da4cd0b617ae89f196b3f2172a031aeb086922cdf097236eef8b008","99afac3e6e683ee3111e499f9919953e9489cb39cad74363717aa3805e91db51","c49f92b83968f4ee0b6026396a9b6e2d6fee8b660d08a90efb03355ce3433a7a","4fdc6afe4d7ef6aeb32ac0818d47e99f98a31d0696abc4cb2af489c78ac1ba1d","d73d5a0e854037d43781b2d5d33f4b95ee509e0ddede677aade79fbee6a97cdc","35d14e1ae04be300828b1a1614316b9312a009cfd5e29fa56f94c2a9f60b12df","d160fe745f9c3b72d7b9036fdb2b6b500a520d43e36bb842c927b6fe59ea2c23",{"version":"4a6571cadd05e8087a34f7ca44f63a8f61aa5fcca650f0a577febc4877b3c34f","signature":"3a4f9e7087c566703447928d15c234bd0bcc63a2a50b6ec39ed37c9bc0342310"},{"version":"506bcad28e45e13c23c2c25c9691e0dc42d8755a0e24b9a48586f51b5bebae8f","signature":"3a12771c76c5ed979438dc0e390224bd3d8661bcbea18114f77c4c6d9de5b8b2"},{"version":"6fbdb35bc3b9cfb225c48108b5bacb5c0d67bbcb677cf13b912e15a852551023","signature":"ee06131adf64c6cd201de36563174cff0e160b81438be186a7bd85e6c2b54fa7"},"a5aaeca001d2f69093d04aac4db321e4c338fd9b20cbc4f0b0af3dc6ae0f235b","cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","29a46d003ca3c721e6405f00dee7e3de91b14e09701eba5d887bf76fb2d47d38","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","9990f9e566bc3c2c6e38df81294fb756e7f5b7b0e5bb17ab75384e190548b4b6",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","df95e00612c1faa5e0e7ef0dba589b18665bbeb3221db2b6cee1fe4d0e61921f","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","675e702f2032766a91eeadee64f51014c64688525da99dccd8178f0c599f13a8","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","19c816167e076e7c24f074389c6cf3ed87bdbb917d1ea439ca281f9d26db2439","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","98f9d826db9cd99d27a01a59ee5f22863df00ccf1aaf43e1d7db80ebf716f7c3","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","dcd91d3b697cb650b95db5471189b99815af5db2a1cd28760f91e0b12ede8ed5","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","3cf0d343c2276842a5b617f22ba82af6322c7cfe8bb52238ffc0c491a3c21019","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9",{"version":"f2eff8704452659641164876c1ef0df4174659ce7311b0665798ea3f556fa9ad","affectsGlobalScope":true},"8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","2b8264b2fefd7367e0f20e2c04eed5d3038831fe00f5efbc110ff0131aab899b","a73a445c1e0a6d0f8b48e8eb22dc9d647896783a7f8991cbbc31c0d94bf1f5a2","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","cd1d2f103b79002cd94b85a640a103f094227a2c4c53bc8af1fdbf4e13d9729e","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","3dce33e7eb25594863b8e615f14a45ab98190d85953436750644212d8a18c066","2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","b9f96255e1048ed2ea33ec553122716f0e57fc1c3ad778e9aa15f5b46547bd23","7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","a1a261624efb3a00ff346b13580f70f3463b8cdcc58b60f5793ff11785d52cab","f83b320cceccfc48457a818d18fc9a006ab18d0bdd727aa2c2e73dc1b4a45e98","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e","70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","ed44ba6b95f08b758748be7902e0cc54178b1337c56d0e2469c77b03f63ac73b"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[120,247],[120],[91,120,127,128,129,144],[120,128,129,145,146],[120,127,128],[120,127,144,147,150],[120,127,147,150,151],[120,148,149,150,152,153],[120,127,150],[120,127,144,147,148,149,152],[120,127,135],[120,127],[91,120,127],[80,120,127],[120,131,132,133,134,135,136,137,138,139,140,141,142,143],[120,127,133,134],[120,127,133,135],[120,166,224],[120,224,225],[120,224,225,226,227],[120,166],[120,198],[120,198,199,200],[64,120],[67,120],[64,67,120],[65,66,67,68,69,70,71,72,73,74,75,120,155,158,159,160,161,162,163,164,165],[58,64,65,120],[67,73,75,120,154],[120,157],[67,68,120],[64,120,161],[120,193,194],[120,247,248,249,250,251],[120,247,249],[120,156],[120,254,255,256],[92,120,127],[120,259],[120,260],[120,271],[120,265,270],[120,274,276,277,278,279,280,281,282,283,284,285,286],[120,274,275,277,278,279,280,281,282,283,284,285,286],[120,275,276,277,278,279,280,281,282,283,284,285,286],[120,274,275,276,278,279,280,281,282,283,284,285,286],[120,274,275,276,277,279,280,281,282,283,284,285,286],[120,274,275,276,277,278,280,281,282,283,284,285,286],[120,274,275,276,277,278,279,281,282,283,284,285,286],[120,274,275,276,277,278,279,280,282,283,284,285,286],[120,274,275,276,277,278,279,280,281,283,284,285,286],[120,274,275,276,277,278,279,280,281,282,284,285,286],[120,274,275,276,277,278,279,280,281,282,283,285,286],[120,274,275,276,277,278,279,280,281,282,283,284,286],[120,274,275,276,277,278,279,280,281,282,283,284,285],[76,120],[79,120],[80,85,111,120],[81,91,92,99,108,119,120],[81,82,91,99,120],[83,120],[84,85,92,100,120],[85,108,116,120],[86,88,91,99,120],[87,120],[88,89,120],[90,91,120],[91,120],[91,92,93,108,119,120],[91,92,93,108,120],[91,94,99,108,119,120],[91,92,94,95,99,108,116,119,120],[94,96,108,116,119,120],[76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126],[91,97,120],[98,119,120,124],[88,91,99,108,120],[100,120],[101,120],[79,102,120],[103,118,120,124],[104,120],[105,120],[91,106,120],[106,107,120,122],[80,91,108,109,110,120],[80,108,110,120],[108,109,120],[111,120],[112,120],[91,114,115,120],[114,115,120],[85,99,116,120],[117,120],[99,118,120],[80,94,105,119,120],[85,120],[108,120,121],[120,122],[120,123],[80,85,91,93,102,108,119,120,122,124],[108,120,125],[120,127,292],[120,295,334],[120,295,319,334],[120,334],[120,295],[120,295,320,334],[120,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333],[120,320,334],[120,335],[120,339],[120,203],[120,203,214,215],[120,215,216,217],[120,178],[120,178,179,180,181,182],[120,167,168,169,170,171,172,173,174,175,176,177],[120,263,266],[120,263,266,267,268],[120,265],[120,262,269],[120,264],[57,59,60,61,62,63,120],[57,58,120],[59,120],[58,59,120],[57,59,120],[120,166,187,228],[120,229,230],[120,166,183,184,185],[120,184],[120,185],[56,120,184,185,186],[120,188],[120,188,189,192,196],[120,195],[120,166,190,191],[120,211,212,213],[120,210,211],[120,166,210,211],[120,166,203,210],[120,166,203],[120,166,204],[120,204,205,206,207,208,209],[120,166,187,190,197,201,202,219,220],[120,219],[120,202,219,221,222],[120,166,197,214,218],[120,166,235],[120,166,187,197,233,234,236],[120,166,187,197,231,232,233,235,236],[120,166,187,234],[120,166,228,235],[120,233,234,235,236,237,238,242],[120,166,210,243],[120,234,235,238],[120,239,240,241,243],[120,235,238],[120,166,235,238],[120,166,210,235,236],[120,183,187,201,223,243],[120,166,210,223,244],[120,244,245],[183,187,223,243],[166,210,223,244],[244,245]],"referencedMap":[[249,1],[247,2],[145,3],[128,2],[147,4],[129,5],[146,2],[151,6],[152,7],[148,7],[154,8],[149,7],[153,9],[150,10],[136,11],[133,12],[140,13],[134,11],[131,14],[139,2],[144,15],[141,2],[142,2],[143,2],[138,12],[135,16],[132,2],[137,17],[190,2],[225,18],[227,2],[226,19],[228,20],[224,21],[203,13],[199,22],[200,22],[201,23],[198,2],[65,24],[66,24],[68,25],[69,24],[70,24],[71,26],[72,2],[73,2],[74,2],[67,24],[166,27],[75,28],[155,29],[158,30],[159,2],[160,2],[161,2],[162,2],[163,2],[164,31],[165,32],[193,2],[195,33],[194,2],[252,34],[248,1],[250,35],[251,1],[191,12],[157,36],[253,2],[254,2],[257,37],[255,2],[258,38],[259,2],[260,39],[261,40],[272,41],[271,42],[256,2],[273,2],[275,43],[276,44],[274,45],[277,46],[278,47],[279,48],[280,49],[281,50],[282,51],[283,52],[284,53],[285,54],[286,55],[287,2],[156,2],[76,56],[77,56],[79,57],[80,58],[81,59],[82,60],[83,61],[84,62],[85,63],[86,64],[87,65],[88,66],[89,66],[90,67],[91,68],[92,69],[93,70],[78,2],[126,2],[94,71],[95,72],[96,73],[127,74],[97,75],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[110,87],[109,88],[111,89],[112,90],[113,2],[114,91],[115,92],[116,93],[117,94],[118,95],[119,96],[120,97],[121,98],[122,99],[123,100],[124,101],[125,102],[288,2],[289,12],[290,2],[291,2],[293,103],[292,2],[294,12],[319,104],[320,105],[295,106],[298,106],[317,104],[318,104],[308,104],[307,107],[305,104],[300,104],[313,104],[311,104],[315,104],[299,104],[312,104],[316,104],[301,104],[302,104],[314,104],[296,104],[303,104],[304,104],[306,104],[310,104],[321,108],[309,104],[297,104],[334,109],[333,2],[328,108],[330,110],[329,108],[322,108],[323,108],[325,108],[327,108],[331,110],[332,110],[324,110],[326,110],[336,111],[335,2],[337,2],[338,2],[339,2],[340,112],[130,2],[262,2],[215,113],[216,114],[217,114],[218,115],[177,2],[174,116],[176,116],[175,116],[173,116],[183,117],[178,118],[182,2],[179,2],[181,2],[180,2],[169,116],[170,116],[171,116],[167,2],[168,2],[172,116],[263,2],[267,119],[269,120],[268,119],[266,121],[270,122],[265,123],[264,2],[57,2],[64,124],[59,125],[60,126],[61,126],[62,127],[63,127],[58,128],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[33,2],[30,2],[31,2],[32,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[229,129],[230,2],[231,130],[56,2],[186,131],[185,132],[184,133],[187,134],[189,135],[197,136],[196,137],[188,2],[192,138],[214,139],[212,140],[213,141],[211,142],[204,143],[205,144],[206,144],[207,2],[208,144],[210,145],[209,144],[221,146],[202,2],[220,147],[222,147],[223,148],[219,149],[236,150],[235,151],[234,152],[233,153],[237,154],[243,155],[232,156],[239,157],[242,158],[240,159],[241,160],[238,161],[244,162],[245,163],[246,164],[47,2],[48,2],[49,2],[50,2],[51,2],[52,2],[43,2],[53,2],[54,2],[55,2],[44,2],[45,2],[46,2]],"exportedModulesMap":[[249,1],[247,2],[145,3],[128,2],[147,4],[129,5],[146,2],[151,6],[152,7],[148,7],[154,8],[149,7],[153,9],[150,10],[136,11],[133,12],[140,13],[134,11],[131,14],[139,2],[144,15],[141,2],[142,2],[143,2],[138,12],[135,16],[132,2],[137,17],[190,2],[225,18],[227,2],[226,19],[228,20],[224,21],[203,13],[199,22],[200,22],[201,23],[198,2],[65,24],[66,24],[68,25],[69,24],[70,24],[71,26],[72,2],[73,2],[74,2],[67,24],[166,27],[75,28],[155,29],[158,30],[159,2],[160,2],[161,2],[162,2],[163,2],[164,31],[165,32],[193,2],[195,33],[194,2],[252,34],[248,1],[250,35],[251,1],[191,12],[157,36],[253,2],[254,2],[257,37],[255,2],[258,38],[259,2],[260,39],[261,40],[272,41],[271,42],[256,2],[273,2],[275,43],[276,44],[274,45],[277,46],[278,47],[279,48],[280,49],[281,50],[282,51],[283,52],[284,53],[285,54],[286,55],[287,2],[156,2],[76,56],[77,56],[79,57],[80,58],[81,59],[82,60],[83,61],[84,62],[85,63],[86,64],[87,65],[88,66],[89,66],[90,67],[91,68],[92,69],[93,70],[78,2],[126,2],[94,71],[95,72],[96,73],[127,74],[97,75],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[110,87],[109,88],[111,89],[112,90],[113,2],[114,91],[115,92],[116,93],[117,94],[118,95],[119,96],[120,97],[121,98],[122,99],[123,100],[124,101],[125,102],[288,2],[289,12],[290,2],[291,2],[293,103],[292,2],[294,12],[319,104],[320,105],[295,106],[298,106],[317,104],[318,104],[308,104],[307,107],[305,104],[300,104],[313,104],[311,104],[315,104],[299,104],[312,104],[316,104],[301,104],[302,104],[314,104],[296,104],[303,104],[304,104],[306,104],[310,104],[321,108],[309,104],[297,104],[334,109],[333,2],[328,108],[330,110],[329,108],[322,108],[323,108],[325,108],[327,108],[331,110],[332,110],[324,110],[326,110],[336,111],[335,2],[337,2],[338,2],[339,2],[340,112],[130,2],[262,2],[215,113],[216,114],[217,114],[218,115],[177,2],[174,116],[176,116],[175,116],[173,116],[183,117],[178,118],[182,2],[179,2],[181,2],[180,2],[169,116],[170,116],[171,116],[167,2],[168,2],[172,116],[263,2],[267,119],[269,120],[268,119],[266,121],[270,122],[265,123],[264,2],[57,2],[64,124],[59,125],[60,126],[61,126],[62,127],[63,127],[58,128],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[33,2],[30,2],[31,2],[32,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[229,129],[230,2],[231,130],[56,2],[186,131],[185,132],[184,133],[187,134],[189,135],[197,136],[196,137],[188,2],[192,138],[214,139],[212,140],[213,141],[211,142],[204,143],[205,144],[206,144],[207,2],[208,144],[210,145],[209,144],[221,146],[202,2],[220,147],[222,147],[223,148],[219,149],[236,150],[235,151],[234,152],[233,153],[237,154],[243,155],[232,156],[239,157],[242,158],[240,159],[241,160],[238,161],[244,165],[245,166],[246,167],[47,2],[48,2],[49,2],[50,2],[51,2],[52,2],[43,2],[53,2],[54,2],[55,2],[44,2],[45,2],[46,2]],"semanticDiagnosticsPerFile":[249,247,145,128,147,129,146,151,152,148,154,149,153,150,136,133,140,134,131,139,144,141,142,143,138,135,132,137,190,225,227,226,228,224,203,199,200,201,198,65,66,68,69,70,71,72,73,74,67,166,75,155,158,159,160,161,162,163,164,165,193,195,194,252,248,250,251,191,157,253,254,257,255,258,259,260,261,272,271,256,273,275,276,274,277,278,279,280,281,282,283,284,285,286,287,156,76,77,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,78,126,94,95,96,127,97,98,99,100,101,102,103,104,105,106,107,108,110,109,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,288,289,290,291,293,292,294,319,320,295,298,317,318,308,307,305,300,313,311,315,299,312,316,301,302,314,296,303,304,306,310,321,309,297,334,333,328,330,329,322,323,325,327,331,332,324,326,336,335,337,338,339,340,130,262,215,216,217,218,177,174,176,175,173,183,178,182,179,181,180,169,170,171,167,168,172,263,267,269,268,266,270,265,264,57,64,59,60,61,62,63,58,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,33,30,31,32,34,7,35,40,41,36,37,38,39,1,42,229,230,231,56,186,185,184,187,189,197,196,188,192,214,212,213,211,204,205,206,207,208,210,209,221,202,220,222,223,219,236,235,234,233,237,243,232,239,242,240,241,238,244,245,246,47,48,49,50,51,52,43,53,54,55,44,45,46],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.9.5"}
+\ No newline at end of file
+diff --git a/dist/types/SelectedNetworkController.d.ts.map b/dist/types/SelectedNetworkController.d.ts.map
+index f9de27de6d312eeb12e583354bd0df73b08598a4..eb0dcc3cd8563769606ae8c6748d2ad1bd5665c1 100644
+--- a/dist/types/SelectedNetworkController.d.ts.map
++++ b/dist/types/SelectedNetworkController.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"SelectedNetworkController.d.ts","sourceRoot":"","sources":["../../src/SelectedNetworkController.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
++{"version":3,"file":"SelectedNetworkController.d.ts","sourceRoot":"","sources":["../../src/SelectedNetworkController.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
diff --git a/package.json b/package.json
index 01014300fbc4..35dcd75ceab1 100644
--- a/package.json
+++ b/package.json
@@ -333,7 +333,7 @@
     "@metamask/rate-limit-controller": "^5.0.1",
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
-    "@metamask/selected-network-controller": "^13.0.0",
+    "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch",
     "@metamask/signature-controller": "^14.0.1",
     "@metamask/smart-transactions-controller": "^10.1.2",
     "@metamask/snaps-controllers": "^9.0.0",
diff --git a/yarn.lock b/yarn.lock
index 8a0fa59374d6..48fa2ace9055 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6138,7 +6138,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/selected-network-controller@npm:^13.0.0":
+"@metamask/selected-network-controller@npm:13.0.0":
   version: 13.0.0
   resolution: "@metamask/selected-network-controller@npm:13.0.0"
   dependencies:
@@ -6155,6 +6155,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/selected-network-controller@patch:@metamask/selected-network-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch":
+  version: 13.0.0
+  resolution: "@metamask/selected-network-controller@patch:@metamask/selected-network-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch::version=13.0.0&hash=276e75"
+  dependencies:
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/json-rpc-engine": "npm:^8.0.2"
+    "@metamask/network-controller": "npm:^18.1.0"
+    "@metamask/permission-controller": "npm:^9.0.2"
+    "@metamask/swappable-obj-proxy": "npm:^2.2.0"
+    "@metamask/utils": "npm:^8.3.0"
+  peerDependencies:
+    "@metamask/network-controller": ^18.0.0
+    "@metamask/permission-controller": ^9.0.0
+  checksum: 10/e081cb32e1600dee1879299a960a84b2839c21ca158e5ab178e43abc56b94dd6a253f9f20c7658a99d6a9b768834e4c81abb911351f8f3225ba71171c7b02f5a
+  languageName: node
+  linkType: hard
+
 "@metamask/signature-controller@npm:^14.0.1":
   version: 14.0.1
   resolution: "@metamask/signature-controller@npm:14.0.1"
@@ -25086,7 +25103,7 @@ __metadata:
     "@metamask/rate-limit-controller": "npm:^5.0.1"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"
-    "@metamask/selected-network-controller": "npm:^13.0.0"
+    "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch"
     "@metamask/signature-controller": "npm:^14.0.1"
     "@metamask/smart-transactions-controller": "npm:^10.1.2"
     "@metamask/snaps-controllers": "npm:^9.0.0"

From 5131f18193fcc69dd4e39ea2b514fe644b0f83ca Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Thu, 27 Jun 2024 18:57:02 +0200
Subject: [PATCH 087/236] fix: (cherry-pick Version v12.0.0) `Cannot
 destructure property 'balance' of 'K[Z]' as it is undefined fromAddress`
 error when no transaction is loaded in ConfirmTransactionBase (#25566)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Cherry-pick https://github.com/MetaMask/metamask-extension/pull/25506
for Version-v12.0.0

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

## **Related issues**

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


## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../confirm-transaction-base.container.js           | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 3734b231dad5..bbcde4171463 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
@@ -5,6 +5,8 @@ import {
   TransactionStatus,
   TransactionType,
 } from '@metamask/transaction-controller';
+import { captureException } from '@sentry/browser';
+
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import { showCustodianDeepLink } from '@metamask-institutional/extension';
 import { mmiActionsFactory } from '../../../store/institutional/institution-background';
@@ -169,7 +171,16 @@ const mapStateToProps = (state, ownProps) => {
   const transactionData = parseStandardTokenTransactionData(data);
   const tokenToAddress = getTokenAddressParam(transactionData);
 
-  const { balance } = accounts[fromAddress];
+  if (!accounts[fromAddress]) {
+    captureException(
+      new Error(
+        `ConfirmTransactionBase: Unexpected state - No account found for sender address. ` +
+          `chainId: ${chainId}. fromAddress?: ${Boolean(fromAddress)}`,
+      ),
+    );
+  }
+
+  const { balance } = accounts[fromAddress] || { balance: '0x0' };
   const fromInternalAccount = getInternalAccountByAddress(state, fromAddress);
   const fromName = fromInternalAccount?.metadata.name;
   const keyring = findKeyringForAddress(state, fromAddress);

From d9c4f7514532540a2567bbc65802af3797c5ec5c Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 28 Jun 2024 12:46:32 +0530
Subject: [PATCH 088/236] feat: display loader on re-designed confirmation page
 while blockaid validation is in progress (#25568)

---
 .../blockaid-loading-indicator.test.tsx.snap  | 49 ++++++++++++
 .../blockaid-loading-indicator.test.tsx       | 79 +++++++++++++++++++
 .../blockaid-loading-indicator.tsx            | 28 +++++++
 .../blockaid-loading-indicator/index.ts       |  1 +
 ui/pages/confirmations/confirm/confirm.tsx    |  2 +
 .../confirmations/selectors/confirm.test.ts   | 38 ++++++++-
 ui/pages/confirmations/selectors/confirm.ts   | 27 ++++++-
 ui/pages/confirmations/types/confirm.ts       |  1 +
 8 files changed, 223 insertions(+), 2 deletions(-)
 create mode 100644 ui/pages/confirmations/components/confirm/blockaid-loading-indicator/__snapshots__/blockaid-loading-indicator.test.tsx.snap
 create mode 100644 ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.test.tsx
 create mode 100644 ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.tsx
 create mode 100644 ui/pages/confirmations/components/confirm/blockaid-loading-indicator/index.ts

diff --git a/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/__snapshots__/blockaid-loading-indicator.test.tsx.snap b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/__snapshots__/blockaid-loading-indicator.test.tsx.snap
new file mode 100644
index 000000000000..b60f849b51f2
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/__snapshots__/blockaid-loading-indicator.test.tsx.snap
@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BlockaidLoadingIndicator returns spinner when there blockaid validation is in progress for signature 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--margin-top-4 mm-box--margin-inline-auto"
+  >
+    <svg
+      class="preloader__icon"
+      fill="none"
+      height="18"
+      viewBox="0 0 16 16"
+      width="18"
+      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>
+`;
diff --git a/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.test.tsx b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.test.tsx
new file mode 100644
index 000000000000..5be896e98827
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.test.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import configureStore from 'redux-mock-store';
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
+
+import mockState from '../../../../../../test/data/mock-state.json';
+import { BlockaidResultType } from '../../../../../../shared/constants/security-provider';
+import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
+import { SecurityAlertResponse } from '../../../types/confirm';
+
+import BlockaidLoadingIndicator from './blockaid-loading-indicator';
+
+const mockSecurityAlertResponse: SecurityAlertResponse = {
+  securityAlertId: 'test-id-mock',
+  reason: 'test-reason',
+  result_type: BlockaidResultType.Loading,
+};
+
+const render = (
+  securityAlertResponse: SecurityAlertResponse = mockSecurityAlertResponse,
+) => {
+  const currentConfirmationMock = {
+    id: '1',
+    status: TransactionStatus.unapproved,
+    time: new Date().getTime(),
+    type: TransactionType.personalSign,
+    securityAlertResponse,
+    chainId: '0x1',
+  };
+
+  const mockExpectedState = {
+    ...mockState,
+    metamask: {
+      ...mockState.metamask,
+      unapprovedPersonalMsgs: {
+        '1': { ...currentConfirmationMock, msgParams: {} },
+      },
+      pendingApprovals: {
+        '1': {
+          ...currentConfirmationMock,
+          origin: 'origin',
+          requestData: {},
+          requestState: null,
+          expectsResult: false,
+        },
+      },
+      preferences: { redesignedConfirmationsEnabled: true },
+      signatureSecurityAlertResponses: {
+        'test-id-mock': securityAlertResponse,
+      },
+    },
+    confirm: { currentConfirmation: currentConfirmationMock },
+  };
+
+  const defaultStore = configureStore()(mockExpectedState);
+  return renderWithProvider(<BlockaidLoadingIndicator />, defaultStore);
+};
+
+describe('BlockaidLoadingIndicator', () => {
+  it('returns spinner when there blockaid validation is in progress for signature', () => {
+    const { container } = render();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('returns null if blockaid validation is not in progress', () => {
+    const { container } = render({
+      reason: 'test-reason',
+      result_type: BlockaidResultType.Benign,
+    });
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it('returns null if there is not blockaid validation response', () => {
+    const { container } = render({} as SecurityAlertResponse);
+    expect(container).toBeEmptyDOMElement();
+  });
+});
diff --git a/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.tsx b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.tsx
new file mode 100644
index 000000000000..49f9c8b199cd
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/blockaid-loading-indicator.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import Preloader from '../../../../../components/ui/icon/preloader';
+import { BlockaidResultType } from '../../../../../../shared/constants/security-provider';
+import { Box } from '../../../../../components/component-library';
+
+import { currentSignatureRequestSecurityResponseSelector } from '../../../selectors';
+
+const BlockaidLoadingIndicator = () => {
+  const signatureSecurityAlertResponse = useSelector(
+    currentSignatureRequestSecurityResponseSelector,
+  );
+
+  if (
+    signatureSecurityAlertResponse?.result_type !== BlockaidResultType.Loading
+  ) {
+    return null;
+  }
+
+  return (
+    <Box marginInline={'auto'} marginTop={4}>
+      <Preloader size={18} />
+    </Box>
+  );
+};
+
+export default BlockaidLoadingIndicator;
diff --git a/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/index.ts b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/index.ts
new file mode 100644
index 000000000000..331dd7ee53b6
--- /dev/null
+++ b/ui/pages/confirmations/components/confirm/blockaid-loading-indicator/index.ts
@@ -0,0 +1 @@
+export { default as BlockaidLoadingIndicator } from './blockaid-loading-indicator';
diff --git a/ui/pages/confirmations/confirm/confirm.tsx b/ui/pages/confirmations/confirm/confirm.tsx
index 8dd75a692def..3f2520667ddd 100644
--- a/ui/pages/confirmations/confirm/confirm.tsx
+++ b/ui/pages/confirmations/confirm/confirm.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { AlertActionHandlerProvider } from '../../../components/app/alert-system/contexts/alertActionHandler';
+import { BlockaidLoadingIndicator } from '../components/confirm/blockaid-loading-indicator';
 import ScrollToBottom from '../components/confirm/scroll-to-bottom';
 import { Footer } from '../components/confirm/footer';
 import { Header } from '../components/confirm/header';
@@ -34,6 +35,7 @@ const Confirm = () => {
           ///: END:ONLY_INCLUDE_IF
         }
         <ScrollToBottom>
+          <BlockaidLoadingIndicator />
           <LedgerInfo />
           <Title />
           <Info />
diff --git a/ui/pages/confirmations/selectors/confirm.test.ts b/ui/pages/confirmations/selectors/confirm.test.ts
index e95da11e2cba..0aa56cb3f82e 100644
--- a/ui/pages/confirmations/selectors/confirm.test.ts
+++ b/ui/pages/confirmations/selectors/confirm.test.ts
@@ -1,12 +1,24 @@
 import { ApprovalType } from '@metamask/controller-utils';
 import { TransactionType } from '@metamask/transaction-controller';
-import { ConfirmMetamaskState } from '../types/confirm';
+
+import {
+  BlockaidReason,
+  BlockaidResultType,
+} from '../../../../shared/constants/security-provider';
+import { ConfirmMetamaskState, SecurityAlertResponse } from '../types/confirm';
 import {
   currentConfirmationSelector,
+  currentSignatureRequestSecurityResponseSelector,
   latestPendingConfirmationSelector,
   pendingConfirmationsSelector,
 } from './confirm';
 
+const SECURITY_ALERT_RESPONSE_MOCK: SecurityAlertResponse = {
+  securityAlertId: '1',
+  result_type: BlockaidResultType.Malicious,
+  reason: BlockaidReason.permitFarming,
+};
+
 describe('confirm selectors', () => {
   const mockedState: ConfirmMetamaskState = {
     confirm: {
@@ -75,4 +87,28 @@ describe('confirm selectors', () => {
       expect(result).toStrictEqual(mockedState.confirm.currentConfirmation);
     });
   });
+
+  describe('currentSignatureRequestSecurityResponseSelector', () => {
+    it('should return SecurityAlertResponse for current signature', () => {
+      const sigMockState: ConfirmMetamaskState = {
+        confirm: {
+          currentConfirmation: {
+            id: '1',
+            type: TransactionType.personalSign,
+            securityAlertResponse: SECURITY_ALERT_RESPONSE_MOCK,
+          },
+        },
+        metamask: {
+          pendingApprovals: {},
+          approvalFlows: [],
+          signatureSecurityAlertResponses: { 1: SECURITY_ALERT_RESPONSE_MOCK },
+        },
+      };
+
+      const result =
+        currentSignatureRequestSecurityResponseSelector(sigMockState);
+
+      expect(result).toStrictEqual(SECURITY_ALERT_RESPONSE_MOCK);
+    });
+  });
 });
diff --git a/ui/pages/confirmations/selectors/confirm.ts b/ui/pages/confirmations/selectors/confirm.ts
index 389696e2c7cb..8b25cdd1e4ab 100644
--- a/ui/pages/confirmations/selectors/confirm.ts
+++ b/ui/pages/confirmations/selectors/confirm.ts
@@ -1,7 +1,12 @@
 import { ApprovalType } from '@metamask/controller-utils';
 
 import { getPendingApprovals } from '../../../selectors/approvals';
-import { ConfirmMetamaskState } from '../types/confirm';
+import {
+  ConfirmMetamaskState,
+  Confirmation,
+  SecurityAlertResponse,
+} from '../types/confirm';
+import { isSignatureTransactionType } from '../utils';
 
 const ConfirmationApprovalTypes = [
   ApprovalType.EthSign,
@@ -35,3 +40,23 @@ export const confirmSelector = (state: ConfirmMetamaskState) => state.confirm;
 
 export const currentConfirmationSelector = (state: ConfirmMetamaskState) =>
   state.confirm.currentConfirmation;
+
+export const currentSignatureRequestSecurityResponseSelector = (
+  state: ConfirmMetamaskState,
+) => {
+  const currentConfirmation: Confirmation | undefined =
+    currentConfirmationSelector(state);
+
+  if (
+    !currentConfirmation ||
+    !isSignatureTransactionType(currentConfirmation)
+  ) {
+    return undefined;
+  }
+
+  const securityAlertId = (
+    currentConfirmation?.securityAlertResponse as SecurityAlertResponse
+  )?.securityAlertId as string;
+
+  return state.metamask.signatureSecurityAlertResponses?.[securityAlertId];
+};
diff --git a/ui/pages/confirmations/types/confirm.ts b/ui/pages/confirmations/types/confirm.ts
index 70e173b03deb..c9a6c2152311 100644
--- a/ui/pages/confirmations/types/confirm.ts
+++ b/ui/pages/confirmations/types/confirm.ts
@@ -45,5 +45,6 @@ export type ConfirmMetamaskState = {
   metamask: {
     pendingApprovals: ApprovalControllerState['pendingApprovals'];
     approvalFlows: ApprovalControllerState['approvalFlows'];
+    signatureSecurityAlertResponses?: Record<string, SecurityAlertResponse>;
   };
 };

From fd90895e42c4ebf4d9701df5bf37edb98310c897 Mon Sep 17 00:00:00 2001
From: Matthew Walsh <matthew.walsh@consensys.net>
Date: Fri, 28 Jun 2024 14:43:20 +0100
Subject: [PATCH 089/236] cherry-pick: prioritize smart transaction status
 confirmation (#25478) (#25569)

Cherry-pick of PR #25478 for issue #25415.
---
 .../confirm-transaction-base.component.js       | 17 ++++++++++++-----
 .../confirm-transaction-base.container.js       |  6 ++++++
 .../confirmation/templates/index.js             |  7 +++++++
 ui/pages/home/home.component.js                 |  5 +++++
 ui/pages/home/home.container.js                 |  4 ++++
 ui/selectors/approvals.ts                       |  2 +-
 ui/selectors/selectors.js                       | 13 ++++++++++++-
 7 files changed, 47 insertions(+), 7 deletions(-)

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 e7f99f6f3b36..4fcb61f7ffb3 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
@@ -174,10 +174,10 @@ export default class ConfirmTransactionBase extends Component {
     isUserOpContractDeployError: PropTypes.bool,
     useMaxValue: PropTypes.bool,
     maxValue: PropTypes.string,
-    isSmartTransaction: PropTypes.bool,
     smartTransactionsOptInStatus: PropTypes.bool,
     currentChainSupportsSmartTransactions: PropTypes.bool,
     selectedNetworkClientId: PropTypes.string,
+    hasPriorityApprovalRequest: PropTypes.bool,
   };
 
   state = {
@@ -207,7 +207,10 @@ export default class ConfirmTransactionBase extends Component {
       setDefaultHomeActiveTabName,
       hexMaximumTransactionFee,
       useMaxValue,
+      hasPriorityApprovalRequest,
+      mostRecentOverviewPage,
     } = this.props;
+
     const {
       customNonceValue: prevCustomNonceValue,
       nextNonce: prevNextNonce,
@@ -215,7 +218,9 @@ export default class ConfirmTransactionBase extends Component {
       transactionStatus: prevTxStatus,
       isEthGasPriceFetched: prevIsEthGasPriceFetched,
       hexMaximumTransactionFee: prevHexMaximumTransactionFee,
+      hasPriorityApprovalRequest: prevHasPriorityApprovalRequest,
     } = prevProps;
+
     const statusUpdated = transactionStatus !== prevTxStatus;
     const txDroppedOrConfirmed =
       transactionStatus === TransactionStatus.dropped ||
@@ -267,6 +272,11 @@ export default class ConfirmTransactionBase extends Component {
     ) {
       this.updateValueToMax();
     }
+
+    if (hasPriorityApprovalRequest && !prevHasPriorityApprovalRequest) {
+      // Redirect to home which will redirect to the priority confirmation.
+      history.push(mostRecentOverviewPage);
+    }
   }
 
   getErrorKey() {
@@ -716,11 +726,8 @@ 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) {
@@ -766,7 +773,7 @@ export default class ConfirmTransactionBase extends Component {
       () => {
         this._removeBeforeUnload();
 
-        sendTransaction(txData, hideLoadingIndicator, loadingIndicatorMessage)
+        sendTransaction(txData, false, loadingIndicatorMessage)
           .then(() => {
             if (!this._isMounted) {
               return;
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 bbcde4171463..42e9ec603512 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
@@ -56,6 +56,7 @@ import {
   getInternalAccountByAddress,
   getApprovedAndSignedTransactions,
   getSelectedNetworkClientId,
+  getPrioritizedUnapprovedTemplatedConfirmations,
 } from '../../../selectors';
 import {
   getCurrentChainSupportsSmartTransactions,
@@ -289,6 +290,10 @@ const mapStateToProps = (state, ownProps) => {
   const isUserOpContractDeployError =
     fullTxData.isUserOperation && type === TransactionType.deployContract;
 
+  const hasPriorityApprovalRequest = Boolean(
+    getPrioritizedUnapprovedTemplatedConfirmations(state).length,
+  );
+
   return {
     balance,
     fromAddress,
@@ -350,6 +355,7 @@ const mapStateToProps = (state, ownProps) => {
     maxValue,
     smartTransactionsOptInStatus,
     currentChainSupportsSmartTransactions,
+    hasPriorityApprovalRequest,
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     accountType,
     isNoteToTraderSupported,
diff --git a/ui/pages/confirmations/confirmation/templates/index.js b/ui/pages/confirmations/confirmation/templates/index.js
index 42d48cc7c1b4..e2929bd9e51a 100644
--- a/ui/pages/confirmations/confirmation/templates/index.js
+++ b/ui/pages/confirmations/confirmation/templates/index.js
@@ -29,6 +29,13 @@ import snapConfirmation from './snaps/snap-confirmation/snap-confirmation';
 import snapPrompt from './snaps/snap-prompt/snap-prompt';
 ///: END:ONLY_INCLUDE_IF
 
+/**
+ * Approval templates that will be prioritized ahead of transaction and signature confirmations.
+ */
+export const PRIORITY_APPROVAL_TEMPLATE_TYPES = [
+  SMART_TRANSACTION_CONFIRMATION_TYPES.showSmartTransactionStatusPage,
+];
+
 const APPROVAL_TEMPLATES = {
   [ApprovalType.AddEthereumChain]: addEthereumChain,
   [ApprovalType.SwitchEthereumChain]: switchEthereumChain,
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 073b9f9eacdd..5592c237c35e 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -173,6 +173,8 @@ export default class Home extends PureComponent {
     originOfCurrentTab: PropTypes.string,
     disableWeb3ShimUsageAlert: PropTypes.func.isRequired,
     pendingConfirmations: PropTypes.arrayOf(PropTypes.object).isRequired,
+    pendingConfirmationsPrioritized: PropTypes.arrayOf(PropTypes.object)
+      .isRequired,
     hasApprovalFlows: PropTypes.bool.isRequired,
     infuraBlocked: PropTypes.bool.isRequired,
     setRecoveryPhraseReminderHasBeenShown: PropTypes.func.isRequired,
@@ -309,6 +311,7 @@ export default class Home extends PureComponent {
       swapsFetchParams,
       location,
       pendingConfirmations,
+      pendingConfirmationsPrioritized,
       hasApprovalFlows,
     } = this.props;
     const stayOnHomePage = Boolean(location?.state?.stayOnHomePage);
@@ -326,6 +329,8 @@ export default class Home extends PureComponent {
       history.push(BUILD_QUOTE_ROUTE);
     } else if (firstPermissionsRequestId) {
       history.push(`${CONNECT_ROUTE}/${firstPermissionsRequestId}`);
+    } else if (pendingConfirmationsPrioritized.length > 0) {
+      history.push(CONFIRMATION_V_NEXT_ROUTE);
     } else if (hasTransactionPendingApprovals) {
       history.push(CONFIRM_TRANSACTION_ROUTE);
     } else if (hasWatchTokenPendingApprovals) {
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 50204a2fc18e..b053b4206408 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -47,6 +47,7 @@ import {
   hasPendingApprovals,
   getSelectedInternalAccount,
   getQueuedRequestCount,
+  getPrioritizedUnapprovedTemplatedConfirmations,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   getAccountType,
   ///: END:ONLY_INCLUDE_IF
@@ -118,6 +119,8 @@ const mapStateToProps = (state) => {
     totalUnapprovedCount + queuedRequestCount;
   const swapsEnabled = getSwapsFeatureIsLive(state);
   const pendingConfirmations = getUnapprovedTemplatedConfirmations(state);
+  const pendingConfirmationsPrioritized =
+    getPrioritizedUnapprovedTemplatedConfirmations(state);
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const institutionalConnectRequests = getInstitutionalConnectRequests(state);
   ///: END:ONLY_INCLUDE_IF
@@ -191,6 +194,7 @@ const mapStateToProps = (state) => {
     originOfCurrentTab,
     shouldShowWeb3ShimUsageNotification,
     pendingConfirmations,
+    pendingConfirmationsPrioritized,
     infuraBlocked: getInfuraBlocked(state),
     announcementsToShow: getSortedAnnouncementsToShow(state).length > 0,
     showWhatsNewPopup,
diff --git a/ui/selectors/approvals.ts b/ui/selectors/approvals.ts
index 113914e5da57..27de25f816a6 100644
--- a/ui/selectors/approvals.ts
+++ b/ui/selectors/approvals.ts
@@ -49,5 +49,5 @@ export function getApprovalFlows(state: ApprovalsMetaMaskState) {
 }
 
 export function getPendingApprovals(state: ApprovalsMetaMaskState) {
-  return Object.values(state.metamask.pendingApprovals);
+  return Object.values(state.metamask.pendingApprovals ?? []);
 }
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 216c7a84003a..405cf668cd09 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -75,7 +75,10 @@ import {
   getURLHostName,
 } from '../helpers/utils/util';
 
-import { TEMPLATED_CONFIRMATION_APPROVAL_TYPES } from '../pages/confirmations/confirmation/templates';
+import {
+  PRIORITY_APPROVAL_TEMPLATE_TYPES,
+  TEMPLATED_CONFIRMATION_APPROVAL_TYPES,
+} from '../pages/confirmations/confirmation/templates';
 import { STATIC_MAINNET_TOKEN_LIST } from '../../shared/constants/tokens';
 import { DAY } from '../../shared/constants/time';
 import { TERMS_OF_USE_LAST_UPDATED } from '../../shared/constants/terms';
@@ -824,6 +827,14 @@ export function getUnapprovedTemplatedConfirmations(state) {
   );
 }
 
+export const getPrioritizedUnapprovedTemplatedConfirmations = createSelector(
+  getUnapprovedTemplatedConfirmations,
+  (unapprovedTemplatedConfirmations) =>
+    unapprovedTemplatedConfirmations.filter(({ type }) =>
+      PRIORITY_APPROVAL_TEMPLATE_TYPES.includes(type),
+    ),
+);
+
 export function getSuggestedTokens(state) {
   return (
     getUnapprovedConfirmations(state)?.filter(({ type, requestData }) => {

From 652591faf6e49e93ef30e52c298f146f47523ba2 Mon Sep 17 00:00:00 2001
From: Chloe Gao <chloe.gao@consensys.net>
Date: Fri, 28 Jun 2024 18:01:19 +0200
Subject: [PATCH 090/236] v12.1.0

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8bc947c4c01..1cb47ad0e4cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.1.0]
+
 ## [11.16.7]
 ### Fixed
 - Fix bug that breaks dapps that expect users to switch chains manually([#25046]https://github.com/MetaMask/metamask-extension/pull/25046)
@@ -4785,7 +4787,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.1.0...HEAD
+[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v12.1.0
 [11.16.7]: https://github.com/MetaMask/metamask-extension/compare/v11.16.6...v11.16.7
 [11.16.6]: https://github.com/MetaMask/metamask-extension/compare/v11.16.5...v11.16.6
 [11.16.5]: https://github.com/MetaMask/metamask-extension/compare/v11.16.4...v11.16.5
diff --git a/package.json b/package.json
index 0eb9a1d6fdc8..ee1f76f2f80c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.7",
+  "version": "12.1.0",
   "private": true,
   "repository": {
     "type": "git",

From 6985713cdfa51c60a64ff721e509fe32fa695c15 Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Sat, 29 Jun 2024 14:33:58 -0500
Subject: [PATCH 091/236] fix: (cherry-pick Version v12.0.0): add
 `eth_signTypedData` and `eth_signTypedData_v3` to
 `methodsRequiringNetworkSwitch` (#25592)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
Cherry-pick https://github.com/MetaMask/metamask-extension/pull/25562
for Version-v12.0.0

## **Related issues**

Fixes: https://github.com/MetaMask/metamask-extension/issues/25528 See
this slack thread:

https://consensys.slack.com/archives/C06FXU326RL/p1719429561925649?thread_ts=1719415715.492249&cid=C06FXU326RL
## **Manual testing steps**
 See videos below 👇

## **Screenshots/Recordings**

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

### **Before**

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



https://github.com/MetaMask/metamask-extension/assets/34557516/3e32fce7-046c-4856-893d-a85083877327


### **After**

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



https://github.com/MetaMask/metamask-extension/assets/34557516/306d88aa-f5f3-4eae-a8e9-30b621c02626


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: seaona <54408225+seaona@users.noreply.github.com>
---
 shared/constants/methods-tags.ts              |   2 +
 .../dapp1-send-dapp2-signTypedData.spec.js    | 148 ++++++++++++++++++
 .../network-account-balance-header.js         |   1 +
 .../confirm-add-suggested-nft.test.js.snap    |   2 +
 .../signature-request-header.test.js.snap     |   1 +
 .../signature-request-original.test.js.snap   |   1 +
 .../signature-request-siwe.test.js.snap       |   1 +
 .../signature-request.test.js.snap            |   2 +
 .../__snapshots__/index.test.js.snap          |   1 +
 .../token-allowance.test.js.snap              |   1 +
 10 files changed, 160 insertions(+)
 create mode 100644 test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.js

diff --git a/shared/constants/methods-tags.ts b/shared/constants/methods-tags.ts
index a770fd733cd2..89cce5f67c8d 100644
--- a/shared/constants/methods-tags.ts
+++ b/shared/constants/methods-tags.ts
@@ -12,6 +12,8 @@ export const methodsRequiringNetworkSwitch = [
   'wallet_switchEthereumChain',
   'wallet_addEthereumChain',
   'wallet_watchAsset',
+  'eth_signTypedData',
+  'eth_signTypedData_v3',
   'eth_signTypedData_v4',
   'personal_sign',
 ] as const;
diff --git a/test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.js b/test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.js
new file mode 100644
index 000000000000..cd197970baea
--- /dev/null
+++ b/test/e2e/tests/request-queuing/dapp1-send-dapp2-signTypedData.spec.js
@@ -0,0 +1,148 @@
+const FixtureBuilder = require('../../fixture-builder');
+const {
+  withFixtures,
+  openDapp,
+  unlockWallet,
+  DAPP_URL,
+  DAPP_ONE_URL,
+  regularDelayMs,
+  defaultGanacheOptions,
+  WINDOW_TITLES,
+} = require('../../helpers');
+
+describe('Request Queuing Dapp 1, Switch Tx -> Dapp 2 Send Tx', function () {
+  it('should queue signTypedData tx after eth_sendTransaction confirmation and signTypedData confirmation should target the correct network after eth_sendTransaction is confirmed @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerTripleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        dappOptions: { numberOfDapps: 2 },
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+            {
+              port: 7777,
+              chainId: 1000,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Open Dapp One
+        await openDapp(driver, undefined, DAPP_URL);
+
+        // Connect to dapp
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await driver.waitUntilXWindowHandles(3);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+
+        // Open Dapp Two
+        await openDapp(driver, undefined, DAPP_ONE_URL);
+
+        // Connect to dapp 2
+        await driver.findClickableElement({ text: 'Connect', tag: 'button' });
+        await driver.clickElement('#connectButton');
+
+        await driver.delay(regularDelayMs);
+
+        await driver.waitUntilXWindowHandles(4);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        await driver.clickElement({
+          text: 'Next',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.clickElement({
+          text: 'Confirm',
+          tag: 'button',
+          css: '[data-testid="page-container-footer-next"]',
+        });
+
+        await driver.switchToWindowWithUrl(DAPP_URL);
+
+        // switch chain for Dapp One
+        const switchEthereumChainRequest = JSON.stringify({
+          jsonrpc: '2.0',
+          method: 'wallet_switchEthereumChain',
+          params: [{ chainId: '0x3e8' }],
+        });
+
+        // Initiate switchEthereumChain on Dapp one
+        await driver.executeScript(
+          `window.ethereum.request(${switchEthereumChainRequest})`,
+        );
+
+        await driver.waitUntilXWindowHandles(4);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        await driver.clickElement({ text: 'Switch network', tag: 'button' });
+
+        await driver.switchToWindowWithUrl(DAPP_URL);
+
+        // eth_sendTransaction request
+        await driver.clickElement('#sendButton');
+
+        await driver.switchToWindowWithUrl(DAPP_ONE_URL);
+
+        // signTypedData request
+        await driver.clickElement('#signTypedData');
+
+        await driver.waitUntilXWindowHandles(4);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        // Check correct network on the send confirmation.
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 7777',
+        });
+
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+        await driver.waitUntilXWindowHandles(4);
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        // Check correct network on the signTypedData confirmation.
+        await driver.findElement({
+          css: '[data-testid="signature-request-network-display"]',
+          text: 'Localhost 8545',
+        });
+      },
+    );
+  });
+});
diff --git a/ui/components/app/network-account-balance-header/network-account-balance-header.js b/ui/components/app/network-account-balance-header/network-account-balance-header.js
index 98c91acfe81a..9137d53f1f14 100644
--- a/ui/components/app/network-account-balance-header/network-account-balance-header.js
+++ b/ui/components/app/network-account-balance-header/network-account-balance-header.js
@@ -68,6 +68,7 @@ export default function NetworkAccountBalanceHeader({
             variant={TextVariant.bodySm}
             as="h6"
             color={TextColor.textAlternative}
+            data-testid="signature-request-network-display"
           >
             {networkName}
           </Text>
diff --git a/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap b/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap
index b740ec784d5c..e37a19739baf 100644
--- a/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap
+++ b/ui/pages/confirm-add-suggested-nft/__snapshots__/confirm-add-suggested-nft.test.js.snap
@@ -83,6 +83,7 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = `
               >
                 <h6
                   class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                  data-testid="signature-request-network-display"
                 >
                   Ethereum Mainnet
                 </h6>
@@ -295,6 +296,7 @@ exports[`ConfirmAddSuggestedNFT Component should match snapshot 1`] = `
             >
               <h6
                 class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                data-testid="signature-request-network-display"
               >
                 Ethereum Mainnet
               </h6>
diff --git a/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap b/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap
index 005650a69853..c2df41b7f906 100644
--- a/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-header/__snapshots__/signature-request-header.test.js.snap
@@ -71,6 +71,7 @@ exports[`SignatureRequestHeader should match snapshot 1`] = `
       >
         <h6
           class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+          data-testid="signature-request-network-display"
         >
           goerli
         </h6>
diff --git a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
index 397ee6f14ffd..01767e66cbcf 100644
--- a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
@@ -147,6 +147,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
           >
             <h6
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="signature-request-network-display"
             >
               goerli
             </h6>
diff --git a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
index b962fa7a9d6e..e5ec7cf7466c 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
@@ -144,6 +144,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
         >
           <h6
             class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+            data-testid="signature-request-network-display"
           >
             goerli
           </h6>
diff --git a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
index 5aabba67b7d2..30011e96a607 100644
--- a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
@@ -144,6 +144,7 @@ exports[`Signature Request Component render should match snapshot when we are us
           >
             <h6
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="signature-request-network-display"
             >
               Localhost 8545
             </h6>
@@ -916,6 +917,7 @@ exports[`Signature Request Component render should match snapshot when we want t
           >
             <h6
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="signature-request-network-display"
             >
               Localhost 8545
             </h6>
diff --git a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
index 1e600744a876..a10be0a7a2b2 100644
--- a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
+++ b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
@@ -144,6 +144,7 @@ exports[`Confirm Signature Request Component render should match snapshot 1`] =
           >
             <h6
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="signature-request-network-display"
             >
               Goerli test network
             </h6>
diff --git a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
index ca5141f6f873..edaa882fa02e 100644
--- a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
+++ b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
@@ -163,6 +163,7 @@ exports[`TokenAllowancePage when mounted should match snapshot 1`] = `
         >
           <h6
             class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+            data-testid="signature-request-network-display"
           >
             mainnet
           </h6>

From 5bce75c0a1d10a187329bad0350f0e06e61713d5 Mon Sep 17 00:00:00 2001
From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Date: Fri, 5 Jul 2024 14:33:05 +0100
Subject: [PATCH 092/236] fix: (cherry-pick Version v12.0.0) confirmation when
 transaction (STX) is pending cross-network (#25689)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
Cherry-pick https://github.com/MetaMask/metamask-extension/pull/25629
for Version-v12.0.0
<!--
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/25689?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Turn on nonce customization in the SEttings->Advanced
2. Connect to Ethereum
3. Send STX (set low gas fee so the STX stays in 'Pending' state for
awhile)
4. Connect to dapp (Pancake Swap, Uniswap) to BNB or other network
5. Start a dapp transaction
6. Notice that nonce field is empty
7. Confirm the transaction, see the loading spinner

## **Screenshots/Recordings**

[Screencast from 02-07-2024

14:05:18.webm](https://github.com/MetaMask/metamask-extension/assets/45455812/2bded87f-6c66-4f78-acaf-badf41ce4563)

<!-- 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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 ...onfirm-page-container-content.component.js |   6 +-
 .../confirm-transaction-base.component.js     |  54 +++++----
 ui/selectors/transactions.js                  |  27 ++++-
 ui/selectors/transactions.test.js             | 112 ++++++++++++++++--
 4 files changed, 151 insertions(+), 48 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
index 71f2ea56b7df..b8687e128cd1 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
@@ -189,7 +189,7 @@ export default class ConfirmPageContainerContent extends Component {
 
     const { t } = this.context;
 
-    const showInsuffienctFundsError =
+    const showInsufficientFundsError =
       (errorKey || errorMessage) && errorKey === INSUFFICIENT_FUNDS_ERROR_KEY;
 
     const showIsSigningOrSubmittingError =
@@ -230,7 +230,7 @@ export default class ConfirmPageContainerContent extends Component {
         />
         {this.renderContent()}
         {!supportsEIP1559 &&
-          !showInsuffienctFundsError &&
+          !showInsufficientFundsError &&
           !showIsSigningOrSubmittingError &&
           !showUserOpContractDeployError &&
           (errorKey || errorMessage) && (
@@ -242,7 +242,7 @@ export default class ConfirmPageContainerContent extends Component {
               marginRight={4}
             />
           )}
-        {showInsuffienctFundsError && (
+        {showInsufficientFundsError && (
           <BannerAlert
             severity={Severity.Danger}
             marginBottom={4}
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 4fcb61f7ffb3..431509678928 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
@@ -400,6 +400,7 @@ export default class ConfirmTransactionBase extends Component {
       useCurrencyRateCheck,
       tokenSymbol,
       isUsingPaymaster,
+      isSigningOrSubmitting,
     } = this.props;
 
     const { t } = this.context;
@@ -489,35 +490,36 @@ export default class ConfirmTransactionBase extends Component {
         : primaryTotalTextOverride;
     };
 
-    const nonceField = useNonceField ? (
-      <div>
-        <div className="confirm-detail-row">
-          <div className="confirm-detail-row__label">
-            {t('nonceFieldHeading')}
-          </div>
-          <div className="custom-nonce-input">
-            <TextField
-              type="number"
-              min={0}
-              placeholder={
-                typeof nextNonce === 'number' ? nextNonce.toString() : null
-              }
-              onChange={({ target: { value } }) => {
-                if (!value.length || Number(value) < 0) {
-                  updateCustomNonce('');
-                } else {
-                  updateCustomNonce(String(Math.floor(value)));
+    const nonceField =
+      useNonceField && !isSigningOrSubmitting ? (
+        <div>
+          <div className="confirm-detail-row">
+            <div className="confirm-detail-row__label">
+              {t('nonceFieldHeading')}
+            </div>
+            <div className="custom-nonce-input">
+              <TextField
+                type="number"
+                min={0}
+                placeholder={
+                  typeof nextNonce === 'number' ? nextNonce.toString() : null
                 }
-                getNextNonce();
-              }}
-              fullWidth
-              margin="dense"
-              value={customNonceValue || ''}
-            />
+                onChange={({ target: { value } }) => {
+                  if (!value.length || Number(value) < 0) {
+                    updateCustomNonce('');
+                  } else {
+                    updateCustomNonce(String(Math.floor(value)));
+                  }
+                  getNextNonce();
+                }}
+                fullWidth
+                margin="dense"
+                value={customNonceValue || ''}
+              />
+            </div>
           </div>
         </div>
-      </div>
-    ) : null;
+      ) : null;
 
     const { simulationData } = txData;
 
diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
index 602d8fcef3ec..82e387682059 100644
--- a/ui/selectors/transactions.js
+++ b/ui/selectors/transactions.js
@@ -23,7 +23,7 @@ const INVALID_INITIAL_TRANSACTION_TYPES = [
 
 export const unapprovedMsgsSelector = (state) => state.metamask.unapprovedMsgs;
 
-export const getCurrentNetworkTransactions = createDeepEqualSelector(
+export const getTransactions = createDeepEqualSelector(
   (state) => {
     const { transactions } = state.metamask ?? {};
 
@@ -31,11 +31,24 @@ export const getCurrentNetworkTransactions = createDeepEqualSelector(
       return [];
     }
 
+    return transactions.sort((a, b) => a.time - b.time); // Ascending
+  },
+  (transactions) => transactions,
+);
+
+export const getCurrentNetworkTransactions = createDeepEqualSelector(
+  (state) => {
+    const transactions = getTransactions(state);
+
+    if (!transactions.length) {
+      return [];
+    }
+
     const { chainId } = getProviderConfig(state);
 
-    return transactions
-      .filter((transaction) => transaction.chainId === chainId)
-      .sort((a, b) => a.time - b.time); // Ascending
+    return transactions.filter(
+      (transaction) => transaction.chainId === chainId,
+    );
   },
   (transactions) => transactions,
 );
@@ -58,9 +71,11 @@ export const getUnapprovedTransactions = createDeepEqualSelector(
 
 export const getApprovedAndSignedTransactions = createDeepEqualSelector(
   (state) => {
-    const currentNetworkTransactions = getCurrentNetworkTransactions(state);
+    // Fetch transactions across all networks to address a nonce management limitation.
+    // This issue arises when a pending transaction exists on one network, and the user initiates another transaction on a different network.
+    const transactions = getTransactions(state);
 
-    return currentNetworkTransactions.filter((transaction) =>
+    return transactions.filter((transaction) =>
       [TransactionStatus.approved, TransactionStatus.signed].includes(
         transaction.status,
       ),
diff --git a/ui/selectors/transactions.test.js b/ui/selectors/transactions.test.js
index 6fe8d1441053..6a126b62936b 100644
--- a/ui/selectors/transactions.test.js
+++ b/ui/selectors/transactions.test.js
@@ -1,6 +1,9 @@
 import { ApprovalType } from '@metamask/controller-utils';
 import { EthAccountType } from '@metamask/keyring-api';
-import { TransactionStatus } from '@metamask/transaction-controller';
+import {
+  TransactionStatus,
+  TransactionType,
+} from '@metamask/transaction-controller';
 import { CHAIN_IDS } from '../../shared/constants/network';
 import {
   ETH_4337_METHODS,
@@ -15,6 +18,7 @@ import {
   submittedPendingTransactionsSelector,
   hasTransactionPendingApprovals,
   getApprovedAndSignedTransactions,
+  getTransactions,
 } from './transactions';
 
 describe('Transaction Selectors', () => {
@@ -179,14 +183,13 @@ describe('Transaction Selectors', () => {
         },
       };
 
-      const orderedTxList = state.metamask.transactions.sort(
-        (a, b) => b.time - a.time,
-      );
-
       const selectedTx = transactionsSelector(state);
 
       expect(Array.isArray(selectedTx)).toStrictEqual(true);
-      expect(selectedTx).toStrictEqual(orderedTxList);
+      expect(selectedTx).toStrictEqual([
+        state.metamask.transactions[1],
+        state.metamask.transactions[0],
+      ]);
     });
     it('should not duplicate incoming transactions', () => {
       const state = {
@@ -234,7 +237,7 @@ describe('Transaction Selectors', () => {
               id: 2,
               chainId: CHAIN_IDS.MAINNET,
               time: 2,
-              type: TransactionStatus.incoming,
+              type: TransactionType.incoming,
               txParams: {
                 from: '0xAddress',
                 to: '0xAddress',
@@ -244,14 +247,13 @@ describe('Transaction Selectors', () => {
         },
       };
 
-      const orderedTxList = state.metamask.transactions.sort(
-        (a, b) => b.time - a.time,
-      );
-
       const selectedTx = transactionsSelector(state);
 
       expect(Array.isArray(selectedTx)).toStrictEqual(true);
-      expect(selectedTx).toStrictEqual(orderedTxList);
+      expect(selectedTx).toStrictEqual([
+        state.metamask.transactions[1],
+        state.metamask.transactions[0],
+      ]);
     });
   });
 
@@ -547,7 +549,7 @@ describe('Transaction Selectors', () => {
   });
 
   describe('getApprovedAndSignedTransactions', () => {
-    it('returns transactions with status of approved or signed on current network', () => {
+    it('returns transactions with status of approved or signed for all networks', () => {
       const state = {
         metamask: {
           providerConfig: {
@@ -588,7 +590,91 @@ describe('Transaction Selectors', () => {
       expect(results).toStrictEqual([
         state.metamask.transactions[0],
         state.metamask.transactions[3],
+        state.metamask.transactions[4],
       ]);
     });
+
+    it('returns an empty array if there are no approved or signed transactions', () => {
+      const state = {
+        metamask: {
+          providerConfig: {
+            chainId: CHAIN_IDS.MAINNET,
+          },
+          transactions: [
+            {
+              id: 0,
+              chainId: CHAIN_IDS.MAINNET,
+              status: TransactionStatus.submitted,
+            },
+            {
+              id: 1,
+              chainId: CHAIN_IDS.MAINNET,
+              status: TransactionStatus.unapproved,
+            },
+          ],
+        },
+      };
+
+      const results = getApprovedAndSignedTransactions(state);
+
+      expect(results).toStrictEqual([]);
+    });
+  });
+
+  describe('getTransactions', () => {
+    it('returns all transactions for all networks', () => {
+      const state = {
+        metamask: {
+          providerConfig: {
+            chainId: CHAIN_IDS.MAINNET,
+          },
+          transactions: [
+            {
+              id: 0,
+              chainId: CHAIN_IDS.MAINNET,
+              status: TransactionStatus.approved,
+            },
+            {
+              id: 1,
+              chainId: CHAIN_IDS.MAINNET,
+              status: TransactionStatus.submitted,
+            },
+            {
+              id: 2,
+              chainId: CHAIN_IDS.MAINNET,
+              status: TransactionStatus.unapproved,
+            },
+            {
+              id: 3,
+              chainId: CHAIN_IDS.MAINNET,
+              status: TransactionStatus.signed,
+            },
+            {
+              id: 4,
+              chainId: CHAIN_IDS.GOERLI,
+              status: TransactionStatus.signed,
+            },
+          ],
+        },
+      };
+
+      const results = getTransactions(state);
+
+      expect(results).toStrictEqual(state.metamask.transactions);
+    });
+
+    it('returns an empty array if there are no transactions', () => {
+      const state = {
+        metamask: {
+          providerConfig: {
+            chainId: CHAIN_IDS.MAINNET,
+          },
+        },
+      };
+
+      const results = getTransactions(state);
+
+      expect(results).toStrictEqual([]);
+    });
   });
 });

From 43cede87dc621ebd0e4aa0a3889a5a0a1191bd7d Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Fri, 5 Jul 2024 17:43:31 +0200
Subject: [PATCH 093/236] fix: version v12.1.0 cherry pick 90d89 (#25701)
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**
Cherry pick PR for the fix #25601
<!--
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/25701?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../multichain/asset-picker-send.spec.ts      | 92 +++++++++++++++++++
 ui/components/app/asset-list/asset-list.js    |  1 +
 ui/components/app/token-cell/token-cell.js    |  1 +
 .../asset-picker-modal/AssetList.test.tsx     | 11 ++-
 .../asset-picker-modal/AssetList.tsx          | 14 ++-
 .../asset-picker-modal/index.scss             |  8 +-
 .../token-list-item.test.js.snap              | 12 +--
 .../token-list-item/token-list-item.js        | 61 ++++++------
 .../token-list-item/token-list-item.test.js   |  1 +
 .../__snapshots__/asset-page.test.tsx.snap    | 12 +--
 10 files changed, 161 insertions(+), 52 deletions(-)
 create mode 100644 test/e2e/tests/multichain/asset-picker-send.spec.ts

diff --git a/test/e2e/tests/multichain/asset-picker-send.spec.ts b/test/e2e/tests/multichain/asset-picker-send.spec.ts
new file mode 100644
index 000000000000..9740cd1c9878
--- /dev/null
+++ b/test/e2e/tests/multichain/asset-picker-send.spec.ts
@@ -0,0 +1,92 @@
+import { strict as assert } from 'assert';
+import { Context } from 'mocha';
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+import FixtureBuilder from '../../fixture-builder';
+import {
+  defaultGanacheOptions,
+  openActionMenuAndStartSendFlow,
+  unlockWallet,
+  withFixtures,
+} from '../../helpers';
+import { Driver } from '../../webdriver/driver';
+import { RECIPIENT_ADDRESS_MOCK } from '../simulation-details/types';
+
+describe('AssetPickerSendFlow', function () {
+  const chainId = CHAIN_IDS.MAINNET;
+
+  const fixtures = {
+    fixtures: new FixtureBuilder({ inputChainId: chainId }).build(),
+    ganacheOptions: {
+      ...defaultGanacheOptions,
+      chainId: parseInt(chainId, 16),
+    },
+  };
+
+  it('should send token using asset picker modal', async function () {
+    const ethConversionInUsd = 10000;
+
+    await withFixtures(
+      {
+        ...fixtures,
+        title: (this as Context).test?.fullTitle(),
+        ethConversionInUsd,
+      },
+      async ({ driver }: { driver: Driver }) => {
+        await unlockWallet(driver);
+
+        // Open the send flow
+        openActionMenuAndStartSendFlow(driver);
+
+        await driver.fill('[data-testid="ens-input"]', RECIPIENT_ADDRESS_MOCK);
+        await driver.fill('.unit-input__input', '2');
+
+        const isDest = 'dest';
+        const buttons = await driver.findElements(
+          '[data-testid="asset-picker-button"]',
+        );
+        const indexOfButtonToClick = isDest ? 1 : 0;
+        await buttons[indexOfButtonToClick].click();
+
+        // check that the name , crypto amount and fiat amount are correctly displayed
+        const tokenListName = await (
+          await driver.findElement(
+            '[data-testid="multichain-token-list-item-token-name"]',
+          )
+        ).getText();
+
+        assert.equal(tokenListName, 'Ethereum');
+
+        const tokenListValue = await (
+          await driver.findElement(
+            '[data-testid="multichain-token-list-item-value"]',
+          )
+        ).getText();
+
+        assert.equal(tokenListValue, '25 ETH');
+
+        const tokenListSecondaryValue = await (
+          await driver.findElement(
+            '[data-testid="multichain-token-list-item-secondary-value"]',
+          )
+        ).getText();
+
+        assert.equal(tokenListSecondaryValue, '$250,000.00');
+
+        // Search for BNB
+        const searchInputField = await driver.waitForSelector(
+          '[data-testid="asset-picker-modal-search-input"]',
+        );
+        await searchInputField.sendKeys('CHZ');
+
+        // check that BNB is disabled
+        const [, tkn] = await driver.findElements(
+          '[data-testid="multichain-token-list-button"]',
+        );
+
+        await tkn.click();
+        const isSelected = await tkn.isSelected();
+        assert.equal(isSelected, false);
+      },
+    );
+  });
+});
diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index 8e493037da44..00b4d24a3b64 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -168,6 +168,7 @@ const AssetList = ({ onClickAsset, showTokensLinks }) => {
         isOriginalTokenSymbol={isOriginalNativeSymbol}
         isNativeCurrency
         isStakeable={isStakeable}
+        showPercentage
       />
       <TokenList
         tokens={tokensWithBalances}
diff --git a/ui/components/app/token-cell/token-cell.js b/ui/components/app/token-cell/token-cell.js
index e58fda03918a..3b781424d3f6 100644
--- a/ui/components/app/token-cell/token-cell.js
+++ b/ui/components/app/token-cell/token-cell.js
@@ -35,6 +35,7 @@ export default function TokenCell({ address, image, symbol, string, onClick }) {
       title={title}
       isOriginalTokenSymbol={isOriginalTokenSymbol}
       address={address}
+      showPercentage
     />
   );
 }
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
index 4a1d1de9a46c..2335f68d8d43 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.test.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import { useSelector } from 'react-redux';
-import { getSelectedAccountCachedBalance } from '../../../../selectors';
+import {
+  getPreferences,
+  getSelectedAccountCachedBalance,
+} from '../../../../selectors';
 import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
 import { useUserPreferencedCurrency } from '../../../../hooks/useUserPreferencedCurrency';
 import { useCurrencyDisplay } from '../../../../hooks/useCurrencyDisplay';
@@ -78,6 +81,9 @@ describe('AssetList', () => {
       if (selector === getSelectedAccountCachedBalance) {
         return balanceValue;
       }
+      if (selector === getPreferences) {
+        return true;
+      }
       return undefined;
     });
 
@@ -136,6 +142,9 @@ describe('AssetList', () => {
         if (selector === getSelectedAccountCachedBalance) {
           return balanceValue;
         }
+        if (selector === getPreferences) {
+          return true;
+        }
         return undefined;
       });
 
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
index fc117998ea3c..5efebe781a1c 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/AssetList.tsx
@@ -1,7 +1,10 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
 import classnames from 'classnames';
-import { getSelectedAccountCachedBalance } from '../../../../selectors';
+import {
+  getPreferences,
+  getSelectedAccountCachedBalance,
+} from '../../../../selectors';
 import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
 import { useUserPreferencedCurrency } from '../../../../hooks/useUserPreferencedCurrency';
 import { PRIMARY, SECONDARY } from '../../../../helpers/constants/common';
@@ -39,6 +42,7 @@ export default function AssetList({
 
   const nativeCurrency = useSelector(getNativeCurrency);
   const balanceValue = useSelector(getSelectedAccountCachedBalance);
+  const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
 
   const {
     currency: primaryCurrency,
@@ -107,7 +111,6 @@ export default function AssetList({
               display={Display.Block}
               flexWrap={FlexWrap.NoWrap}
               alignItems={AlignItems.center}
-              style={{ cursor: 'pointer' }}
             >
               <Box marginInlineStart={2}>
                 {token.type === AssetType.native ? (
@@ -117,9 +120,14 @@ export default function AssetList({
                       primaryCurrencyProperties.value ??
                       secondaryCurrencyProperties.value
                     }
-                    tokenSymbol={primaryCurrencyProperties.suffix}
+                    tokenSymbol={
+                      useNativeCurrencyAsPrimaryCurrency
+                        ? primaryCurrency
+                        : secondaryCurrency
+                    }
                     secondary={secondaryCurrencyDisplay}
                     tokenImage={token.image}
+                    isOriginalTokenSymbol
                   />
                 ) : (
                   <AssetComponent
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss b/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss
index bec402481064..bf231003a671 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/index.scss
@@ -37,10 +37,10 @@
       }
     }
 
-    &--disabled {
-      @include disabled-token {
-        opacity: 0.4;
-      }
+    &--disabled,
+    &:disabled {
+      opacity: var(--opacity-disabled);
+      cursor: not-allowed;
     }
 
     &__selected-indicator {
diff --git a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
index 55910eb389fd..a80941b84c1a 100644
--- a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
+++ b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
@@ -46,14 +46,10 @@ exports[`TokenListItem should render correctly 1`] = `
             <span
               class="mm-box mm-text mm-text--body-md mm-text--font-weight-medium mm-text--ellipsis mm-box--color-text-default"
             />
-            <div
-              class="mm-box mm-box--display-flex"
-            >
-              <p
-                class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-box--color-text-default"
-                data-testid="token-increase-decrease-percentage-null"
-              />
-            </div>
+            <p
+              class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-alternative"
+              data-testid="multichain-token-list-item-token-name"
+            />
           </div>
           <div
             class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"
diff --git a/ui/components/multichain/token-list-item/token-list-item.js b/ui/components/multichain/token-list-item/token-list-item.js
index a52ad8b77cad..17157d2528da 100644
--- a/ui/components/multichain/token-list-item/token-list-item.js
+++ b/ui/components/multichain/token-list-item/token-list-item.js
@@ -37,7 +37,6 @@ import { ModalContent } from '../../component-library/modal-content/deprecated';
 import { ModalHeader } from '../../component-library/modal-header/deprecated';
 import {
   getMetaMetricsId,
-  getPreferences,
   getTestNetworkBackgroundColor,
   getTokensMarketData,
 } from '../../../selectors';
@@ -77,6 +76,7 @@ export const TokenListItem = ({
   isNativeCurrency = false,
   isStakeable = false,
   address = null,
+  showPercentage = false,
 }) => {
   const t = useI18nContext();
   const isEvm = useSelector(getMultichainIsEvm);
@@ -86,13 +86,13 @@ export const TokenListItem = ({
   const chainId = useSelector(getMultichainCurrentChainId);
 
   // Scam warning
-  const showScamWarning = isNativeCurrency && !isOriginalTokenSymbol;
+  const showScamWarning =
+    isNativeCurrency && !isOriginalTokenSymbol && showPercentage;
 
   const dispatch = useDispatch();
   const [showScamWarningModal, setShowScamWarningModal] = useState(false);
   const environmentType = getEnvironmentType();
   const providerConfig = useSelector(getProviderConfig);
-  const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
   const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
   const history = useHistory();
 
@@ -117,6 +117,8 @@ export const TokenListItem = ({
     tokensMarketData?.[address]?.pricePercentChange1d;
 
   const tokenTitle = getTokenTitle();
+  const tokenMainTitleToDisplay = showPercentage ? tokenTitle : tokenSymbol;
+
   const stakeableTitle = (
     <Box
       as="button"
@@ -257,10 +259,10 @@ export const TokenListItem = ({
                   >
                     {isStakeable ? (
                       <>
-                        {tokenTitle} {stakeableTitle}
+                        {tokenMainTitleToDisplay} {stakeableTitle}
                       </>
                     ) : (
-                      tokenTitle
+                      tokenMainTitleToDisplay
                     )}
                   </Text>
                 </Tooltip>
@@ -273,15 +275,25 @@ export const TokenListItem = ({
                 >
                   {isStakeable ? (
                     <Box display={Display.InlineBlock}>
-                      {tokenTitle} {stakeableTitle}
+                      {tokenMainTitleToDisplay}
+                      {stakeableTitle}
                     </Box>
                   ) : (
-                    tokenTitle
+                    tokenMainTitleToDisplay
                   )}
                 </Text>
               )}
 
-              {isEvm && (
+              {isEvm && !showPercentage ? (
+                <Text
+                  variant={TextVariant.bodyMd}
+                  color={TextColor.textAlternative}
+                  data-testid="multichain-token-list-item-token-name"
+                  ellipsis
+                >
+                  {tokenTitle}
+                </Text>
+              ) : (
                 <PercentageChange
                   value={
                     isNativeCurrency
@@ -313,27 +325,14 @@ export const TokenListItem = ({
                   data-testid="scam-warning"
                 />
 
-                {useNativeCurrencyAsPrimaryCurrency ? (
-                  <Text
-                    fontWeight={FontWeight.Medium}
-                    variant={TextVariant.bodyMd}
-                    width={isStakeable ? BlockSize.Half : BlockSize.TwoThirds}
-                    textAlign={TextAlign.End}
-                    data-testid="multichain-token-list-item-secondary-value"
-                    ellipsis={isStakeable}
-                  >
-                    {secondary}
-                  </Text>
-                ) : (
-                  <Text
-                    data-testid="multichain-token-list-item-value"
-                    color={TextColor.textAlternative}
-                    variant={TextVariant.bodyMd}
-                    textAlign={TextAlign.End}
-                  >
-                    {primary} {isNativeCurrency ? '' : tokenSymbol}
-                  </Text>
-                )}
+                <Text
+                  data-testid="multichain-token-list-item-value"
+                  color={TextColor.textAlternative}
+                  variant={TextVariant.bodyMd}
+                  textAlign={TextAlign.End}
+                >
+                  {primary} {isNativeCurrency ? '' : tokenSymbol}
+                </Text>
               </Box>
             ) : (
               <Box
@@ -454,4 +453,8 @@ TokenListItem.propTypes = {
    * address represents the token address
    */
   address: PropTypes.string,
+  /**
+   * showPercentage represents if the increase decrease percentage will be hidden
+   */
+  showPercentage: PropTypes.bool,
 };
diff --git a/ui/components/multichain/token-list-item/token-list-item.test.js b/ui/components/multichain/token-list-item/token-list-item.test.js
index 61fd3c8b626c..44a17cc368ce 100644
--- a/ui/components/multichain/token-list-item/token-list-item.test.js
+++ b/ui/components/multichain/token-list-item/token-list-item.test.js
@@ -102,6 +102,7 @@ describe('TokenListItem', () => {
       primary: '11.9751 ETH',
       isNativeCurrency: true,
       isOriginalTokenSymbol: false,
+      showPercentage: true,
     };
     const { getByTestId, getByText } = renderWithProvider(
       <TokenListItem {...propsToUse} />,
diff --git a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
index 45caafa73765..fe4e339f903b 100644
--- a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
+++ b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
@@ -214,14 +214,12 @@ exports[`AssetPage should render a native asset 1`] = `
                 >
                   TEST
                 </span>
-                <div
-                  class="mm-box mm-box--display-flex"
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-text-alternative"
+                  data-testid="multichain-token-list-item-token-name"
                 >
-                  <p
-                    class="mm-box mm-text mm-text--body-md mm-text--font-weight-normal mm-text--ellipsis mm-box--color-text-default"
-                    data-testid="token-increase-decrease-percentage-0x0000000000000000000000000000000000000000"
-                  />
-                </div>
+                  TEST
+                </p>
               </div>
               <div
                 class="mm-box mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-flex-end mm-box--width-2/3"

From f3918328406cc114f973898c3b9b7053184c940d Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 9 Jul 2024 11:30:49 -0500
Subject: [PATCH 094/236] fix (cherry-pick): Multichain: UX: Check for
 transactions on all networks and QueuedRequestCount (#25614) (#25641)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

There's a case where there could be a race condition between the
`QueuedRequestController`'s network switching and the Routes' network
switching. The root issue is that the use of `getUnapprovedTransactions`
only gets transactions on the `current` chain, thus triggering Routes to
switch networks once the last transaction of the current chain is done,
but there could be more transactions on other chains which we should
allow QRC to handle network switching for.

Thus, this PR lets QRC control network switching until there are
absolutely no transactions or queued requests left.

[This PR includes an
**E2E](https://github.com/MetaMask/metamask-extension/pull/25536)** for
the scenario where there are multiple queued transactions but since this
is a race issue, it's difficult to reproduce in a provable E2E

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25614?quickstart=1)

## **Related issues**

Possibly related:
https://github.com/MetaMask/metamask-extension/issues/25596

## **Manual testing steps**

1. Open `Tab 1`, connect to `Uniswap` on `Ethereum Mainnet`
2. Open `Tab 2`, connect to `PancakeSwap` on `BNB Chain`
3. Open `Tab 3`, connect to `Test Dapp` on `Sepolia`
4. Initiate a swap on `Tab 1` and `Tab 2` *BUT DO NOT CONFIRM IT, JUST
MOVE ON TO THE NEXT TAB*
5. Initiate a send on `Tab 3` *BUT DO NOT CONFIRM IT*
6. On the confirmation screen, you should still see the first
confirmation from `Tab 1` (`Uniswap`) on `Ethereum Mainnet`; confirm or
reject it. See the confirmation window close
7. A new confirmation popup should come up with the `PancakeSwap`/ `Tab
2` confirmation on `BNB` chain; confirm or reject it. See the
confirmation window close
8. See one last confirmation screen pop up for the `Tab 3` / `Test Dapp`
send on `Sepolia`. Confirm or reject it.

Create transactions on different networks, reject and/or confirm them,
click around between popup and notification window, ensure nothing
unexpected occurs


## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25641?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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 | 10 ++--
 ui/pages/routes/routes.container.js |  2 +-
 ui/selectors/selectors.js           |  7 ++-
 ui/selectors/selectors.test.js      | 87 ++++++++++++++++++++++++++++-
 ui/selectors/transactions.js        | 28 +++++++---
 ui/selectors/util.js                | 10 ++++
 6 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 003c4836d917..102a7b340c29 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -212,7 +212,7 @@ export default class Routes extends Component {
     networkToAutomaticallySwitchTo: PropTypes.object,
     neverShowSwitchedNetworkMessage: PropTypes.bool.isRequired,
     automaticallySwitchNetwork: PropTypes.func.isRequired,
-    unapprovedTransactions: PropTypes.number.isRequired,
+    totalUnapprovedConfirmationCount: PropTypes.number.isRequired,
     currentExtensionPopupId: PropTypes.number,
     useRequestQueue: PropTypes.bool,
     showSurveyToast: PropTypes.bool.isRequired,
@@ -279,7 +279,7 @@ export default class Routes extends Component {
       account,
       networkToAutomaticallySwitchTo,
       activeTabOrigin,
-      unapprovedTransactions,
+      totalUnapprovedConfirmationCount,
       isUnlocked,
       useRequestQueue,
       currentExtensionPopupId,
@@ -293,13 +293,13 @@ export default class Routes extends Component {
     }
 
     // Automatically switch the network if the user
-    // no longer has unapprovedTransactions and they
+    // no longer has unapproved transactions and they
     // should be on a different network for the
     // currently active tab's dapp
     if (
       networkToAutomaticallySwitchTo &&
-      unapprovedTransactions === 0 &&
-      (prevProps.unapprovedTransactions > 0 ||
+      totalUnapprovedConfirmationCount === 0 &&
+      (prevProps.totalUnapprovedConfirmationCount > 0 ||
         (prevProps.isUnlocked === false && isUnlocked))
     ) {
       this.props.automaticallySwitchNetwork(
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index da708e147bcc..64e0c6c7b277 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -124,7 +124,7 @@ function mapStateToProps(state) {
     isIpfsModalOpen: state.appState.showIpfsModalOpen,
     switchedNetworkDetails,
     networkToAutomaticallySwitchTo,
-    unapprovedTransactions:
+    totalUnapprovedConfirmationCount:
       getNumberOfAllUnapprovedTransactionsAndMessages(state),
     neverShowSwitchedNetworkMessage: getNeverShowSwitchedNetworkMessage(state),
     currentExtensionPopupId: state.metamask.currentExtensionPopupId,
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 405cf668cd09..452fbeea375b 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -111,6 +111,7 @@ import { PRIVACY_POLICY_DATE } from '../helpers/constants/privacy-policy';
 import { ENVIRONMENT_TYPE_POPUP } from '../../shared/constants/app';
 import { SECURITY_PROVIDER_SUPPORTED_CHAIN_IDS } from '../../shared/constants/security-provider';
 import {
+  getAllUnapprovedTransactions,
   getCurrentNetworkTransactions,
   getUnapprovedTransactions,
 } from './transactions';
@@ -1799,7 +1800,9 @@ export function getShowRecoveryPhraseReminder(state) {
  * @returns Number of unapproved transactions
  */
 export function getNumberOfAllUnapprovedTransactionsAndMessages(state) {
-  const unapprovedTxs = getUnapprovedTransactions(state);
+  const unapprovedTxs = getAllUnapprovedTransactions(state);
+  const queuedRequestCount = getQueuedRequestCount(state);
+
   const allUnapprovedMessages = {
     ...unapprovedTxs,
     ...state.metamask.unapprovedMsgs,
@@ -1809,7 +1812,7 @@ export function getNumberOfAllUnapprovedTransactionsAndMessages(state) {
     ...state.metamask.unapprovedTypedMessages,
   };
   const numUnapprovedMessages = Object.keys(allUnapprovedMessages).length;
-  return numUnapprovedMessages;
+  return numUnapprovedMessages + queuedRequestCount;
 }
 
 export const getCurrentNetwork = createDeepEqualSelector(
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index 46a134509fcc..2ea7ff87d5dc 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -227,6 +227,51 @@ describe('Selectors', () => {
       ).toStrictEqual(0);
     });
 
+    it('returns correct number of unapproved transactions and queued requests', () => {
+      expect(
+        selectors.getNumberOfAllUnapprovedTransactionsAndMessages({
+          metamask: {
+            queuedRequestCount: 5,
+            transactions: [
+              {
+                id: 0,
+                chainId: CHAIN_IDS.MAINNET,
+                time: 0,
+                txParams: {
+                  from: '0xAddress',
+                  to: '0xRecipient',
+                },
+                status: TransactionStatus.unapproved,
+              },
+              {
+                id: 1,
+                chainId: CHAIN_IDS.MAINNET,
+                time: 0,
+                txParams: {
+                  from: '0xAddress',
+                  to: '0xRecipient',
+                },
+                status: TransactionStatus.unapproved,
+              },
+            ],
+            unapprovedMsgs: {
+              2: {
+                id: 2,
+                msgParams: {
+                  from: '0xAddress',
+                  data: '0xData',
+                  origin: 'origin',
+                },
+                time: 1,
+                status: TransactionStatus.unapproved,
+                type: 'eth_sign',
+              },
+            },
+          },
+        }),
+      ).toStrictEqual(8);
+    });
+
     it('returns correct number of unapproved transactions and messages', () => {
       expect(
         selectors.getNumberOfAllUnapprovedTransactionsAndMessages({
@@ -270,7 +315,7 @@ describe('Selectors', () => {
 
   describe('#getNetworkToAutomaticallySwitchTo', () => {
     const SELECTED_ORIGIN = 'https://portfolio.metamask.io';
-    const SELECTED_ORIGIN_NETWORK_ID = 'linea-goerli';
+    const SELECTED_ORIGIN_NETWORK_ID = NETWORK_TYPES.LINEA_SEPOLIA;
     const state = {
       activeTab: {
         origin: SELECTED_ORIGIN,
@@ -287,6 +332,8 @@ describe('Selectors', () => {
         domains: {
           [SELECTED_ORIGIN]: SELECTED_ORIGIN_NETWORK_ID,
         },
+        queuedRequestCount: 0,
+        transactions: [],
         providerConfig: {
           ...mockState.metamask.networkConfigurations
             .testNetworkConfigurationId,
@@ -310,8 +357,44 @@ describe('Selectors', () => {
           ...state.metamask,
           providerConfig: {
             ...state.metamask.providerConfig,
-            id: 'linea-goerli',
+            id: NETWORK_TYPES.LINEA_SEPOLIA,
+          },
+        },
+      });
+      expect(networkToSwitchTo).toBe(null);
+    });
+
+    it('should return no network to switch to because there are pending transactions', () => {
+      const networkToSwitchTo = selectors.getNetworkToAutomaticallySwitchTo({
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            id: NETWORK_TYPES.LINEA_SEPOLIA,
+          },
+          transactions: [
+            {
+              id: 0,
+              chainId: CHAIN_IDS.MAINNET,
+              status: TransactionStatus.approved,
+            },
+          ],
+        },
+      });
+      expect(networkToSwitchTo).toBe(null);
+    });
+
+    it('should return no network to switch to because there are queued requests', () => {
+      const networkToSwitchTo = selectors.getNetworkToAutomaticallySwitchTo({
+        ...state,
+        metamask: {
+          ...state.metamask,
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            id: NETWORK_TYPES.LINEA_SEPOLIA,
           },
+          queuedRequestCount: 1,
         },
       });
       expect(networkToSwitchTo).toBe(null);
diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
index 82e387682059..5a1b3d3ed6d5 100644
--- a/ui/selectors/transactions.js
+++ b/ui/selectors/transactions.js
@@ -14,7 +14,10 @@ import { hexToDecimal } from '../../shared/modules/conversion.utils';
 import { getProviderConfig } from '../ducks/metamask/metamask';
 import { getCurrentChainId, getSelectedInternalAccount } from './selectors';
 import { hasPendingApprovals, getApprovalRequestsByType } from './approvals';
-import { createDeepEqualSelector } from './util';
+import {
+  createDeepEqualSelector,
+  filterAndShapeUnapprovedTransactions,
+} from './util';
 
 const INVALID_INITIAL_TRANSACTION_TYPES = [
   TransactionType.cancel,
@@ -56,15 +59,22 @@ export const getCurrentNetworkTransactions = createDeepEqualSelector(
 export const getUnapprovedTransactions = createDeepEqualSelector(
   (state) => {
     const currentNetworkTransactions = getCurrentNetworkTransactions(state);
+    return filterAndShapeUnapprovedTransactions(currentNetworkTransactions);
+  },
+  (transactions) => transactions,
+);
 
-    return currentNetworkTransactions
-      .filter(
-        (transaction) => transaction.status === TransactionStatus.unapproved,
-      )
-      .reduce((result, transaction) => {
-        result[transaction.id] = transaction;
-        return result;
-      }, {});
+// Unlike `getUnapprovedTransactions` and `getCurrentNetworkTransactions`
+// returns the total number of unapproved transactions on all networks
+export const getAllUnapprovedTransactions = createDeepEqualSelector(
+  (state) => {
+    const { transactions } = state.metamask || [];
+    if (!transactions?.length) {
+      return [];
+    }
+
+    const sortedTransactions = transactions.sort((a, b) => a.time - b.time);
+    return filterAndShapeUnapprovedTransactions(sortedTransactions);
   },
   (transactions) => transactions,
 );
diff --git a/ui/selectors/util.js b/ui/selectors/util.js
index ca3bd0644245..d44b7d905087 100644
--- a/ui/selectors/util.js
+++ b/ui/selectors/util.js
@@ -1,3 +1,4 @@
+import { TransactionStatus } from '@metamask/transaction-controller';
 import { isEqual } from 'lodash';
 import { createSelectorCreator, defaultMemoize } from 'reselect';
 
@@ -5,3 +6,12 @@ export const createDeepEqualSelector = createSelectorCreator(
   defaultMemoize,
   isEqual,
 );
+
+export const filterAndShapeUnapprovedTransactions = (transactions) => {
+  return transactions
+    .filter(({ status }) => status === TransactionStatus.unapproved)
+    .reduce((result, transaction) => {
+      result[transaction.id] = transaction;
+      return result;
+    }, {});
+};

From 09136cd77c97f24461e9a0880370c76229b2a3c4 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 9 Jul 2024 11:31:29 -0500
Subject: [PATCH 095/236] fix (cherry-pick): #25189 - Display network badge for
 send flow asset (#25470) (#25707)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Adds the network badge for the chosen asset in the new Send flow

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25470?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Go to Ethereum Mainnet
2. Go to the Send flow
3. See the chosen asset with Mainnet logo
4. Change to Base network
5. Go to Send flow
6. See the chosen asset with the Base logo

## **Screenshots/Recordings**

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

### **Before**

<img width="409" alt="338344947-c9a6eff0-74f1-4b8a-bca4-48a8325a14d8"
src="https://github.com/MetaMask/metamask-extension/assets/46655/856305e3-5858-4d26-9280-7b539250de6e">



### **After**

<img width="421" alt="SCR-20240621-jquj"

src="https://github.com/MetaMask/metamask-extension/assets/46655/446dc321-5f62-4287-8ab7-5d2ac0eecbd6">




## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25707?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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__/asset-picker.test.tsx.snap  | 52 ++++++++++++++-----
 .../asset-picker/asset-picker.tsx             | 43 ++++++++++++---
 2 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
index 4b62e6ebe220..9eedf3168b8b 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
@@ -13,18 +13,31 @@ exports[`AssetPicker matches snapshot 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
+          class="mm-box mm-badge-wrapper mm-box--margin-right-3 mm-box--display-inline-block"
         >
-          <img
-            aria-hidden="true"
-            class="mm-avatar-token__token-image--blurred"
-            src="./images/eth_logo.svg"
-          />
-          <img
-            alt="undefined logo"
-            class="mm-avatar-token__token-image--size-reduced"
-            src="./images/eth_logo.svg"
-          />
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
+          >
+            <img
+              aria-hidden="true"
+              class="mm-avatar-token__token-image--blurred"
+              src="./images/eth_logo.svg"
+            />
+            <img
+              alt="NATIVE TICKER logo"
+              class="mm-avatar-token__token-image--size-reduced"
+              src="./images/eth_logo.svg"
+            />
+          </div>
+          <div
+            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+          >
+            <div
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-muted box--border-style-solid box--border-width-1"
+            >
+              ?
+            </div>
+          </div>
         </div>
         <div>
           <div
@@ -67,9 +80,22 @@ exports[`AssetPicker render if disabled 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
+          class="mm-box mm-badge-wrapper mm-box--margin-right-3 mm-box--display-inline-block"
         >
-          ?
+          <div
+            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
+          >
+            s
+          </div>
+          <div
+            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+          >
+            <div
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-default box--border-style-solid box--border-width-1"
+            >
+              ?
+            </div>
+          </div>
         </div>
         <div>
           <div
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index a3b1f965cb34..abf9c56eda8c 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -7,11 +7,15 @@ import {
   Text,
   Box,
   Button,
+  AvatarNetworkSize,
+  BadgeWrapper,
+  AvatarNetwork,
 } from '../../../component-library';
 import { Asset, getSendAnalyticProperties } from '../../../../ducks/send';
 import {
   AlignItems,
   BackgroundColor,
+  BorderColor,
   BorderRadius,
   Display,
   IconColor,
@@ -23,8 +27,10 @@ import { AssetType } from '../../../../../shared/constants/transaction';
 import { AssetPickerModal } from '../asset-picker-modal/asset-picker-modal';
 import { getNativeCurrency } from '../../../../ducks/metamask/metamask';
 import {
+  getCurrentNetwork,
   getIpfsGateway,
   getNativeCurrencyImage,
+  getTestNetworkBackgroundColor,
   getTokenList,
 } from '../../../../selectors';
 import Tooltip from '../../../ui/tooltip';
@@ -109,6 +115,10 @@ export function AssetPicker({
       ? `${symbol.substring(0, LARGE_SYMBOL_LENGTH - 1)}...`
       : symbol;
 
+  // Badge details
+  const currentNetwork = useSelector(getCurrentNetwork);
+  const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
+
   return (
     <>
       {/* This is the Modal that ask to choose token to send */}
@@ -155,13 +165,32 @@ export function AssetPicker({
         title={isDisabled ? t('swapTokenNotAvailable') : undefined}
       >
         <Box display={Display.Flex} alignItems={AlignItems.center} gap={3}>
-          <AvatarToken
-            borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}
-            src={primaryTokenImage}
-            size={AvatarTokenSize.Md}
-            showHalo={!isNFT}
-            {...(isNFT && { backgroundColor: BackgroundColor.transparent })}
-          />
+          <BadgeWrapper
+            badge={
+              <AvatarNetwork
+                size={AvatarNetworkSize.Xs}
+                name={currentNetwork?.nickname}
+                src={currentNetwork?.rpcPrefs?.imageUrl}
+                backgroundColor={testNetworkBackgroundColor}
+                borderColor={
+                  primaryTokenImage
+                    ? BorderColor.borderMuted
+                    : BorderColor.borderDefault
+                }
+              />
+            }
+            marginRight={3}
+          >
+            <AvatarToken
+              borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}
+              src={primaryTokenImage}
+              size={AvatarTokenSize.Md}
+              showHalo={!isNFT}
+              name={symbol}
+              {...(isNFT && { backgroundColor: BackgroundColor.transparent })}
+            />
+          </BadgeWrapper>
+
           <Tooltip disabled={!isSymbolLong} title={symbol} position="bottom">
             <Text className="asset-picker__symbol" variant={TextVariant.bodyMd}>
               {formattedSymbol}

From c79f322999ed73a85a1677e09c3bdfc4f8ea29eb Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 3 Jul 2024 12:56:29 -0500
Subject: [PATCH 096/236] fix: UX: Multichain: Add safeguard to throw error
 when confirmation chainId doesn't match current chainId (#25634)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR adds a safety rail to the confirmation screen such that an error
is thrown if the user is seeing a confirmation for a transaction
triggered on another chain.

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

## **Related issues**

Related:  https://github.com/MetaMask/metamask-extension/issues/25596

## **Manual testing steps**

1. This state should be impossible to get to via the UI, thus no
reasonable manual testing steps. Unit test included.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../confirm-transaction-base.component.js     | 20 ++++++--
 .../confirm-transaction-base.test.js          | 47 +++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)

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 431509678928..70eec01335af 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
@@ -178,6 +178,7 @@ export default class ConfirmTransactionBase extends Component {
     currentChainSupportsSmartTransactions: PropTypes.bool,
     selectedNetworkClientId: PropTypes.string,
     hasPriorityApprovalRequest: PropTypes.bool,
+    chainId: PropTypes.string,
   };
 
   state = {
@@ -977,18 +978,28 @@ export default class ConfirmTransactionBase extends Component {
     window.removeEventListener('beforeunload', this._beforeUnloadForGasPolling);
   };
 
-  async componentDidMount() {
+  componentDidMount() {
     this._isMounted = true;
     const {
       toAddress,
-      txData: { origin } = {},
+      txData: { origin, chainId: txChainId } = {},
       getNextNonce,
       tryReverseResolveAddress,
       smartTransactionsOptInStatus,
       currentChainSupportsSmartTransactions,
       setSwapsFeatureFlags,
       fetchSmartTransactionsLiveness,
+      chainId,
     } = this.props;
+
+    // If the user somehow finds themselves seeing a confirmation
+    // on a network which is not presently selected, throw
+    if (txChainId === undefined || txChainId !== chainId) {
+      throw new Error(
+        `Currently selected chainId (${chainId}) does not match chainId (${txChainId}) on which the transaction was proposed.`,
+      );
+    }
+
     const { trackEvent } = this.context;
     trackEvent({
       category: MetaMetricsEventCategory.Transactions,
@@ -1029,11 +1040,10 @@ export default class ConfirmTransactionBase extends Component {
     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([
+      const [swapsFeatureFlags] = Promise.all([
         fetchSwapsFeatureFlags(),
         fetchSmartTransactionsLiveness(),
-      ]);
-      await setSwapsFeatureFlags(swapsFeatureFlags);
+      ]).then(() => setSwapsFeatureFlags(swapsFeatureFlags));
     }
   }
 
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 5cf90c0da6cb..ebfbd0f875d9 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
@@ -807,4 +807,51 @@ describe('Confirm Transaction Base', () => {
       expect(confirmButton).toBeDisabled();
     });
   });
+
+  describe('Preventing transaction submission', () => {
+    it('should throw error when on wrong chain', async () => {
+      const txParams = {
+        ...mockTxParams,
+        to: undefined,
+        data: '0xa22cb46500000000000000',
+        chainId: '0x5',
+      };
+      const state = {
+        ...baseStore,
+        metamask: {
+          ...baseStore.metamask,
+          transactions: [
+            {
+              id: baseStore.confirmTransaction.txData.id,
+              chainId: '0x5',
+              status: 'unapproved',
+              txParams,
+            },
+          ],
+          providerConfig: {
+            type: NETWORK_TYPES.SEPOLIA,
+            ticker: 'ETH',
+            nickname: 'Sepolia',
+            rpcUrl: '',
+            chainId: CHAIN_IDS.SEPOLIA,
+          },
+        },
+        confirmTransaction: {
+          ...baseStore.confirmTransaction,
+          txData: {
+            ...baseStore.confirmTransaction.txData,
+            value: '0x0',
+            isUserOperation: true,
+            txParams,
+            chainId: '0x5',
+          },
+        },
+      };
+
+      // Error will be triggered by componentDidMount
+      await expect(render({ state })).rejects.toThrow(
+        'Currently selected chainId (0xaa36a7) does not match chainId (0x5) on which the transaction was proposed.',
+      );
+    });
+  });
 });

From fbd59284e9f43fbde76aeb639e51462f53b1fb71 Mon Sep 17 00:00:00 2001
From: Guillaume Roux <guillaumeroux123@gmail.com>
Date: Tue, 9 Jul 2024 16:48:28 +0200
Subject: [PATCH 097/236] fix: Fix crash of Transaction screen with smart
 transaction (#25717)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This fixes a crash of the transaction screen caused by the swap and
smart transaction feature flag being incorrectly set.

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

## **Related issues**

Fixes:

## **Manual testing steps**

1. Try sending a transaction with smart transaction enabled

## **Screenshots/Recordings**

### **Before**


![image](https://github.com/MetaMask/metamask-extension/assets/13910212/d4e97a34-d6a0-4c0a-98f8-6fff5f54e095)


### **After**


![image](https://github.com/MetaMask/metamask-extension/assets/13910212/af52dd4a-b039-4671-b25c-88fb6751a330)

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../confirm-transaction-base.component.js                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 70eec01335af..b8546e2953e5 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
@@ -1040,10 +1040,10 @@ export default class ConfirmTransactionBase extends Component {
     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] = Promise.all([
+      Promise.all([
         fetchSwapsFeatureFlags(),
         fetchSmartTransactionsLiveness(),
-      ]).then(() => setSwapsFeatureFlags(swapsFeatureFlags));
+      ]).then(([swapsFeatureFlags]) => setSwapsFeatureFlags(swapsFeatureFlags));
     }
   }
 

From 452daa5349d2c9aad290a724ef1cfc1af0f0833b Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 10 Jul 2024 21:21:15 +0530
Subject: [PATCH 098/236] cherry-pick: fix blockaid report url in redesigned
 pages (#25743)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix blockaid reportUrl in redesigned pages.

## **Related issues**

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

## **Manual testing steps**

1. Go to malicious permit page
2. Check report url

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 app/scripts/lib/ppom/types.ts                 |  1 +
 ui/ducks/confirm-alerts/confirm-alerts.ts     |  5 ++
 .../components/confirm/title/title.tsx        |  1 +
 .../hooks/alerts/useBlockaidAlert.test.ts     |  3 +
 .../hooks/alerts/useBlockaidAlert.ts          | 62 ++++++++++++++++++-
 ui/pages/confirmations/hooks/alerts/utils.ts  |  3 +
 ui/pages/confirmations/types/confirm.ts       |  1 +
 7 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/app/scripts/lib/ppom/types.ts b/app/scripts/lib/ppom/types.ts
index 8dc272edbf24..381233141c8a 100644
--- a/app/scripts/lib/ppom/types.ts
+++ b/app/scripts/lib/ppom/types.ts
@@ -1,4 +1,5 @@
 export type SecurityAlertResponse = {
+  block?: number;
   description?: string;
   features?: string[];
   providerRequestsCount?: Record<string, number>;
diff --git a/ui/ducks/confirm-alerts/confirm-alerts.ts b/ui/ducks/confirm-alerts/confirm-alerts.ts
index 8c587d164825..f28cb7b83acc 100644
--- a/ui/ducks/confirm-alerts/confirm-alerts.ts
+++ b/ui/ducks/confirm-alerts/confirm-alerts.ts
@@ -52,6 +52,11 @@ export type Alert = {
    * The severity of the alert.
    */
   severity: AlertSeverity;
+
+  /**
+   * URL to report issue.
+   */
+  reportUrl?: string;
 };
 
 /**
diff --git a/ui/pages/confirmations/components/confirm/title/title.tsx b/ui/pages/confirmations/components/confirm/title/title.tsx
index ea18fcbadd63..397b219f1666 100644
--- a/ui/pages/confirmations/components/confirm/title/title.tsx
+++ b/ui/pages/confirmations/components/confirm/title/title.tsx
@@ -44,6 +44,7 @@ function ConfirmBannerAlert({ ownerId }: { ownerId: string }) {
         severity={highestSeverity}
         provider={hasMultipleAlerts ? undefined : singleAlert.provider}
         details={hasMultipleAlerts ? undefined : singleAlert.alertDetails}
+        reportUrl={singleAlert.reportUrl}
       />
     </Box>
   );
diff --git a/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.test.ts b/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.test.ts
index ad8054e898a8..f6ac39e02c33 100644
--- a/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.test.ts
@@ -92,6 +92,7 @@ describe('useBlockaidAlert', () => {
       provider: SecurityProvider.Blockaid,
       reason: 'This is a deceptive request',
     };
+
     const { result } = renderHookWithProvider(() => useBlockaidAlert(), {
       ...mockExpectedState,
       metamask: {
@@ -102,6 +103,8 @@ describe('useBlockaidAlert', () => {
       },
     });
     expect(result.current).toHaveLength(1);
+    expect(result.current[0].reportUrl).toBeDefined();
+    delete result.current[0].reportUrl;
     expect(result.current[0]).toStrictEqual(alertResponseExpected);
   });
 });
diff --git a/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts b/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts
index 7eae58b553c7..62bbe0c49918 100644
--- a/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts
+++ b/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts
@@ -1,14 +1,25 @@
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
+import BlockaidPackage from '@blockaid/ppom_release/package.json';
 
-import { BlockaidResultType } from '../../../../../shared/constants/security-provider';
+import {
+  BlockaidResultType,
+  FALSE_POSITIVE_REPORT_BASE_URL,
+  SECURITY_PROVIDER_UTM_SOURCE,
+} from '../../../../../shared/constants/security-provider';
+import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
+import { NETWORK_TO_NAME_MAP } from '../../../../../shared/constants/network';
 import { Alert } from '../../../../ducks/confirm-alerts/confirm-alerts';
+import { getCurrentChainId } from '../../../../selectors';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { SecurityAlertResponse } from '../../types/confirm';
 import { isSignatureTransactionType } from '../../utils';
 import useCurrentConfirmation from '../useCurrentConfirmation';
 import { normalizeProviderAlert } from './utils';
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+const zlib = require('zlib');
+
 type SignatureSecurityAlertResponsesState = {
   metamask: {
     signatureSecurityAlertResponses: Record<string, SecurityAlertResponse>;
@@ -21,6 +32,8 @@ const useBlockaidAlerts = (): Alert[] => {
   const securityAlertResponse =
     currentConfirmation?.securityAlertResponse as SecurityAlertResponse;
 
+  const selectorChainId = useSelector(getCurrentChainId);
+
   const signatureSecurityAlertResponse = useSelector(
     (state: SignatureSecurityAlertResponsesState) =>
       state.metamask.signatureSecurityAlertResponses?.[
@@ -28,6 +41,39 @@ const useBlockaidAlerts = (): Alert[] => {
       ],
   );
 
+  let stringifiedJSONData: string | undefined;
+
+  if (securityAlertResponse && currentConfirmation) {
+    const {
+      block,
+      features,
+      reason,
+      result_type: resultType,
+    } = securityAlertResponse as SecurityAlertResponse;
+    const { chainId, msgParams, origin, type, txParams } = currentConfirmation;
+
+    const isFailedResultType = resultType === BlockaidResultType.Errored;
+
+    const reportData = {
+      blockNumber: block,
+      blockaidVersion: BlockaidPackage.version,
+      chain: (NETWORK_TO_NAME_MAP as Record<string, string>)[
+        chainId ?? selectorChainId
+      ],
+      classification: isFailedResultType ? 'error' : reason,
+      domain:
+        origin ??
+        (msgParams as { origin: string })?.origin ??
+        (txParams as { origin: string })?.origin,
+      jsonRpcMethod: type,
+      jsonRpcParams: JSON.stringify(txParams ?? msgParams),
+      resultType: isFailedResultType ? BlockaidResultType.Errored : resultType,
+      reproduce: JSON.stringify(features),
+    };
+
+    stringifiedJSONData = JSON.stringify(reportData);
+  }
+
   const alerts = useMemo<Alert[]>(() => {
     if (!isSignatureTransactionType(currentConfirmation)) {
       return [];
@@ -42,7 +88,19 @@ const useBlockaidAlerts = (): Alert[] => {
       return [];
     }
 
-    return [normalizeProviderAlert(signatureSecurityAlertResponse, t)];
+    let reportUrl = ZENDESK_URLS.SUPPORT_URL;
+    if (stringifiedJSONData) {
+      const encodedData =
+        zlib?.gzipSync?.(stringifiedJSONData) ?? stringifiedJSONData;
+
+      reportUrl = `${FALSE_POSITIVE_REPORT_BASE_URL}?data=${encodeURIComponent(
+        encodedData.toString('base64'),
+      )}&utm_source=${SECURITY_PROVIDER_UTM_SOURCE}`;
+    }
+
+    return [
+      normalizeProviderAlert(signatureSecurityAlertResponse, t, reportUrl),
+    ];
   }, [currentConfirmation, signatureSecurityAlertResponse]);
 
   return alerts;
diff --git a/ui/pages/confirmations/hooks/alerts/utils.ts b/ui/pages/confirmations/hooks/alerts/utils.ts
index 6c88008a2a7c..01906272e08d 100644
--- a/ui/pages/confirmations/hooks/alerts/utils.ts
+++ b/ui/pages/confirmations/hooks/alerts/utils.ts
@@ -38,11 +38,13 @@ export function getProviderAlertSeverity(
  *
  * @param securityAlertResponse - The security alert response to normalize.
  * @param t - The translation function.
+ * @param reportUrl - URL to report.
  * @returns The normalized Alert object.
  */
 export function normalizeProviderAlert(
   securityAlertResponse: SecurityAlertResponse,
   t: ReturnType<typeof useI18nContext>,
+  reportUrl?: string,
 ): Alert {
   return {
     key: securityAlertResponse.securityAlertId || '',
@@ -61,5 +63,6 @@ export function normalizeProviderAlert(
       ] || REASON_TO_DESCRIPTION_TKEY.other,
     ),
     provider: SecurityProvider.Blockaid, // TODO: Remove this once we support more providers and implement a way to determine it.
+    reportUrl,
   };
 }
diff --git a/ui/pages/confirmations/types/confirm.ts b/ui/pages/confirmations/types/confirm.ts
index c9a6c2152311..1d988c8b9603 100644
--- a/ui/pages/confirmations/types/confirm.ts
+++ b/ui/pages/confirmations/types/confirm.ts
@@ -11,6 +11,7 @@ export type TypedSignDataV1Type = {
 }[];
 
 export type SecurityAlertResponse = {
+  block?: number;
   reason: string;
   features?: string[];
   result_type: string;

From d6e1b263c18b354ba62cdbb56db1e4484da1d40f Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 10 Jul 2024 13:31:25 -0230
Subject: [PATCH 099/236] fix (cherry-pick): UX: Multichain: Fix dead network
 problem when switching tabs (#25425)  (#25740)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

_This restores PR #25669, which was merged yesterday before conflicts
were resolved. The below is a copy of the PR description from #25669_

(Submitting as placeholder until previous cherry-picks are in, will
rebase on that to fix merge conflict)

<!--
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.
-->

This PR ensures that a connection to a given network does not block the
UI when switching to a dapp tab that remembers that down network, thus
preventing a non-respondent network from not displaying the MetaMask UI

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25425?quickstart=1)

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

1. Start local ganache
2. Add the local network to your network listing (Settings -> Networks
-> Add custom network)
3. In tab 1, connect to dapp 1 on Localhost
4. In tab 2, connect to dapp 2 on Ethereum Mainnet
5. Kill local ganache
6. Click tab 1
7. Click the MetaMask icon in the extension bar
8. See UI pop up as expected

1. Start local ganache
2. Add the local network to your network listing (Settings -> Networks
-> Add custom network)
3. In tab 1, connect to dapp 1 on Localhost
4. In tab 2, connect to dapp 2 on Ethereum Mainnet
5. Kill local ganache
6. Click tab 1
7. Trigger a transaction from the dapp
8. See UI pop up quickly, with confirmation, as expected

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

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

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

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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.

---------


<!--
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/25669?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: David Walsh <davidwalsh83@gmail.com>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 app/scripts/metamask-controller.js        |   5 +
 test/e2e/helpers.js                       |   2 +
 test/e2e/tests/request-queuing/ui.spec.js | 486 ++++++++++++++++++++--
 ui/store/actions.ts                       |  13 +-
 4 files changed, 468 insertions(+), 38 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index aa165151f736..e6531ecd897b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -3152,6 +3152,11 @@ export default class MetamaskController extends EventEmitter {
       setActiveNetwork: (networkConfigurationId) => {
         return this.networkController.setActiveNetwork(networkConfigurationId);
       },
+      // Avoids returning the promise so that initial call to switch network
+      // doesn't block on the network lookup step
+      setActiveNetworkConfigurationId: (networkConfigurationId) => {
+        this.networkController.setActiveNetwork(networkConfigurationId);
+      },
       setNetworkClientIdForDomain: (origin, networkClientId) => {
         return this.selectedNetworkController.setNetworkClientIdForDomain(
           origin,
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 6d3d856a9503..e733fca079f3 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -656,6 +656,7 @@ const closeSRPReveal = async (driver) => {
 const DAPP_HOST_ADDRESS = '127.0.0.1:8080';
 const DAPP_URL = `http://${DAPP_HOST_ADDRESS}`;
 const DAPP_ONE_URL = 'http://127.0.0.1:8081';
+const DAPP_TWO_URL = 'http://127.0.0.1:8082';
 
 const openDapp = async (driver, contract = null, dappURL = DAPP_URL) => {
   return contract
@@ -1114,6 +1115,7 @@ module.exports = {
   DAPP_HOST_ADDRESS,
   DAPP_URL,
   DAPP_ONE_URL,
+  DAPP_TWO_URL,
   TEST_SEED_PHRASE,
   TEST_SEED_PHRASE_TWO,
   PRIVATE_KEY,
diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js
index e85d87226e84..4c0aa8fea3e1 100644
--- a/test/e2e/tests/request-queuing/ui.spec.js
+++ b/test/e2e/tests/request-queuing/ui.spec.js
@@ -1,4 +1,5 @@
 const { strict: assert } = require('assert');
+const { Browser } = require('selenium-webdriver');
 const FixtureBuilder = require('../../fixture-builder');
 const {
   withFixtures,
@@ -11,21 +12,33 @@ const {
   defaultGanacheOptions,
   switchToNotificationWindow,
   veryLargeDelayMs,
+  DAPP_TWO_URL,
 } = require('../../helpers');
 const { PAGES } = require('../../webdriver/driver');
 
-async function openDappAndSwitchChain(driver, dappUrl, chainId) {
-  const notificationWindowIndex = chainId ? 4 : 3;
+// Window handle adjustments will need to be made for Non-MV3 Firefox
+// due to OffscreenDocument.  Additionally Firefox continually bombs
+// with a "NoSuchWindowError: Browsing context has been discarded" whenever
+// we try to open a third dapp, so this test run in Firefox will
+// validate two dapps instead of 3
+const IS_FIREFOX = process.env.SELENIUM_BROWSER === Browser.FIREFOX;
 
+async function openDappAndSwitchChain(
+  driver,
+  dappUrl,
+  chainId,
+  notificationWindowIndex = 3,
+) {
   // Open the dapp
   await openDapp(driver, undefined, dappUrl);
-  await driver.delay(regularDelayMs);
 
   // Connect to the dapp
   await driver.findClickableElement({ text: 'Connect', tag: 'button' });
   await driver.clickElement('#connectButton');
   await driver.delay(regularDelayMs);
+
   await switchToNotificationWindow(driver, notificationWindowIndex);
+
   await driver.clickElement({
     text: 'Next',
     tag: 'button',
@@ -59,40 +72,286 @@ async function openDappAndSwitchChain(driver, dappUrl, chainId) {
       '[data-testid="confirmation-submit-button"]',
     );
     await driver.clickElement('[data-testid="confirmation-submit-button"]');
+
+    // Switch back to the dapp
+    await driver.switchToWindowWithUrl(dappUrl);
   }
 }
 
-async function selectDappClickSendGetNetwork(driver, dappUrl) {
+async function selectDappClickSend(driver, dappUrl) {
   await driver.switchToWindowWithUrl(dappUrl);
-  // Windows: MetaMask, TestDapp1, TestDapp2
-  const expectedWindowHandles = 3;
-  await driver.waitUntilXWindowHandles(expectedWindowHandles);
-  const currentWindowHandles = await driver.getAllWindowHandles();
   await driver.clickElement('#sendButton');
+}
 
-  // Under mv3, we don't need to add to the current number of window handles
-  // because the offscreen document returned by getAllWindowHandles provides
-  // an extra window handle
-  const newWindowHandles = await driver.waitUntilXWindowHandles(
-    process.env.ENABLE_MV3 === 'true' || process.env.ENABLE_MV3 === undefined
-      ? currentWindowHandles.length
-      : currentWindowHandles.length + 1,
-  );
-  const [newNotificationWindowHandle] = newWindowHandles.filter(
-    (h) => !currentWindowHandles.includes(h),
-  );
-  await driver.switchToWindow(newNotificationWindowHandle);
+async function selectDappClickPersonalSign(driver, dappUrl) {
+  await driver.switchToWindowWithUrl(dappUrl);
+  await driver.clickElement('#personalSign');
+}
+
+async function switchToNotificationPopoverValidateDetails(
+  driver,
+  expectedDetails,
+) {
+  // Switches to the MetaMask Dialog window for confirmation
+  const windowHandles = await driver.getAllWindowHandles();
+  await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog, windowHandles);
+
+  await driver.findElement({
+    css: '[data-testid="network-display"], [data-testid="signature-request-network-display"]',
+    text: expectedDetails.networkText,
+  });
 
-  const networkPill = await driver.findElement(
-    '[data-testid="network-display"]',
+  await driver.findElement({
+    css: '.confirm-page-container-summary__origin bdi, .request-signature__origin .chip__label',
+    text: expectedDetails.originText,
+  });
+
+  // Get state details
+  const notificationWindowState = await driver.executeScript(() =>
+    window.stateHooks?.getCleanAppState?.(),
   );
-  const networkText = await networkPill.getText();
-  await driver.clickElement({ css: 'button', text: 'Reject' });
-  return networkText;
+
+  const { chainId } = notificationWindowState.metamask.providerConfig;
+  assert.equal(chainId, expectedDetails.chainId);
+}
+
+async function rejectTransaction(driver) {
+  await driver.clickElement({ tag: 'button', text: 'Reject' });
+}
+
+async function confirmTransaction(driver) {
+  await driver.clickElement({ tag: 'button', text: 'Confirm' });
+}
+
+async function switchToNetworkByName(driver, networkName) {
+  await driver.clickElement('[data-testid="network-display"]');
+  await driver.clickElement(`[data-testid="${networkName}"]`);
+}
+
+async function validateBalanceAndActivity(
+  driver,
+  expectedBalance,
+  expectedActivityEntries = 1,
+) {
+  // Ensure the balance changed if the the transaction was confirmed
+  await driver.waitForSelector({
+    css: '[data-testid="eth-overview__primary-currency"] .currency-display-component__text',
+    text: expectedBalance,
+  });
+
+  // Ensure there's an activity entry of "Send" and "Confirmed"
+  if (expectedActivityEntries) {
+    await driver.clickElement('[data-testid="account-overview__activity-tab"]');
+    assert.equal(
+      (
+        await driver.findElements({
+          css: '[data-testid="activity-list-item-action"]',
+          text: 'Send',
+        })
+      ).length,
+      expectedActivityEntries,
+    );
+    assert.equal(
+      (await driver.findElements('.transaction-status-label--confirmed'))
+        .length,
+      expectedActivityEntries,
+    );
+  }
 }
 
 describe('Request-queue UI changes', function () {
-  it('UI should show network specific to domain @no-mmi', async function () {
+  it('should show network specific to domain @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338; // 0x53a
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open the first dapp
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open the second dapp and switch chains
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x53a', 4);
+
+        // Go to wallet fullscreen, ensure that the global network changed to Ethereum Mainnet
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Localhost 8546',
+        });
+
+        // Go to the first dapp, ensure it uses localhost
+        await selectDappClickSend(driver, DAPP_URL);
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x539',
+          networkText: 'Localhost 8545',
+          originText: DAPP_URL,
+        });
+        await rejectTransaction(driver);
+
+        // Go to the second dapp, ensure it uses Ethereum Mainnet
+        await selectDappClickSend(driver, DAPP_ONE_URL);
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x53a',
+          networkText: 'Localhost 8546',
+          originText: DAPP_ONE_URL,
+        });
+        await rejectTransaction(driver);
+      },
+    );
+  });
+
+  it('handles three confirmations on three confirmations concurrently @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338; // 0x53a
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerTripleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            // Ganache for network 1
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+            // Ganache for network 3
+            {
+              port: 7777,
+              chainId: 1000,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        dappOptions: { numberOfDapps: 3 },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open the first dapp
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open the second dapp and switch chains
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x53a', 4);
+
+        if (!IS_FIREFOX) {
+          // Open the third dapp and switch chains
+          await openDappAndSwitchChain(driver, DAPP_TWO_URL, '0x3e8', 5);
+        }
+
+        // Trigger a send confirmation on the first dapp, do not confirm or reject
+        await selectDappClickSend(driver, DAPP_URL);
+
+        // Trigger a send confirmation on the second dapp, do not confirm or reject
+        await selectDappClickSend(driver, DAPP_ONE_URL);
+
+        if (!IS_FIREFOX) {
+          // Trigger a send confirmation on the third dapp, do not confirm or reject
+          await selectDappClickSend(driver, DAPP_TWO_URL);
+        }
+
+        // Switch to the Notification window, ensure first transaction still showing
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x539',
+          networkText: 'Localhost 8545',
+          originText: DAPP_URL,
+        });
+
+        // Confirm transaction, wait for first confirmation window to close, second to display
+        await confirmTransaction(driver);
+        await driver.delay(veryLargeDelayMs);
+
+        // Switch to the new Notification window, ensure second transaction showing
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x53a',
+          networkText: 'Localhost 8546',
+          originText: DAPP_ONE_URL,
+        });
+
+        // Reject this transaction, wait for second confirmation window to close, third to display
+        await rejectTransaction(driver);
+        await driver.delay(veryLargeDelayMs);
+
+        if (!IS_FIREFOX) {
+          // Switch to the new Notification window, ensure third transaction showing
+          await switchToNotificationPopoverValidateDetails(driver, {
+            chainId: '0x3e8',
+            networkText: 'Localhost 7777',
+            originText: DAPP_TWO_URL,
+          });
+
+          // Confirm transaction
+          await confirmTransaction(driver);
+        }
+
+        // With first and last confirmations confirmed, and second rejected,
+        // Ensure only first and last network balances were affected
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
+        // Wait for transaction to be completed on final confirmation
+        await driver.delay(veryLargeDelayMs);
+
+        if (!IS_FIREFOX) {
+          // Start on the last joined network, whose send transaction was just confirmed
+          await validateBalanceAndActivity(driver, '24.9998');
+        }
+
+        // Switch to second network, ensure full balance
+        await switchToNetworkByName(driver, 'Localhost 8546');
+        await validateBalanceAndActivity(driver, '25', 0);
+
+        // Turn on test networks in Networks menu so Localhost 8545 is available
+        await driver.clickElement('[data-testid="network-display"]');
+        await driver.clickElement('.mm-modal-content__dialog .toggle-button');
+        await driver.clickElement(
+          '.mm-modal-content__dialog button[aria-label="Close"]',
+        );
+
+        // Switch to first network, whose send transaction was just confirmed
+        await switchToNetworkByName(driver, 'Localhost 8545');
+        await validateBalanceAndActivity(driver, '24.9998');
+      },
+    );
+  });
+
+  it('should gracefully handle deleted network @no-mmi', async function () {
     const port = 8546;
     const chainId = 1338;
     await withFixtures(
@@ -126,7 +385,7 @@ describe('Request-queue UI changes', function () {
         await openDappAndSwitchChain(driver, DAPP_URL);
 
         // Open the second dapp and switch chains
-        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1');
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1', 4);
 
         // Go to wallet fullscreen, ensure that the global network changed to Ethereum Mainnet
         await driver.switchToWindowWithTitle(
@@ -137,19 +396,172 @@ describe('Request-queue UI changes', function () {
           text: 'Ethereum Mainnet',
         });
 
-        // Go to the first dapp, ensure it uses localhost
-        const dappOneNetworkPillText = await selectDappClickSendGetNetwork(
-          driver,
-          DAPP_URL,
+        // Go to Settings, delete the first dapp's network
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
         );
-        assert.equal(dappOneNetworkPillText, 'Localhost 8545');
+        await driver.clickElement('[data-testid="global-menu-settings"]');
+        await driver.clickElement({
+          css: '.tab-bar__tab__content__title',
+          text: 'Networks',
+        });
+        await driver.clickElement({
+          css: '.networks-tab__networks-list-name',
+          text: 'Localhost 8545',
+        });
+        await driver.clickElement({ css: '.btn-danger', text: 'Delete' });
+        await driver.clickElement({
+          css: '.modal-container__footer-button',
+          text: 'Delete',
+        });
 
-        // Go to the second dapp, ensure it uses Ethereum Mainnet
-        const dappTwoNetworkPillText = await selectDappClickSendGetNetwork(
-          driver,
-          DAPP_ONE_URL,
+        // Go back to first dapp, try an action, ensure deleted network doesn't block UI
+        // The current globally selected network, Ethereum Mainnet, should be used
+        await selectDappClickSend(driver, DAPP_URL);
+        await driver.delay(veryLargeDelayMs);
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x1',
+          networkText: 'Ethereum Mainnet',
+          originText: DAPP_URL,
+        });
+      },
+    );
+  });
+
+  it('should gracefully handle network connectivity failure for signatures @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        // This test intentionally quits Ganache while the extension is using it, causing
+        // PollingBlockTracker errors and others. These are expected.
+        ignoredConsoleErrors: ['ignore-all'],
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver, ganacheServer, secondaryGanacheServer }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open the first dapp
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open the second dapp and switch chains
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1', 4);
+
+        // Go to wallet fullscreen, ensure that the global network changed to Ethereum Mainnet
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Ethereum Mainnet',
+        });
+
+        // Kill ganache servers
+        await ganacheServer.quit();
+        await secondaryGanacheServer[0].quit();
+
+        // Go back to first dapp, try an action, ensure network connection failure doesn't block UI
+        await selectDappClickPersonalSign(driver, DAPP_URL);
+
+        // When the network is down, there is a performance degradation that causes the
+        // popup to take a few seconds to open in MV3 (issue #25690)
+        await driver.waitUntilXWindowHandles(4, 1000, 15000);
+
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x539',
+          networkText: 'Localhost 8545',
+          originText: DAPP_URL,
+        });
+      },
+    );
+  });
+
+  it('should gracefully handle network connectivity failure for confirmations @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        // Presently confirmations take up to 10 seconds to display on a dead network
+        driverOptions: { timeOut: 30000 },
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        // This test intentionally quits Ganache while the extension is using it, causing
+        // PollingBlockTracker errors and others. These are expected.
+        ignoredConsoleErrors: ['ignore-all'],
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver, ganacheServer, secondaryGanacheServer }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open the first dapp
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open the second dapp and switch chains
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1', 4);
+
+        // Go to wallet fullscreen, ensure that the global network changed to Ethereum Mainnet
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
         );
-        assert.equal(dappTwoNetworkPillText, 'Ethereum Mainnet');
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Ethereum Mainnet',
+        });
+
+        // Kill ganache servers
+        await ganacheServer.quit();
+        await secondaryGanacheServer[0].quit();
+
+        // Go back to first dapp, try an action, ensure network connection failure doesn't block UI
+        await selectDappClickSend(driver, DAPP_URL);
+
+        // When the network is down, there is a performance degradation that causes the
+        // popup to take a few seconds to open in MV3 (issue #25690)
+        await driver.waitUntilXWindowHandles(4, 1000, 15000);
+
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x539',
+          networkText: 'Localhost 8545',
+          originText: DAPP_URL,
+        });
       },
     );
   });
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 26a78f504a20..651bf400ba7b 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -2202,7 +2202,7 @@ export function automaticallySwitchNetwork(
   selectedTabOrigin: string,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch: MetaMaskReduxDispatch) => {
-    await dispatch(setActiveNetwork(networkClientIdForThisDomain));
+    await setActiveNetworkConfigurationId(networkClientIdForThisDomain);
     await dispatch(
       setSwitchedNetworkDetails({
         networkClientId: networkClientIdForThisDomain,
@@ -2538,6 +2538,17 @@ export function setActiveNetwork(
   };
 }
 
+export async function setActiveNetworkConfigurationId(
+  networkConfigurationId: string,
+): Promise<undefined> {
+  log.debug(
+    `background.setActiveNetworkConfigurationId: ${networkConfigurationId}`,
+  );
+  await submitRequestToBackground('setActiveNetworkConfigurationId', [
+    networkConfigurationId,
+  ]);
+}
+
 export function rollbackToPreviousProvider(): ThunkAction<
   void,
   MetaMaskReduxState,

From 9332f35cffcea76ef2bd66e1f4231ea2692a6dbc Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 19 Jun 2024 22:29:45 -0230
Subject: [PATCH 100/236] fix: Update Beta build configuration (#25430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Beta build configuration was stale, which indirectly resulted in
build failures (due to a code fence bug). The beta config should match
the `main` config with respect to feature support.

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

N/A

Run `yarn build --build-type beta --platform='chrome' dist` and see that
it succeeds in creating a build. This is failing on `develop`.

N/A

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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>
---
 builds.yml                           |   7 +
 lavamoat/browserify/beta/policy.json | 370 +++++++++++++++++++++++++++
 2 files changed, 377 insertions(+)

diff --git a/builds.yml b/builds.yml
index 9358a8b1dcea..eb160f77fdc7 100644
--- a/builds.yml
+++ b/builds.yml
@@ -38,11 +38,18 @@ buildTypes:
   beta:
     features:
       - build-beta
+      - snaps
+      - keyring-snaps
+      - blockaid
     env:
       - INFURA_BETA_PROJECT_ID
       - SEGMENT_BETA_WRITE_KEY
       - INFURA_ENV_KEY_REF: INFURA_BETA_PROJECT_ID
       - SEGMENT_WRITE_KEY_REF: SEGMENT_BETA_WRITE_KEY
+      - ALLOW_LOCAL_SNAPS: false
+      - REQUIRE_SNAPS_ALLOWLIST: true
+      - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
+      - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
     # Modifies how the version is displayed.
     # eg. instead of 10.25.0 -> 10.25.0-beta.2
     isPrerelease: true
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index ceda4ecc16ff..4a35b2301dbe 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -1830,6 +1830,33 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/notification-controller": {
+      "packages": {
+        "@metamask/notification-controller>@metamask/base-controller": true,
+        "@metamask/notification-controller>@metamask/utils": true,
+        "@metamask/notification-controller>nanoid": true
+      }
+    },
+    "@metamask/notification-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/notification-controller>@metamask/utils": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "nock>debug": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/notification-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -1955,6 +1982,58 @@
         "readable-stream": true
       }
     },
+    "@metamask/ppom-validator": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "crypto": true
+      },
+      "packages": {
+        "@metamask/eth-query>json-rpc-random-id": true,
+        "@metamask/ppom-validator>@metamask/base-controller": true,
+        "@metamask/ppom-validator>@metamask/controller-utils": true,
+        "@metamask/ppom-validator>crypto-js": true,
+        "@metamask/ppom-validator>elliptic": true,
+        "await-semaphore": true,
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/ppom-validator>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/ppom-validator>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/ppom-validator>crypto-js": {
+      "globals": {
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
+      },
+      "packages": {
+        "browserify>browser-resolve": true
+      }
+    },
     "@metamask/ppom-validator>elliptic": {
       "packages": {
         "@metamask/ppom-validator>elliptic>brorand": true,
@@ -2012,6 +2091,24 @@
         "@metamask/utils": true
       }
     },
+    "@metamask/rate-limit-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/rate-limit-controller>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2428,16 +2525,147 @@
         "define": true
       }
     },
+    "@metamask/snaps-controllers": {
+      "globals": {
+        "DecompressionStream": true,
+        "URL": true,
+        "clearTimeout": true,
+        "document.getElementById": true,
+        "fetch.bind": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/object-multiplex": true,
+        "@metamask/post-message-stream": true,
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/permission-controller": true,
+        "@metamask/snaps-controllers>@xstate/fsm": true,
+        "@metamask/snaps-controllers>concat-stream": true,
+        "@metamask/snaps-controllers>get-npm-tarball-url": true,
+        "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/snaps-controllers>readable-web-to-node-stream": true,
+        "@metamask/snaps-controllers>tar-stream": true,
+        "@metamask/snaps-rpc-methods": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-utils": true,
+        "@metamask/snaps-utils>@metamask/snaps-registry": true,
+        "@metamask/utils": true,
+        "browserify>browserify-zlib": true,
+        "eslint>fast-deep-equal": true,
+        "readable-stream": true
+      }
+    },
     "@metamask/snaps-controllers-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/base-controller": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "immer": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/safe-event-emitter": true,
+        "@metamask/utils": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": {
+      "globals": {
+        "console.warn": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@metamask/safe-event-emitter": true,
+        "readable-stream": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/permission-controller": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/snaps-controllers>@metamask/base-controller": true,
+        "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
+        "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
+        "@metamask/snaps-controllers>nanoid": true,
+        "@metamask/utils": true,
+        "deep-freeze-strict": true,
+        "immer": true
+      }
+    },
+    "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": {
+      "globals": {
+        "URL": true,
+        "console.error": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/tx>@ethereumjs/util": true,
+        "@metamask/controller-utils>@spruceid/siwe-parser": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
+        "bn.js": true,
+        "browserify>buffer": true,
+        "eslint>fast-deep-equal": true,
+        "eth-ens-namehash": true
+      }
+    },
+    "@metamask/snaps-controllers>concat-stream": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>concat-stream>typedarray": true,
+        "pumpify>inherits": true,
+        "readable-stream": true,
+        "terser>source-map-support>buffer-from": true
+      }
+    },
     "@metamask/snaps-controllers>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/snaps-controllers>readable-web-to-node-stream": {
+      "packages": {
+        "readable-stream": true
+      }
+    },
+    "@metamask/snaps-controllers>tar-stream": {
+      "packages": {
+        "@metamask/snaps-controllers>tar-stream>b4a": true,
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx": true,
+        "browserify>browser-resolve": true
+      }
+    },
+    "@metamask/snaps-controllers>tar-stream>b4a": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
+      }
+    },
+    "@metamask/snaps-controllers>tar-stream>streamx": {
+      "packages": {
+        "@metamask/snaps-controllers>tar-stream>fast-fifo": true,
+        "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": true,
+        "webpack>events": true
+      }
+    },
+    "@metamask/snaps-controllers>tar-stream>streamx>queue-tick": {
+      "globals": {
+        "queueMicrotask": true
+      }
+    },
     "@metamask/snaps-execution-environments": {
       "globals": {
         "document.getElementById": true
@@ -2620,6 +2848,14 @@
         "crypto.getRandomValues": true
       }
     },
+    "@metamask/snaps-utils>@metamask/snaps-registry": {
+      "packages": {
+        "@metamask/message-signing-snap>@noble/curves": true,
+        "@metamask/utils": true,
+        "@noble/hashes": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-utils>cron-parser": {
       "packages": {
         "browserify>browser-resolve": true,
@@ -3045,6 +3281,11 @@
         "browserify>process": true
       }
     },
+    "@storybook/addon-docs>remark-external-links>mdast-util-definitions": {
+      "packages": {
+        "react-markdown>unist-util-visit": true
+      }
+    },
     "@storybook/addon-knobs>qs": {
       "packages": {
         "string.prototype.matchall>side-channel": true
@@ -3437,6 +3678,11 @@
         "browserify>url": true
       }
     },
+    "browserify>path-browserify": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
     "browserify>process": {
       "globals": {
         "clearTimeout": true,
@@ -4229,6 +4475,11 @@
         "string.prototype.matchall>has-symbols": true
       }
     },
+    "he": {
+      "globals": {
+        "define": true
+      }
+    },
     "json-rpc-engine": {
       "packages": {
         "eth-rpc-errors": true,
@@ -4595,6 +4846,110 @@
         "react": true
       }
     },
+    "react-markdown": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "prop-types": true,
+        "react": true,
+        "react-markdown>comma-separated-tokens": true,
+        "react-markdown>property-information": true,
+        "react-markdown>react-is": true,
+        "react-markdown>remark-parse": true,
+        "react-markdown>remark-rehype": true,
+        "react-markdown>space-separated-tokens": true,
+        "react-markdown>style-to-object": true,
+        "react-markdown>unified": true,
+        "react-markdown>unist-util-visit": true,
+        "react-markdown>vfile": true
+      }
+    },
+    "react-markdown>property-information": {
+      "packages": {
+        "watchify>xtend": true
+      }
+    },
+    "react-markdown>react-is": {
+      "globals": {
+        "console": true
+      }
+    },
+    "react-markdown>remark-parse": {
+      "packages": {
+        "react-markdown>remark-parse>mdast-util-from-markdown": true
+      }
+    },
+    "react-markdown>remark-parse>mdast-util-from-markdown": {
+      "packages": {
+        "react-markdown>remark-parse>mdast-util-from-markdown>mdast-util-to-string": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>micromark": true,
+        "react-markdown>remark-parse>mdast-util-from-markdown>unist-util-stringify-position": true,
+        "react-syntax-highlighter>refractor>parse-entities": true
+      }
+    },
+    "react-markdown>remark-parse>mdast-util-from-markdown>micromark": {
+      "packages": {
+        "react-syntax-highlighter>refractor>parse-entities": true
+      }
+    },
+    "react-markdown>remark-rehype": {
+      "packages": {
+        "react-markdown>remark-rehype>mdast-util-to-hast": true
+      }
+    },
+    "react-markdown>remark-rehype>mdast-util-to-hast": {
+      "globals": {
+        "console.warn": true
+      },
+      "packages": {
+        "@storybook/addon-docs>remark-external-links>mdast-util-definitions": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>mdurl": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>unist-builder": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>unist-util-generated": true,
+        "react-markdown>remark-rehype>mdast-util-to-hast>unist-util-position": true,
+        "react-markdown>unist-util-visit": true
+      }
+    },
+    "react-markdown>style-to-object": {
+      "packages": {
+        "react-markdown>style-to-object>inline-style-parser": true
+      }
+    },
+    "react-markdown>unified": {
+      "packages": {
+        "mocha>yargs-unparser>is-plain-obj": true,
+        "react-markdown>unified>bail": true,
+        "react-markdown>unified>extend": true,
+        "react-markdown>unified>is-buffer": true,
+        "react-markdown>unified>trough": true,
+        "react-markdown>vfile": true
+      }
+    },
+    "react-markdown>unist-util-visit": {
+      "packages": {
+        "react-markdown>unist-util-visit>unist-util-visit-parents": true
+      }
+    },
+    "react-markdown>unist-util-visit>unist-util-visit-parents": {
+      "packages": {
+        "react-markdown>unist-util-visit>unist-util-is": true
+      }
+    },
+    "react-markdown>vfile": {
+      "packages": {
+        "browserify>path-browserify": true,
+        "browserify>process": true,
+        "react-markdown>vfile>is-buffer": true,
+        "react-markdown>vfile>vfile-message": true,
+        "vinyl>replace-ext": true
+      }
+    },
+    "react-markdown>vfile>vfile-message": {
+      "packages": {
+        "react-markdown>vfile>unist-util-stringify-position": true
+      }
+    },
     "react-popper": {
       "globals": {
         "document": true
@@ -4753,6 +5108,11 @@
         "react": true
       }
     },
+    "react-syntax-highlighter>refractor>parse-entities": {
+      "globals": {
+        "document.createElement": true
+      }
+    },
     "react-tippy": {
       "globals": {
         "Element": true,
@@ -4998,12 +5358,22 @@
         "define": true
       }
     },
+    "terser>source-map-support>buffer-from": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "uuid": {
       "globals": {
         "crypto": true,
         "msCrypto": true
       }
     },
+    "vinyl>replace-ext": {
+      "packages": {
+        "browserify>path-browserify": true
+      }
+    },
     "web3": {
       "globals": {
         "XMLHttpRequest": true

From 811aa059dc1c1ebf368e35a42605348483686e07 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 11 Jul 2024 04:06:41 +0530
Subject: [PATCH 101/236] cherry-pick: fix decimal places displayed on token
 value on permit pages (#25718)

---
 .../confirmations/signatures/permit.spec.ts   |  2 +-
 .../__snapshots__/typed-sign.test.tsx.snap    |  2 +-
 .../permit-simulation.test.tsx.snap           |  2 +-
 .../permit-simulation.test.tsx                |  5 +-
 .../permit-simulation/permit-simulation.tsx   | 10 +++-
 .../info/typed-sign/typed-sign.test.tsx       |  6 +++
 .../confirm/info/typed-sign/typed-sign.tsx    | 21 ++++++++-
 .../components/confirm/row/dataTree.tsx       | 24 +++++++++-
 .../row/typed-sign-data/typedSignData.tsx     | 11 +++--
 .../components/confirm/utils.test.ts          | 46 +++++++++++--------
 .../confirmations/components/confirm/utils.ts | 11 +++++
 11 files changed, 110 insertions(+), 30 deletions(-)

diff --git a/test/e2e/tests/confirmations/signatures/permit.spec.ts b/test/e2e/tests/confirmations/signatures/permit.spec.ts
index 8320fd748f63..03941dbecc3f 100644
--- a/test/e2e/tests/confirmations/signatures/permit.spec.ts
+++ b/test/e2e/tests/confirmations/signatures/permit.spec.ts
@@ -83,7 +83,7 @@ async function assertInfoValues(driver: Driver) {
     css: '.name__value',
     text: '0x5B38D...eddC4',
   });
-  const value = driver.findElement({ text: '3000' });
+  const value = driver.findElement({ text: '3,000' });
   const nonce = driver.findElement({ text: '0' });
   const deadline = driver.findElement({ text: '02 August 1971, 16:53' });
 
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index 328fe4209390..c06db18f9268 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -401,7 +401,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
                   style="white-space: pre-wrap;"
                 >
-                  3000
+                  3,000
                 </p>
               </div>
             </div>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
index 111bc553477f..9b67671cbb06 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -70,7 +70,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
             <p
               class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
             >
-              3000
+              30.00
             </p>
           </div>
           <div>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx
index ea0ffcc47bc1..daca28ece848 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.test.tsx
@@ -15,7 +15,10 @@ describe('PermitSimulation', () => {
       },
     };
     const mockStore = configureMockStore([])(state);
-    const { container } = renderWithProvider(<PermitSimulation />, mockStore);
+    const { container } = renderWithProvider(
+      <PermitSimulation tokenDecimals={2} />,
+      mockStore,
+    );
     expect(container).toMatchSnapshot();
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index 04eaba8f9be4..f6a116b0842e 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -21,9 +21,12 @@ import {
 import { SignatureRequestType } from '../../../../../types/confirm';
 import useTokenExchangeRate from '../../../../../../../components/app/currency-input/hooks/useTokenExchangeRate';
 import { IndividualFiatDisplay } from '../../../../simulation-details/fiat-display';
+import { formatNumber } from '../../../utils';
 import { ConfirmInfoSection } from '../../../../../../../components/app/confirm/info/row/section';
 
-const PermitSimulation: React.FC = () => {
+const PermitSimulation: React.FC<{
+  tokenDecimals: number;
+}> = ({ tokenDecimals }) => {
   const t = useI18nContext();
   const currentConfirmation = useSelector(
     currentConfirmationSelector,
@@ -61,7 +64,10 @@ const PermitSimulation: React.FC = () => {
                 paddingInline={2}
                 textAlign={TextAlign.Center}
               >
-                {value}
+                {formatNumber(
+                  value / Math.pow(10, tokenDecimals),
+                  tokenDecimals,
+                )}
               </Text>
             </Box>
             <Name value={verifyingContract} type={NameType.ETHEREUM_ADDRESS} />
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
index 332b3f79a6ff..1ac473dd40f8 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.test.tsx
@@ -10,6 +10,12 @@ import {
 } from '../../../../../../../test/data/confirmations/typed_sign';
 import TypedSignInfo from './typed-sign';
 
+jest.mock('../../../../../../store/actions', () => {
+  return {
+    getTokenStandardAndDetails: jest.fn().mockResolvedValue({ decimals: 2 }),
+  };
+});
+
 describe('TypedSignInfo', () => {
   it('renders origin for typed sign data request', () => {
     const state = {
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
index 019dd138f401..88ade5cc2a6f 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/typed-sign.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { isValidAddress } from 'ethereumjs-util';
 
@@ -11,6 +11,7 @@ import {
 } from '../../../../../../components/app/confirm/info/row';
 import { useI18nContext } from '../../../../../../hooks/useI18nContext';
 import { currentConfirmationSelector } from '../../../../../../selectors';
+import { getTokenStandardAndDetails } from '../../../../../../store/actions';
 import { SignatureRequestType } from '../../../../types/confirm';
 import { isPermitSignatureRequest } from '../../../../utils';
 import { selectUseTransactionSimulations } from '../../../../selectors/preferences';
@@ -26,6 +27,7 @@ const TypedSignInfo: React.FC = () => {
   const useTransactionSimulations = useSelector(
     selectUseTransactionSimulations,
   );
+  const [decimals, setDecimals] = useState<number>(0);
 
   if (!currentConfirmation?.msgParams) {
     return null;
@@ -38,9 +40,23 @@ const TypedSignInfo: React.FC = () => {
 
   const isPermit = isPermitSignatureRequest(currentConfirmation);
 
+  useEffect(() => {
+    (async () => {
+      if (!isPermit) {
+        return;
+      }
+      const { decimals: tokenDecimals } = await getTokenStandardAndDetails(
+        verifyingContract,
+      );
+      setDecimals(parseInt(tokenDecimals ?? '0', 10));
+    })();
+  }, [verifyingContract]);
+
   return (
     <>
-      {isPermit && useTransactionSimulations && <PermitSimulation />}
+      {isPermit && useTransactionSimulations && (
+        <PermitSimulation tokenDecimals={decimals} />
+      )}
       <ConfirmInfoSection>
         {isPermit && (
           <>
@@ -64,6 +80,7 @@ const TypedSignInfo: React.FC = () => {
           <ConfirmInfoRowTypedSignData
             data={currentConfirmation.msgParams?.data as string}
             isPermit={isPermit}
+            tokenDecimals={decimals}
           />
         </ConfirmInfoRow>
       </ConfirmInfoSection>
diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
index 307b608488d9..9f5511e72446 100644
--- a/ui/pages/confirmations/components/confirm/row/dataTree.tsx
+++ b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
@@ -11,6 +11,7 @@ import {
   ConfirmInfoRowDate,
   ConfirmInfoRowText,
 } from '../../../../../components/app/confirm/info/row';
+import { formatNumber } from '../utils';
 
 type ValueType = string | Record<string, TreeData> | TreeData[];
 
@@ -22,9 +23,11 @@ export type TreeData = {
 export const DataTree = ({
   data,
   isPermit = false,
+  tokenDecimals = 0,
 }: {
   data: Record<string, TreeData> | TreeData[];
   isPermit?: boolean;
+  tokenDecimals?: number;
 }) => (
   <Box width={BlockSize.Full}>
     {Object.entries(data).map(([label, { value, type }], i) => (
@@ -42,6 +45,7 @@ export const DataTree = ({
             isPermit={isPermit}
             value={value}
             type={type}
+            tokenDecimals={tokenDecimals}
           />
         }
       </ConfirmInfoRow>
@@ -54,14 +58,32 @@ const DataField = ({
   isPermit,
   type,
   value,
+  tokenDecimals,
 }: {
   label: string;
   isPermit: boolean;
   type: string;
   value: ValueType;
+  tokenDecimals: number;
 }) => {
   if (typeof value === 'object' && value !== null) {
-    return <DataTree data={value} isPermit={isPermit} />;
+    return (
+      <DataTree
+        data={value}
+        isPermit={isPermit}
+        tokenDecimals={tokenDecimals}
+      />
+    );
+  }
+  if (isPermit && label === 'value') {
+    return (
+      <ConfirmInfoRowText
+        text={formatNumber(
+          parseInt(value, 10) / Math.pow(10, tokenDecimals),
+          tokenDecimals,
+        )}
+      />
+    );
   }
   if (isPermit && label === 'deadline') {
     return <ConfirmInfoRowDate date={parseInt(value, 10)} />;
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx b/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx
index 9b3934cef651..0b60f45b6a38 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data/typedSignData.tsx
@@ -7,16 +7,17 @@ import {
   ConfirmInfoRow,
   ConfirmInfoRowText,
 } from '../../../../../../components/app/confirm/info/row';
-
-import { DataTree } from '../dataTree';
 import { parseSanitizeTypedDataMessage } from '../../../../utils';
+import { DataTree } from '../dataTree';
 
 export const ConfirmInfoRowTypedSignData = ({
   data,
   isPermit,
+  tokenDecimals,
 }: {
   data: string;
   isPermit?: boolean;
+  tokenDecimals?: number;
 }) => {
   const t = useI18nContext();
 
@@ -35,7 +36,11 @@ export const ConfirmInfoRowTypedSignData = ({
         <ConfirmInfoRowText text={primaryType} />
       </ConfirmInfoRow>
       <Box style={{ marginLeft: -8 }}>
-        <DataTree data={sanitizedMessage.value} isPermit={isPermit} />
+        <DataTree
+          data={sanitizedMessage.value}
+          isPermit={isPermit}
+          tokenDecimals={tokenDecimals}
+        />
       </Box>
     </Box>
   );
diff --git a/ui/pages/confirmations/components/confirm/utils.test.ts b/ui/pages/confirmations/components/confirm/utils.test.ts
index 87e6307de7be..b967a81e8f77 100644
--- a/ui/pages/confirmations/components/confirm/utils.test.ts
+++ b/ui/pages/confirmations/components/confirm/utils.test.ts
@@ -8,29 +8,39 @@ import {
   unapprovedPersonalSignMsg,
 } from '../../../../../test/data/confirmations/personal_sign';
 import { SignatureRequestType } from '../../types/confirm';
-import { getConfirmationSender } from './utils';
+import { formatNumber, getConfirmationSender } from './utils';
 
-describe('getConfirmationSender()', () => {
-  test("returns the sender address from a signature if it's passed", () => {
-    const testCurrentConfirmation =
-      genUnapprovedContractInteractionConfirmation() as TransactionMeta;
-    const { from } = getConfirmationSender(testCurrentConfirmation);
+describe('confirm - utils', () => {
+  describe('getConfirmationSender()', () => {
+    test("returns the sender address from a signature if it's passed", () => {
+      const testCurrentConfirmation =
+        genUnapprovedContractInteractionConfirmation() as TransactionMeta;
+      const { from } = getConfirmationSender(testCurrentConfirmation);
 
-    expect(from).toEqual(CONTRACT_INTERACTION_SENDER_ADDRESS);
-  });
+      expect(from).toEqual(CONTRACT_INTERACTION_SENDER_ADDRESS);
+    });
 
-  test("returns the sender address from a transaction if it's passed", () => {
-    const { from } = getConfirmationSender(
-      unapprovedPersonalSignMsg as SignatureRequestType,
-    );
+    test("returns the sender address from a transaction if it's passed", () => {
+      const { from } = getConfirmationSender(
+        unapprovedPersonalSignMsg as SignatureRequestType,
+      );
 
-    expect(from).toEqual(PERSONAL_SIGN_SENDER_ADDRESS);
-  });
+      expect(from).toEqual(PERSONAL_SIGN_SENDER_ADDRESS);
+    });
 
-  test('returns no sender address if no confirmation is passed', () => {
-    const testCurrentConfirmation = undefined;
-    const { from } = getConfirmationSender(testCurrentConfirmation);
+    test('returns no sender address if no confirmation is passed', () => {
+      const testCurrentConfirmation = undefined;
+      const { from } = getConfirmationSender(testCurrentConfirmation);
+
+      expect(from).toEqual(undefined);
+    });
+  });
 
-    expect(from).toEqual(undefined);
+  describe('formatNumber()', () => {
+    test('formats number according to decimal places passed', () => {
+      expect(formatNumber(123456, 2)).toEqual('123,456.00');
+      expect(formatNumber(123456, 0)).toEqual('123,456');
+      expect(formatNumber(123456, 7)).toEqual('123,456.0000000');
+    });
   });
 });
diff --git a/ui/pages/confirmations/components/confirm/utils.ts b/ui/pages/confirmations/components/confirm/utils.ts
index 21b4aac78998..581bf1a5ccee 100644
--- a/ui/pages/confirmations/components/confirm/utils.ts
+++ b/ui/pages/confirmations/components/confirm/utils.ts
@@ -17,3 +17,14 @@ export const getConfirmationSender = (
 
   return { from };
 };
+
+export const formatNumber = (value: number, decimals: number) => {
+  if (value === undefined) {
+    return value;
+  }
+  const formatter = new Intl.NumberFormat('en-US', {
+    minimumFractionDigits: decimals,
+    maximumFractionDigits: decimals,
+  });
+  return formatter.format(value);
+};

From ce982e3b098fcd6d719ee95dd476ee492381acbb Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Thu, 11 Jul 2024 14:41:58 +0530
Subject: [PATCH 102/236] cherry-pick: feat improvement for how we display big
 and small numbers (#25720)

---
 .../app/confirm/info/row/text.stories.tsx     |   1 +
 ui/components/app/confirm/info/row/text.tsx   |  24 +++-
 .../__snapshots__/typed-sign.test.tsx.snap    |  25 ++++-
 .../permit-simulation.test.tsx.snap           |  21 +++-
 .../permit-simulation/permit-simulation.tsx   |  39 +++++--
 .../row/__snapshots__/dataTree.test.tsx.snap  |  99 +++++++++++++++++
 .../components/confirm/row/dataTree.test.tsx  |  11 ++
 .../components/confirm/row/dataTree.tsx       | 103 ++++++++++--------
 .../components/confirm/utils.test.ts          |  10 +-
 9 files changed, 253 insertions(+), 80 deletions(-)

diff --git a/ui/components/app/confirm/info/row/text.stories.tsx b/ui/components/app/confirm/info/row/text.stories.tsx
index 49ae403679df..094ca92edef5 100644
--- a/ui/components/app/confirm/info/row/text.stories.tsx
+++ b/ui/components/app/confirm/info/row/text.stories.tsx
@@ -22,6 +22,7 @@ const ConfirmInfoRowTextStory = {
 export const DefaultStory = ({ text }) => <ConfirmInfoRowText text={text} />;
 DefaultStory.args = {
   text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+  tooltip: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
 };
 
 export const EditableStory = (props) => <ConfirmInfoRowText {...props} />;
diff --git a/ui/components/app/confirm/info/row/text.tsx b/ui/components/app/confirm/info/row/text.tsx
index dc1a35d2c14e..dacedf310457 100644
--- a/ui/components/app/confirm/info/row/text.tsx
+++ b/ui/components/app/confirm/info/row/text.tsx
@@ -8,17 +8,26 @@ import {
   TextColor,
 } from '../../../../../helpers/constants/design-system';
 import { Box, ButtonIcon, IconName, Text } from '../../../../component-library';
+import Tooltip from '../../../../ui/tooltip';
+
+const InfoText = ({ text }: { text: string }) => (
+  <Text color={TextColor.inherit} style={{ whiteSpace: 'pre-wrap' }}>
+    {text}
+  </Text>
+);
 
 export type ConfirmInfoRowTextProps = {
   text: string;
   onEditClick?: () => void;
   editIconClassName?: string;
+  tooltip?: string;
 };
 
 export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
   text,
   onEditClick,
   editIconClassName,
+  tooltip,
 }) => {
   const t = useContext(I18nContext);
 
@@ -31,9 +40,18 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
       flexWrap={FlexWrap.Wrap}
       gap={2}
     >
-      <Text color={TextColor.inherit} style={{ whiteSpace: 'pre-wrap' }}>
-        {text}
-      </Text>
+      {tooltip ? (
+        <Tooltip
+          position="bottom"
+          title={tooltip}
+          wrapperStyle={{ minWidth: 0 }}
+          interactive
+        >
+          <InfoText text={text} />
+        </Tooltip>
+      ) : (
+        <InfoText text={text} />
+      )}
       {isEditable ? (
         <ButtonIcon
           className={editIconClassName || undefined}
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index c06db18f9268..cc4071497ce2 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -93,7 +93,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
         </p>
         <div>
           <div
-            aria-describedby="tippy-tooltip-6"
+            aria-describedby="tippy-tooltip-8"
             class=""
             data-original-title="This is the site asking for your signature."
             data-tooltipped=""
@@ -397,12 +397,25 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
               <div
                 class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
               >
-                <p
-                  class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                  style="white-space: pre-wrap;"
+                <div
+                  style="min-width: 0;"
                 >
-                  3,000
-                </p>
+                  <div
+                    aria-describedby="tippy-tooltip-9"
+                    class=""
+                    data-original-title="3,000"
+                    data-tooltipped=""
+                    style="display: inline;"
+                    tabindex="0"
+                  >
+                    <p
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
+                    >
+                      3,000
+                    </p>
+                  </div>
+                </div>
               </div>
             </div>
             <div
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
index 9b67671cbb06..fd36805daced 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -67,11 +67,24 @@ exports[`PermitSimulation renders component correctly 1`] = `
           <div
             class="mm-box mm-box--margin-inline-end-1 mm-box--display-inline"
           >
-            <p
-              class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+            <div
+              style="min-width: 0;"
             >
-              30.00
-            </p>
+              <div
+                aria-describedby="tippy-tooltip-2"
+                class=""
+                data-original-title="30"
+                data-tooltipped=""
+                style="display: inline;"
+                tabindex="0"
+              >
+                <p
+                  class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+                >
+                  30
+                </p>
+              </div>
+            </div>
           </div>
           <div>
             <div
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index f6a116b0842e..af7378f56f3a 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -1,6 +1,7 @@
 import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { NameType } from '@metamask/name-controller';
+import { BigNumber } from 'bignumber.js';
 
 import { parseTypedDataMessage } from '../../../../../../../../shared/modules/transaction.utils';
 import { Numeric } from '../../../../../../../../shared/modules/Numeric';
@@ -12,6 +13,7 @@ import {
 import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
 import { currentConfirmationSelector } from '../../../../../../../selectors';
 import { Box, Text } from '../../../../../../../components/component-library';
+import Tooltip from '../../../../../../../components/ui/tooltip';
 import {
   BackgroundColor,
   BorderRadius,
@@ -21,7 +23,10 @@ import {
 import { SignatureRequestType } from '../../../../../types/confirm';
 import useTokenExchangeRate from '../../../../../../../components/app/currency-input/hooks/useTokenExchangeRate';
 import { IndividualFiatDisplay } from '../../../../simulation-details/fiat-display';
-import { formatNumber } from '../../../utils';
+import {
+  formatAmount,
+  formatAmountMaxPrecision,
+} from '../../../../simulation-details/formatAmount';
 import { ConfirmInfoSection } from '../../../../../../../components/app/confirm/info/row/section';
 
 const PermitSimulation: React.FC<{
@@ -46,6 +51,14 @@ const PermitSimulation: React.FC<{
     return undefined;
   }, [exchangeRate, value]);
 
+  const { tokenValue, tokenValueMaxPrecision } = useMemo(() => {
+    const valueBN = new BigNumber(value / Math.pow(10, tokenDecimals));
+    return {
+      tokenValue: formatAmount('en-US', valueBN),
+      tokenValueMaxPrecision: formatAmountMaxPrecision('en-US', valueBN),
+    };
+  }, [tokenDecimals, value]);
+
   return (
     <ConfirmInfoSection>
       <ConfirmInfoRow
@@ -58,17 +71,21 @@ const PermitSimulation: React.FC<{
         <Box style={{ marginLeft: 'auto' }}>
           <Box display={Display.Flex}>
             <Box display={Display.Inline} marginInlineEnd={1}>
-              <Text
-                backgroundColor={BackgroundColor.backgroundAlternative}
-                borderRadius={BorderRadius.XL}
-                paddingInline={2}
-                textAlign={TextAlign.Center}
+              <Tooltip
+                position="bottom"
+                title={tokenValueMaxPrecision}
+                wrapperStyle={{ minWidth: 0 }}
+                interactive
               >
-                {formatNumber(
-                  value / Math.pow(10, tokenDecimals),
-                  tokenDecimals,
-                )}
-              </Text>
+                <Text
+                  backgroundColor={BackgroundColor.backgroundAlternative}
+                  borderRadius={BorderRadius.XL}
+                  paddingInline={2}
+                  textAlign={TextAlign.Center}
+                >
+                  {tokenValue}
+                </Text>
+              </Tooltip>
             </Box>
             <Name value={verifyingContract} type={NameType.ETHEREUM_ADDRESS} />
           </Box>
diff --git a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
index 26966d4ac1d6..841f032ef091 100644
--- a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
@@ -606,3 +606,102 @@ exports[`DataTree should match snapshot 1`] = `
   </div>
 </div>
 `;
+
+exports[`DataTree should match snapshot for permit signature type 1`] = `
+<div>
+  <div
+    class="mm-box mm-box--width-full"
+  >
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Types:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        />
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          PrimaryType:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        />
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Domain:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        />
+      </div>
+    </div>
+    <div
+      class="mm-box confirm-info-row mm-box--margin-top-2 mm-box--margin-bottom-2 mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--flex-direction-row mm-box--flex-wrap-wrap mm-box--justify-content-space-between mm-box--color-text-default mm-box--rounded-lg"
+      style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
+    >
+      <div
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
+        >
+          Message:
+        </p>
+      </div>
+      <div
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      >
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+          style="white-space: pre-wrap;"
+        >
+          3000
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.test.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.test.tsx
index 8b83a01e4082..435f9333f6e0 100644
--- a/ui/pages/confirmations/components/confirm/row/dataTree.test.tsx
+++ b/ui/pages/confirmations/components/confirm/row/dataTree.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { permitSignatureMsg } from '../../../../../../test/data/confirmations/typed_sign';
 import mockState from '../../../../../../test/data/mock-state.json';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
 import configureStore from '../../../../../store/store';
@@ -69,6 +70,16 @@ describe('DataTree', () => {
     expect(container).toMatchSnapshot();
   });
 
+  it('should match snapshot for permit signature type', () => {
+    const { container } = renderWithProvider(
+      <DataTree
+        data={JSON.parse(permitSignatureMsg.msgParams?.data as string)}
+      />,
+      store,
+    );
+    expect(container).toMatchSnapshot();
+  });
+
   it('correctly renders reverse strings', () => {
     const data = {
       'Sign into \u202E EVIL': {
diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
index 9f5511e72446..f822651fad0f 100644
--- a/ui/pages/confirmations/components/confirm/row/dataTree.tsx
+++ b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
@@ -1,4 +1,5 @@
-import React from 'react';
+import { BigNumber } from 'bignumber.js';
+import React, { memo } from 'react';
 
 import { isValidHexAddress } from '../../../../../../shared/modules/hexstring-utils';
 import { sanitizeString } from '../../../../../helpers/utils/util';
@@ -11,7 +12,10 @@ import {
   ConfirmInfoRowDate,
   ConfirmInfoRowText,
 } from '../../../../../components/app/confirm/info/row';
-import { formatNumber } from '../utils';
+import {
+  formatAmount,
+  formatAmountMaxPrecision,
+} from '../../simulation-details/formatAmount';
 
 type ValueType = string | Record<string, TreeData> | TreeData[];
 
@@ -53,48 +57,53 @@ export const DataTree = ({
   </Box>
 );
 
-const DataField = ({
-  label,
-  isPermit,
-  type,
-  value,
-  tokenDecimals,
-}: {
-  label: string;
-  isPermit: boolean;
-  type: string;
-  value: ValueType;
-  tokenDecimals: number;
-}) => {
-  if (typeof value === 'object' && value !== null) {
-    return (
-      <DataTree
-        data={value}
-        isPermit={isPermit}
-        tokenDecimals={tokenDecimals}
-      />
-    );
-  }
-  if (isPermit && label === 'value') {
-    return (
-      <ConfirmInfoRowText
-        text={formatNumber(
-          parseInt(value, 10) / Math.pow(10, tokenDecimals),
-          tokenDecimals,
-        )}
-      />
-    );
-  }
-  if (isPermit && label === 'deadline') {
-    return <ConfirmInfoRowDate date={parseInt(value, 10)} />;
-  }
-  if (
-    type === 'address' &&
-    isValidHexAddress(value, {
-      mixedCaseUseChecksum: true,
-    })
-  ) {
-    return <ConfirmInfoRowAddress address={value} />;
-  }
-  return <ConfirmInfoRowText text={sanitizeString(value)} />;
-};
+const DataField = memo(
+  ({
+    label,
+    isPermit,
+    type,
+    value,
+    tokenDecimals,
+  }: {
+    label: string;
+    isPermit: boolean;
+    type: string;
+    value: ValueType;
+    tokenDecimals: number;
+  }) => {
+    if (typeof value === 'object' && value !== null) {
+      return (
+        <DataTree
+          data={value}
+          isPermit={isPermit}
+          tokenDecimals={tokenDecimals}
+        />
+      );
+    }
+    if (isPermit && label === 'value') {
+      const valueBN = new BigNumber(
+        parseInt(value, 10) / Math.pow(10, tokenDecimals),
+      );
+      const tokenValue = formatAmount('en-US', valueBN);
+      const tokenValueMaxPrecision = formatAmountMaxPrecision('en-US', valueBN);
+      return (
+        <ConfirmInfoRowText
+          text={tokenValue}
+          tooltip={tokenValueMaxPrecision}
+        />
+      );
+    }
+    if (isPermit && label === 'deadline') {
+      return <ConfirmInfoRowDate date={parseInt(value, 10)} />;
+    }
+    if (
+      type === 'address' &&
+      isValidHexAddress(value, {
+        mixedCaseUseChecksum: true,
+      })
+    ) {
+      return <ConfirmInfoRowAddress address={value} />;
+    }
+    return <ConfirmInfoRowText text={sanitizeString(value)} />;
+  },
+);
diff --git a/ui/pages/confirmations/components/confirm/utils.test.ts b/ui/pages/confirmations/components/confirm/utils.test.ts
index b967a81e8f77..2d5e8fe9e4de 100644
--- a/ui/pages/confirmations/components/confirm/utils.test.ts
+++ b/ui/pages/confirmations/components/confirm/utils.test.ts
@@ -8,7 +8,7 @@ import {
   unapprovedPersonalSignMsg,
 } from '../../../../../test/data/confirmations/personal_sign';
 import { SignatureRequestType } from '../../types/confirm';
-import { formatNumber, getConfirmationSender } from './utils';
+import { getConfirmationSender } from './utils';
 
 describe('confirm - utils', () => {
   describe('getConfirmationSender()', () => {
@@ -35,12 +35,4 @@ describe('confirm - utils', () => {
       expect(from).toEqual(undefined);
     });
   });
-
-  describe('formatNumber()', () => {
-    test('formats number according to decimal places passed', () => {
-      expect(formatNumber(123456, 2)).toEqual('123,456.00');
-      expect(formatNumber(123456, 0)).toEqual('123,456');
-      expect(formatNumber(123456, 7)).toEqual('123,456.0000000');
-    });
-  });
 });

From a5ae4ca4d0b7b92a754e6fed59591ba39511e359 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 11 Jul 2024 09:58:30 -0230
Subject: [PATCH 103/236] Cherry pick 574f819 into v12 (#25738)

Cherry picks https://github.com/MetaMask/metamask-extension/pull/25571
(574f819) into v12.0.0

Co-authored-by: David Murdoch <187813+davidmurdoch@users.noreply.github.com>
---
 lavamoat/build-system/policy.json | 1561 ++++++++++++-----------------
 package.json                      |    3 +-
 yarn.lock                         |  353 +------
 3 files changed, 633 insertions(+), 1284 deletions(-)

diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 635158958f06..7fd1c8b02ccc 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -2100,8 +2100,8 @@
     },
     "chokidar>anymatch": {
       "packages": {
-        "chokidar>anymatch>picomatch": true,
-        "chokidar>normalize-path": true
+        "chokidar>anymatch>normalize-path": true,
+        "chokidar>anymatch>picomatch": true
       }
     },
     "chokidar>anymatch>picomatch": {
@@ -3921,8 +3921,8 @@
     },
     "gulp-sourcemaps>@gulp-sourcemaps/identity-map": {
       "packages": {
-        "chokidar>normalize-path": true,
         "gulp-sourcemaps>@gulp-sourcemaps/identity-map>acorn": true,
+        "gulp-sourcemaps>@gulp-sourcemaps/identity-map>normalize-path": true,
         "gulp-sourcemaps>@gulp-sourcemaps/identity-map>postcss": true,
         "gulp-sourcemaps>@gulp-sourcemaps/identity-map>source-map": true,
         "gulp-sourcemaps>@gulp-sourcemaps/identity-map>through2": true
@@ -3973,13 +3973,8 @@
     },
     "gulp-sourcemaps>@gulp-sourcemaps/map-sources": {
       "packages": {
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>normalize-path": true,
-        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2": true
-      }
-    },
-    "gulp-sourcemaps>@gulp-sourcemaps/map-sources>normalize-path": {
-      "packages": {
-        "vinyl>remove-trailing-separator": true
+        "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2": true,
+        "gulp-watch>anymatch>normalize-path": true
       }
     },
     "gulp-sourcemaps>@gulp-sourcemaps/map-sources>through2": {
@@ -4221,10 +4216,10 @@
         "setTimeout": true
       },
       "packages": {
+        "chokidar": true,
         "eslint>glob-parent": true,
         "gulp-watch>ansi-colors": true,
         "gulp-watch>anymatch": true,
-        "gulp-watch>chokidar": true,
         "gulp-watch>fancy-log": true,
         "gulp-watch>path-is-absolute": true,
         "gulp-watch>readable-stream": true,
@@ -4281,7 +4276,7 @@
       "packages": {
         "gulp-watch>anymatch>micromatch>braces>expand-range": true,
         "gulp-watch>anymatch>micromatch>braces>preserve": true,
-        "gulp-watch>chokidar>braces>repeat-element": true
+        "gulp-watch>anymatch>micromatch>braces>repeat-element": true
       }
     },
     "gulp-watch>anymatch>micromatch>braces>expand-range": {
@@ -4294,7 +4289,7 @@
         "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>is-number": true,
         "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>isobject": true,
         "gulp-watch>anymatch>micromatch>braces>expand-range>fill-range>randomatic": true,
-        "gulp-watch>chokidar>braces>repeat-element": true,
+        "gulp-watch>anymatch>micromatch>braces>repeat-element": true,
         "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
       }
     },
@@ -4422,8 +4417,6 @@
       },
       "packages": {
         "chokidar>normalize-path": true,
-        "del>is-glob": true,
-        "eslint>glob-parent": true,
         "eslint>is-glob": true,
         "gulp-watch>chokidar>anymatch": true,
         "gulp-watch>chokidar>async-each": true,
@@ -4437,750 +4430,234 @@
         "pumpify>inherits": true
       }
     },
-    "gulp-watch>chokidar>anymatch": {
+    "gulp-watch>chokidar>fsevents": {
       "builtin": {
-        "path.sep": true
+        "events.EventEmitter": true,
+        "fs.stat": true,
+        "path.join": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.assert": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setImmediate": true
       },
       "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch": true,
-        "gulp-watch>chokidar>anymatch>normalize-path": true
+        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
       }
     },
-    "gulp-watch>chokidar>anymatch>micromatch": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp": {
       "builtin": {
-        "path.basename": true,
-        "path.sep": true,
-        "util.inspect": true
+        "events.EventEmitter": true,
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "fs.renameSync": true,
+        "path.dirname": true,
+        "path.existsSync": true,
+        "path.join": true,
+        "path.resolve": true,
+        "url.parse": true,
+        "url.resolve": true,
+        "util.inherits": true
       },
       "globals": {
-        "process.platform": true
+        "__dirname": true,
+        "console.log": true,
+        "process.arch": true,
+        "process.cwd": true,
+        "process.env": true,
+        "process.platform": true,
+        "process.version.substr": true,
+        "process.versions": true
       },
       "packages": {
-        "@babel/register>clone-deep>kind-of": true,
-        "gulp-watch>chokidar>anymatch>micromatch>define-property": true,
-        "gulp-watch>chokidar>anymatch>micromatch>extglob": true,
-        "gulp-watch>chokidar>braces": true,
-        "gulp-watch>chokidar>braces>array-unique": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp-zip>plugin-error>arr-diff": true,
-        "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>gulp-cli>liftoff>fined>object.pick": true,
-        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>nanomatch": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true
-      }
-    },
-    "gulp-watch>chokidar>anymatch>micromatch>define-property": {
-      "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
-      }
-    },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob": {
-      "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>define-property": true,
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets": true,
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>extend-shallow": true,
-        "gulp-watch>chokidar>braces>array-unique": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true
-      }
-    },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>define-property": {
-      "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true
       }
     },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets": {
-      "globals": {
-        "__filename": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": {
+      "builtin": {
+        "child_process.spawnSync": true,
+        "fs.readdirSync": true,
+        "os.platform": true
       },
-      "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>debug": true,
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property": true,
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>extend-shallow": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp>gulp-cli>matchdep>micromatch>extglob>expand-brackets>posix-character-classes": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true
+      "globals": {
+        "process.env": true
       }
     },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>debug": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": {
       "builtin": {
-        "fs.SyncWriteStream": true,
-        "net.Socket": true,
-        "tty.WriteStream": true,
-        "tty.isatty": true,
-        "util": true
+        "path": true,
+        "stream.Stream": true,
+        "url": true
       },
       "globals": {
-        "chrome": true,
         "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+        "process.argv": true,
+        "process.env.DEBUG_NOPT": true,
+        "process.env.NOPT_DEBUG": true,
+        "process.platform": true
       },
       "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>debug>ms": true
-      }
-    },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property": {
-      "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": true
-      }
-    },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
-      "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true,
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
-      "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>nopt>abbrev": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
       }
     },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
+      "builtin": {
+        "child_process.exec": true,
+        "path": true
+      },
+      "globals": {
+        "process.env.COMPUTERNAME": true,
+        "process.env.ComSpec": true,
+        "process.env.EDITOR": true,
+        "process.env.HOSTNAME": true,
+        "process.env.PATH": true,
+        "process.env.PROMPT": true,
+        "process.env.PS1": true,
+        "process.env.Path": true,
+        "process.env.SHELL": true,
+        "process.env.USER": true,
+        "process.env.USERDOMAIN": true,
+        "process.env.USERNAME": true,
+        "process.env.VISUAL": true,
+        "process.env.path": true,
+        "process.nextTick": true,
+        "process.platform": true
+      },
       "packages": {
-        "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": true
+        "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
       }
     },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
+      "globals": {
+        "process.env.SystemRoot": true,
+        "process.env.TEMP": true,
+        "process.env.TMP": true,
+        "process.env.TMPDIR": true,
+        "process.env.windir": true,
+        "process.platform": true
       }
     },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>expand-brackets>extend-shallow": {
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": {
+      "builtin": {
+        "assert": true,
+        "fs": true,
+        "path.join": true
+      },
+      "globals": {
+        "process.platform": true,
+        "setTimeout": true
+      },
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "nyc>glob": true
       }
     },
-    "gulp-watch>chokidar>anymatch>micromatch>extglob>extend-shallow": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": {
+      "globals": {
+        "console": true,
+        "process": true
       }
     },
-    "gulp-watch>chokidar>anymatch>normalize-path": {
+    "gulp-watch>fancy-log": {
+      "globals": {
+        "console": true,
+        "process.argv.indexOf": true,
+        "process.stderr.write": true,
+        "process.stdout.write": true
+      },
       "packages": {
-        "vinyl>remove-trailing-separator": true
+        "fancy-log>ansi-gray": true,
+        "fancy-log>color-support": true,
+        "fancy-log>time-stamp": true
       }
     },
-    "gulp-watch>chokidar>async-each": {
+    "gulp-watch>path-is-absolute": {
       "globals": {
-        "define": true
-      }
-    },
-    "gulp-watch>chokidar>braces": {
-      "packages": {
-        "gulp-watch>chokidar>braces>array-unique": true,
-        "gulp-watch>chokidar>braces>extend-shallow": true,
-        "gulp-watch>chokidar>braces>fill-range": true,
-        "gulp-watch>chokidar>braces>repeat-element": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>snapdragon-node": true,
-        "gulp-watch>chokidar>braces>split-string": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp>gulp-cli>isobject": true,
-        "gulp>undertaker>arr-flatten": true
+        "process.platform": true
       }
     },
-    "gulp-watch>chokidar>braces>extend-shallow": {
+    "gulp-watch>readable-stream": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.browser": true,
+        "process.env.READABLE_STREAM": true,
+        "process.stderr": true,
+        "process.stdout": true,
+        "process.version.slice": true,
+        "setImmediate": true
+      },
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "gulp-watch>readable-stream>isarray": true,
+        "gulp-watch>readable-stream>safe-buffer": true,
+        "gulp-watch>readable-stream>string_decoder": true,
+        "pumpify>inherits": true,
+        "readable-stream-2>core-util-is": true,
+        "readable-stream-2>process-nextick-args": true,
+        "readable-stream>util-deprecate": true
       }
     },
-    "gulp-watch>chokidar>braces>fill-range": {
+    "gulp-watch>readable-stream>safe-buffer": {
       "builtin": {
-        "util.inspect": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>braces>fill-range>extend-shallow": true,
-        "gulp-watch>chokidar>braces>fill-range>is-number": true,
-        "gulp-watch>chokidar>braces>fill-range>to-regex-range": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+        "buffer": true
       }
     },
-    "gulp-watch>chokidar>braces>fill-range>extend-shallow": {
+    "gulp-watch>readable-stream>string_decoder": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "gulp-watch>readable-stream>safe-buffer": true
       }
     },
-    "gulp-watch>chokidar>braces>fill-range>is-number": {
+    "gulp-watch>vinyl-file": {
+      "builtin": {
+        "path.resolve": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
       "packages": {
-        "gulp-watch>chokidar>braces>fill-range>is-number>kind-of": true
+        "del>graceful-fs": true,
+        "gh-pages>globby>pinkie-promise": true,
+        "gulp-watch>vinyl-file>pify": true,
+        "gulp-watch>vinyl-file>strip-bom": true,
+        "gulp-watch>vinyl-file>strip-bom-stream": true,
+        "gulp-watch>vinyl-file>vinyl": true
       }
     },
-    "gulp-watch>chokidar>braces>fill-range>is-number>kind-of": {
+    "gulp-watch>vinyl-file>strip-bom": {
+      "globals": {
+        "Buffer.isBuffer": true
+      },
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
       }
     },
-    "gulp-watch>chokidar>braces>fill-range>to-regex-range": {
+    "gulp-watch>vinyl-file>strip-bom-stream": {
       "packages": {
-        "gulp-watch>chokidar>braces>fill-range>is-number": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+        "gulp-watch>vinyl-file>strip-bom": true,
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true
       }
     },
-    "gulp-watch>chokidar>braces>snapdragon": {
+    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": {
       "builtin": {
-        "fs.readFileSync": true,
-        "path.dirname": true,
-        "util.inspect": true
+        "util.inherits": true
       },
       "globals": {
-        "__filename": true
+        "Buffer.concat": true,
+        "setImmediate": true
       },
       "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base": true,
-        "gulp-watch>chokidar>braces>snapdragon>debug": true,
-        "gulp-watch>chokidar>braces>snapdragon>define-property": true,
-        "gulp-watch>chokidar>braces>snapdragon>extend-shallow": true,
-        "gulp-watch>chokidar>braces>snapdragon>map-cache": true,
-        "gulp-watch>chokidar>braces>snapdragon>source-map": true,
-        "gulp-watch>chokidar>braces>snapdragon>use": true,
-        "resolve-url-loader>rework>css>source-map-resolve": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon-node": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon-node>define-property": true,
-        "gulp-watch>chokidar>braces>snapdragon-node>snapdragon-util": true,
-        "gulp>gulp-cli>isobject": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon-node>define-property": {
-      "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon-node>snapdragon-util": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon-node>snapdragon-util>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon-node>snapdragon-util>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>class-utils": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>component-emitter": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>define-property": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>mixin-deep": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>pascalcase": true,
-        "gulp>gulp-cli>isobject": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>collection-visit": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>set-value": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>to-object-path": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>union-value": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>component-emitter": true,
-        "gulp>gulp-cli>array-sort>get-value": true,
-        "gulp>gulp-cli>isobject": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>collection-visit": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>collection-visit>map-visit": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>collection-visit>object-visit": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>collection-visit>map-visit": {
-      "builtin": {
-        "util.inspect": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>collection-visit>object-visit": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>collection-visit>object-visit": {
-      "packages": {
-        "gulp>gulp-cli>isobject": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values": true,
-        "gulp>gulp-cli>array-sort>get-value": true,
-        "gulp>gulp-cli>isobject": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values>is-number": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values>is-number": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>has-value>has-values>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>set-value": {
-      "packages": {
-        "@babel/register>clone-deep>is-plain-object": true,
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>set-value>extend-shallow": true,
-        "gulp-watch>chokidar>braces>split-string": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>set-value>extend-shallow": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>to-object-path": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>to-object-path>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>to-object-path>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>union-value": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>set-value": true,
-        "gulp-zip>plugin-error>arr-union": true,
-        "gulp>gulp-cli>array-sort>get-value": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value>has-value": true,
-        "gulp>gulp-cli>isobject": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value>has-value": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value>has-value>has-values": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value>has-value>isobject": true,
-        "gulp>gulp-cli>array-sort>get-value": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value>has-value>isobject": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>cache-base>unset-value>has-value>isobject>isarray": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>class-utils": {
-      "builtin": {
-        "util": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>class-utils>static-extend": true,
-        "gulp-watch>chokidar>braces>snapdragon>define-property": true,
-        "gulp-zip>plugin-error>arr-union": true,
-        "gulp>gulp-cli>isobject": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>class-utils>static-extend": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>class-utils>static-extend>object-copy": true,
-        "gulp-watch>chokidar>braces>snapdragon>define-property": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>class-utils>static-extend>object-copy": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>class-utils>static-extend>object-copy>copy-descriptor": true,
-        "gulp-watch>chokidar>braces>snapdragon>base>class-utils>static-extend>object-copy>kind-of": true,
-        "gulp-watch>chokidar>braces>snapdragon>define-property": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>class-utils>static-extend>object-copy>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>define-property": {
-      "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>mixin-deep": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>base>mixin-deep>is-extendable": true,
-        "gulp>undertaker>object.reduce>for-own>for-in": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>base>mixin-deep>is-extendable": {
-      "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>debug": {
-      "builtin": {
-        "fs.SyncWriteStream": true,
-        "net.Socket": true,
-        "tty.WriteStream": true,
-        "tty.isatty": true,
-        "util": true
-      },
-      "globals": {
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>debug>ms": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>define-property": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>is-data-descriptor": true,
-        "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>is-accessor-descriptor": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>is-data-descriptor": {
-      "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": {
-      "packages": {
-        "browserify>insert-module-globals>is-buffer": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>extend-shallow": {
-      "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
-      }
-    },
-    "gulp-watch>chokidar>braces>snapdragon>use": {
-      "packages": {
-        "@babel/register>clone-deep>kind-of": true
-      }
-    },
-    "gulp-watch>chokidar>braces>split-string": {
-      "packages": {
-        "gulp-zip>plugin-error>extend-shallow": true
-      }
-    },
-    "gulp-watch>chokidar>braces>to-regex": {
-      "packages": {
-        "gulp-watch>chokidar>braces>to-regex>define-property": true,
-        "gulp-watch>chokidar>braces>to-regex>safe-regex": true,
-        "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true
-      }
-    },
-    "gulp-watch>chokidar>braces>to-regex>define-property": {
-      "packages": {
-        "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
-      }
-    },
-    "gulp-watch>chokidar>braces>to-regex>safe-regex": {
-      "packages": {
-        "gulp-watch>chokidar>braces>to-regex>safe-regex>ret": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.stat": true,
-        "path.join": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "__dirname": true,
-        "console.assert": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.existsSync": true,
-        "fs.readFileSync": true,
-        "fs.renameSync": true,
-        "path.dirname": true,
-        "path.existsSync": true,
-        "path.join": true,
-        "path.resolve": true,
-        "url.parse": true,
-        "url.resolve": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "__dirname": true,
-        "console.log": true,
-        "process.arch": true,
-        "process.cwd": true,
-        "process.env": true,
-        "process.platform": true,
-        "process.version.substr": true,
-        "process.versions": true
-      },
-      "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": {
-      "builtin": {
-        "child_process.spawnSync": true,
-        "fs.readdirSync": true,
-        "os.platform": true
-      },
-      "globals": {
-        "process.env": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": {
-      "builtin": {
-        "path": true,
-        "stream.Stream": true,
-        "url": true
-      },
-      "globals": {
-        "console": true,
-        "process.argv": true,
-        "process.env.DEBUG_NOPT": true,
-        "process.env.NOPT_DEBUG": true,
-        "process.platform": true
-      },
-      "packages": {
-        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>nopt>abbrev": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
-      "builtin": {
-        "child_process.exec": true,
-        "path": true
-      },
-      "globals": {
-        "process.env.COMPUTERNAME": true,
-        "process.env.ComSpec": true,
-        "process.env.EDITOR": true,
-        "process.env.HOSTNAME": true,
-        "process.env.PATH": true,
-        "process.env.PROMPT": true,
-        "process.env.PS1": true,
-        "process.env.Path": true,
-        "process.env.SHELL": true,
-        "process.env.USER": true,
-        "process.env.USERDOMAIN": true,
-        "process.env.USERNAME": true,
-        "process.env.VISUAL": true,
-        "process.env.path": true,
-        "process.nextTick": true,
-        "process.platform": true
-      },
-      "packages": {
-        "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true,
-        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
-      "globals": {
-        "process.env.SystemRoot": true,
-        "process.env.TEMP": true,
-        "process.env.TMP": true,
-        "process.env.TMPDIR": true,
-        "process.env.windir": true,
-        "process.platform": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "path.join": true
-      },
-      "globals": {
-        "process.platform": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "nyc>glob": true
-      }
-    },
-    "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": {
-      "globals": {
-        "console": true,
-        "process": true
-      }
-    },
-    "gulp-watch>chokidar>is-binary-path": {
-      "builtin": {
-        "path.extname": true
-      },
-      "packages": {
-        "gulp-watch>chokidar>is-binary-path>binary-extensions": true
-      }
-    },
-    "gulp-watch>chokidar>readdirp": {
-      "builtin": {
-        "path.join": true,
-        "path.relative": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "setImmediate": true
-      },
-      "packages": {
-        "del>graceful-fs": true,
-        "gulp-watch>chokidar>anymatch>micromatch": true,
-        "gulp-watch>readable-stream": true
-      }
-    },
-    "gulp-watch>chokidar>upath": {
-      "builtin": {
-        "path": true
-      }
-    },
-    "gulp-watch>fancy-log": {
-      "globals": {
-        "console": true,
-        "process.argv.indexOf": true,
-        "process.stderr.write": true,
-        "process.stdout.write": true
-      },
-      "packages": {
-        "fancy-log>ansi-gray": true,
-        "fancy-log>color-support": true,
-        "fancy-log>time-stamp": true
-      }
-    },
-    "gulp-watch>path-is-absolute": {
-      "globals": {
-        "process.platform": true
-      }
-    },
-    "gulp-watch>readable-stream": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "gulp-watch>readable-stream>isarray": true,
-        "gulp-watch>readable-stream>safe-buffer": true,
-        "gulp-watch>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "gulp-watch>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
-      }
-    },
-    "gulp-watch>readable-stream>string_decoder": {
-      "packages": {
-        "gulp-watch>readable-stream>safe-buffer": true
-      }
-    },
-    "gulp-watch>vinyl-file": {
-      "builtin": {
-        "path.resolve": true
-      },
-      "globals": {
-        "process.cwd": true
-      },
-      "packages": {
-        "del>graceful-fs": true,
-        "gh-pages>globby>pinkie-promise": true,
-        "gulp-watch>vinyl-file>pify": true,
-        "gulp-watch>vinyl-file>strip-bom": true,
-        "gulp-watch>vinyl-file>strip-bom-stream": true,
-        "gulp-watch>vinyl-file>vinyl": true
-      }
-    },
-    "gulp-watch>vinyl-file>strip-bom": {
-      "globals": {
-        "Buffer.isBuffer": true
-      },
-      "packages": {
-        "gulp>vinyl-fs>remove-bom-buffer>is-utf8": true
-      }
-    },
-    "gulp-watch>vinyl-file>strip-bom-stream": {
-      "packages": {
-        "gulp-watch>vinyl-file>strip-bom": true,
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": true
-      }
-    },
-    "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream": {
-      "builtin": {
-        "util.inherits": true
-      },
-      "globals": {
-        "Buffer.concat": true,
-        "setImmediate": true
-      },
-      "packages": {
-        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream": true
+        "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream": true
       }
     },
     "gulp-watch>vinyl-file>strip-bom-stream>first-chunk-stream>readable-stream": {
@@ -5335,9 +4812,9 @@
     },
     "gulp>glob-watcher": {
       "packages": {
+        "chokidar": true,
         "gulp>glob-watcher>anymatch": true,
         "gulp>glob-watcher>async-done": true,
-        "gulp>glob-watcher>chokidar": true,
         "gulp>glob-watcher>is-negated-glob": true,
         "gulp>glob-watcher>just-debounce": true,
         "gulp>undertaker>object.defaults": true
@@ -5348,390 +4825,585 @@
         "path.sep": true
       },
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch": true,
-        "gulp>glob-watcher>anymatch>normalize-path": true
+        "gulp-watch>anymatch>normalize-path": true,
+        "gulp>glob-watcher>anymatch>micromatch": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch": {
+      "builtin": {
+        "path.basename": true,
+        "path.sep": true,
+        "util.inspect": true
+      },
+      "globals": {
+        "process.platform": true
+      },
+      "packages": {
+        "@babel/register>clone-deep>kind-of": true,
+        "gulp-zip>plugin-error>arr-diff": true,
+        "gulp-zip>plugin-error>extend-shallow": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces": true,
+        "gulp>glob-watcher>anymatch>micromatch>define-property": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob": true,
+        "gulp>gulp-cli>liftoff>fined>object.pick": true,
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
+        "gulp>gulp-cli>matchdep>micromatch>nanomatch": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>braces>repeat-element": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>extend-shallow": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>split-string": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true,
+        "gulp>undertaker>arr-flatten": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>extend-shallow": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range": {
+      "builtin": {
+        "util.inspect": true
+      },
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>extend-shallow": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": true,
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>to-regex-range": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>extend-shallow": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number>kind-of": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number>kind-of": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>to-regex-range": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>braces>fill-range>is-number": true,
+        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>define-property": {
+      "packages": {
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": {
+      "globals": {
+        "__filename": true
+      },
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>extglob>expand-brackets>posix-character-classes": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": {
+      "builtin": {
+        "fs.SyncWriteStream": true,
+        "net.Socket": true,
+        "tty.WriteStream": true,
+        "tty.isatty": true,
+        "util": true
+      },
+      "globals": {
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
+      },
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug>ms": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
+      "packages": {
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+      }
+    },
+    "gulp>glob-watcher>async-done": {
+      "globals": {
+        "process.nextTick": true
+      },
+      "packages": {
+        "@metamask/object-multiplex>once": true,
+        "duplexify>end-of-stream": true,
+        "gulp>glob-watcher>async-done>stream-exhaust": true,
+        "readable-stream-2>process-nextick-args": true
+      }
+    },
+    "gulp>glob-watcher>async-done>stream-exhaust": {
+      "builtin": {
+        "stream.Writable": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "setImmediate": true
+      }
+    },
+    "gulp>glob-watcher>chokidar": {
+      "packages": {
+        "gulp>glob-watcher>chokidar>fsevents": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>fsevents": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs.stat": true,
+        "path.join": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.assert": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
+      }
+    },
+    "gulp>glob-watcher>just-debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
+    "gulp>gulp-cli>liftoff>fined>object.pick": {
+      "packages": {
+        "gulp>gulp-cli>isobject": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node": {
+      "packages": {
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>define-property": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util>kind-of": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>braces>snapdragon-node>snapdragon-util>kind-of": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>braces>split-string": {
+      "packages": {
+        "gulp-zip>plugin-error>extend-shallow": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": {
+      "packages": {
+        "@babel/register>clone-deep>kind-of": true,
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": {
+      "packages": {
+        "@babel/register>clone-deep>kind-of": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": {
+      "packages": {
+        "@babel/register>clone-deep>kind-of": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>fragment-cache": {
+      "packages": {
+        "gulp>gulp-cli>liftoff>fined>parse-filepath>map-cache": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch": {
+    "gulp>gulp-cli>matchdep>micromatch>nanomatch": {
       "builtin": {
         "path.basename": true,
         "path.sep": true,
         "util.inspect": true
       },
-      "globals": {
-        "process.platform": true
-      },
       "packages": {
         "@babel/register>clone-deep>kind-of": true,
-        "gulp-watch>chokidar>braces>array-unique": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
         "gulp-zip>plugin-error>arr-diff": true,
         "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>glob-watcher>anymatch>micromatch>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob": true,
-        "gulp>glob-watcher>chokidar>braces": true,
         "gulp>gulp-cli>liftoff>fined>object.pick": true,
+        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
         "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>nanomatch": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true
+        "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex": true,
+        "nyc>spawn-wrap>is-windows": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>define-property": {
+    "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": {
       "packages": {
         "gulp>gulp-cli>isobject": true,
         "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob": {
-      "packages": {
-        "gulp-watch>chokidar>braces>array-unique": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": {
+    "gulp>gulp-cli>matchdep>micromatch>regex-not": {
       "packages": {
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
+        "gulp-zip>plugin-error>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon": {
+      "builtin": {
+        "fs.readFileSync": true,
+        "path.dirname": true,
+        "util.inspect": true
+      },
       "globals": {
         "__filename": true
       },
       "packages": {
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": true,
-        "gulp>gulp-cli>matchdep>micromatch>extglob>expand-brackets>posix-character-classes": true,
-        "gulp>gulp-cli>matchdep>micromatch>regex-not": true
+        "gulp>gulp-cli>liftoff>fined>parse-filepath>map-cache": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>extend-shallow": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>source-map": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>use": true,
+        "resolve-url-loader>rework>css>source-map-resolve": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base": {
       "builtin": {
-        "fs.SyncWriteStream": true,
-        "net.Socket": true,
-        "tty.WriteStream": true,
-        "tty.isatty": true,
-        "util": true
+        "util.inherits": true
       },
-      "globals": {
-        "chrome": true,
-        "console": true,
-        "document": true,
-        "localStorage": true,
-        "navigator": true,
-        "process": true
+      "packages": {
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>component-emitter": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>pascalcase": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base": {
+      "packages": {
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>union-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>component-emitter": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>map-visit": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": true
+      }
+    },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>map-visit": {
+      "builtin": {
+        "util.inspect": true
       },
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug>ms": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>collection-visit>object-visit": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": true
+        "gulp>gulp-cli>isobject": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": true,
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>kind-of": true
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>kind-of": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number": {
       "packages": {
-        "browserify>insert-module-globals>is-buffer": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>is-number>kind-of": {
       "packages": {
-        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>has-value>has-values>kind-of": {
       "packages": {
         "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "@babel/register>clone-deep>is-plain-object": true,
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
+        "gulp>gulp-cli>matchdep>micromatch>braces>split-string": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value>extend-shallow": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value>extend-shallow": {
       "packages": {
         "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp>glob-watcher>anymatch>normalize-path": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path": {
       "packages": {
-        "vinyl>remove-trailing-separator": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path>kind-of": true
       }
     },
-    "gulp>glob-watcher>async-done": {
-      "globals": {
-        "process.nextTick": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>to-object-path>kind-of": {
       "packages": {
-        "@metamask/object-multiplex>once": true,
-        "duplexify>end-of-stream": true,
-        "gulp>glob-watcher>async-done>stream-exhaust": true,
-        "readable-stream-2>process-nextick-args": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>glob-watcher>async-done>stream-exhaust": {
-      "builtin": {
-        "stream.Writable": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "setImmediate": true
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>union-value": {
+      "packages": {
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true,
+        "gulp-zip>plugin-error>arr-union": true,
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>set-value": true
       }
     },
-    "gulp>glob-watcher>chokidar": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs": true,
-        "path.basename": true,
-        "path.dirname": true,
-        "path.extname": true,
-        "path.join": true,
-        "path.relative": true,
-        "path.resolve": true,
-        "path.sep": true
-      },
-      "globals": {
-        "clearTimeout": true,
-        "console.error": true,
-        "process.env.CHOKIDAR_INTERVAL": true,
-        "process.env.CHOKIDAR_PRINT_FSEVENTS_REQUIRE_ERROR": true,
-        "process.env.CHOKIDAR_USEPOLLING": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setTimeout": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value": {
       "packages": {
-        "chokidar>normalize-path": true,
-        "del>is-glob": true,
-        "eslint>glob-parent": true,
-        "gulp-watch>chokidar>async-each": true,
-        "gulp-watch>path-is-absolute": true,
-        "gulp>glob-watcher>anymatch": true,
-        "gulp>glob-watcher>chokidar>braces": true,
-        "gulp>glob-watcher>chokidar>fsevents": true,
-        "gulp>glob-watcher>chokidar>is-binary-path": true,
-        "gulp>glob-watcher>chokidar>readdirp": true,
-        "gulp>glob-watcher>chokidar>upath": true,
-        "pumpify>inherits": true
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value": {
       "packages": {
-        "gulp-watch>chokidar>braces>array-unique": true,
-        "gulp-watch>chokidar>braces>repeat-element": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>snapdragon-node": true,
-        "gulp-watch>chokidar>braces>split-string": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp>glob-watcher>chokidar>braces>extend-shallow": true,
-        "gulp>glob-watcher>chokidar>braces>fill-range": true,
-        "gulp>gulp-cli>isobject": true,
-        "gulp>undertaker>arr-flatten": true
+        "gulp>gulp-cli>array-sort>get-value": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>has-values": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>extend-shallow": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>cache-base>unset-value>has-value>isobject>isarray": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils": {
       "builtin": {
-        "util.inspect": true
+        "util": true
       },
       "packages": {
-        "gulp>glob-watcher>chokidar>braces>fill-range>extend-shallow": true,
-        "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true,
-        "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
+        "gulp-zip>plugin-error>arr-union": true,
+        "gulp>gulp-cli>isobject": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range>extend-shallow": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend": {
+      "builtin": {
+        "util.inherits": true
+      },
       "packages": {
-        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range>is-number": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy": {
       "packages": {
-        "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>copy-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>kind-of": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>class-utils>static-extend>object-copy>kind-of": {
       "packages": {
         "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": {
-      "packages": {
-        "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true,
-        "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
-      }
-    },
-    "gulp>glob-watcher>chokidar>fsevents": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.stat": true,
-        "path.join": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "__dirname": true,
-        "console.assert": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setImmediate": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>define-property": {
       "packages": {
-        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
+        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "gulp>glob-watcher>chokidar>is-binary-path": {
-      "builtin": {
-        "path.extname": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep": {
       "packages": {
-        "gulp>glob-watcher>chokidar>is-binary-path>binary-extensions": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep>is-extendable": true,
+        "gulp>undertaker>object.reduce>for-own>for-in": true
       }
     },
-    "gulp>glob-watcher>chokidar>readdirp": {
-      "builtin": {
-        "path.join": true,
-        "path.relative": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "setImmediate": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>base>mixin-deep>is-extendable": {
       "packages": {
-        "del>graceful-fs": true,
-        "gulp>glob-watcher>anymatch>micromatch": true,
-        "gulp>glob-watcher>chokidar>readdirp>readable-stream": true
+        "@babel/register>clone-deep>is-plain-object": true
       }
     },
-    "gulp>glob-watcher>chokidar>readdirp>readable-stream": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug": {
       "builtin": {
-        "events.EventEmitter": true,
-        "stream": true,
+        "fs.SyncWriteStream": true,
+        "net.Socket": true,
+        "tty.WriteStream": true,
+        "tty.isatty": true,
         "util": true
       },
       "globals": {
-        "process.browser": true,
-        "process.env.READABLE_STREAM": true,
-        "process.stderr": true,
-        "process.stdout": true,
-        "process.version.slice": true,
-        "setImmediate": true
+        "chrome": true,
+        "console": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "process": true
       },
       "packages": {
-        "gulp>glob-watcher>chokidar>readdirp>readable-stream>isarray": true,
-        "gulp>glob-watcher>chokidar>readdirp>readable-stream>safe-buffer": true,
-        "gulp>glob-watcher>chokidar>readdirp>readable-stream>string_decoder": true,
-        "pumpify>inherits": true,
-        "readable-stream-2>core-util-is": true,
-        "readable-stream-2>process-nextick-args": true,
-        "readable-stream>util-deprecate": true
-      }
-    },
-    "gulp>glob-watcher>chokidar>readdirp>readable-stream>safe-buffer": {
-      "builtin": {
-        "buffer": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>debug>ms": true
       }
     },
-    "gulp>glob-watcher>chokidar>readdirp>readable-stream>string_decoder": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property": {
       "packages": {
-        "gulp>glob-watcher>chokidar>readdirp>readable-stream>safe-buffer": true
-      }
-    },
-    "gulp>glob-watcher>chokidar>upath": {
-      "builtin": {
-        "path": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor": true
       }
     },
-    "gulp>glob-watcher>just-debounce": {
-      "globals": {
-        "clearTimeout": true,
-        "setTimeout": true
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor": {
+      "packages": {
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-accessor-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor": true,
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>kind-of": true
       }
     },
-    "gulp>gulp-cli>liftoff>fined>object.pick": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-accessor-descriptor": {
       "packages": {
-        "gulp>gulp-cli>isobject": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": true,
-        "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": true
+        "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-accessor-descriptor": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>define-property>is-descriptor>is-data-descriptor>kind-of": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor>is-data-descriptor": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>extend-shallow": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true
+        "gulp-watch>anymatch>micromatch>object.omit>is-extendable": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>fragment-cache": {
+    "gulp>gulp-cli>matchdep>micromatch>snapdragon>use": {
       "packages": {
-        "gulp-watch>chokidar>braces>snapdragon>map-cache": true
+        "@babel/register>clone-deep>kind-of": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>nanomatch": {
-      "builtin": {
-        "path.basename": true,
-        "path.sep": true,
-        "util.inspect": true
-      },
+    "gulp>gulp-cli>matchdep>micromatch>to-regex": {
       "packages": {
-        "@babel/register>clone-deep>kind-of": true,
-        "gulp-watch>chokidar>braces>array-unique": true,
-        "gulp-watch>chokidar>braces>snapdragon": true,
-        "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp-zip>plugin-error>arr-diff": true,
         "gulp-zip>plugin-error>extend-shallow": true,
-        "gulp>gulp-cli>liftoff>fined>object.pick": true,
-        "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
-        "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": true,
         "gulp>gulp-cli>matchdep>micromatch>regex-not": true,
-        "nyc>spawn-wrap>is-windows": true
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>define-property": true,
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>nanomatch>define-property": {
+    "gulp>gulp-cli>matchdep>micromatch>to-regex>define-property": {
       "packages": {
         "gulp>gulp-cli>isobject": true,
         "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "gulp>gulp-cli>matchdep>micromatch>regex-not": {
+    "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex": {
       "packages": {
-        "gulp-watch>chokidar>braces>to-regex>safe-regex": true,
-        "gulp-zip>plugin-error>extend-shallow": true
+        "gulp>gulp-cli>matchdep>micromatch>to-regex>safe-regex>ret": true
       }
     },
     "gulp>gulp-cli>replace-homedir>is-absolute": {
@@ -6464,9 +6136,9 @@
       },
       "packages": {
         "del>graceful-fs": true,
+        "gulp-watch>anymatch>normalize-path": true,
         "gulp>vinyl-fs>remove-bom-buffer": true,
         "gulp>vinyl-fs>vinyl-sourcemap>append-buffer": true,
-        "gulp>vinyl-fs>vinyl-sourcemap>normalize-path": true,
         "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": true,
         "nyc>convert-source-map": true,
         "vinyl": true
@@ -6488,11 +6160,6 @@
         "buffer.Buffer.isBuffer": true
       }
     },
-    "gulp>vinyl-fs>vinyl-sourcemap>normalize-path": {
-      "packages": {
-        "vinyl>remove-trailing-separator": true
-      }
-    },
     "gulp>vinyl-fs>vinyl-sourcemap>now-and-later": {
       "packages": {
         "@metamask/object-multiplex>once": true
diff --git a/package.json b/package.json
index 35dcd75ceab1..cae7ab4bd986 100644
--- a/package.json
+++ b/package.json
@@ -126,6 +126,7 @@
     "attributions:generate": "./development/generate-attributions.sh"
   },
   "resolutions": {
+    "chokidar": "^3.6.0",
     "simple-update-notifier@^1.0.0": "^2.0.0",
     "@babel/core": "patch:@babel/core@npm%3A7.23.2#~/.yarn/patches/@babel-core-npm-7.23.2-b93f586907.patch",
     "@types/react": "^16.9.53",
@@ -521,7 +522,7 @@
     "bify-module-groups": "^2.0.0",
     "browserify": "^17.0.0",
     "chalk": "^4.1.2",
-    "chokidar": "^3.5.3",
+    "chokidar": "^3.6.0",
     "concurrently": "^8.2.2",
     "copy-webpack-plugin": "^12.0.2",
     "cross-spawn": "^7.0.3",
diff --git a/yarn.lock b/yarn.lock
index 48fa2ace9055..7029f2473f62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11301,13 +11301,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abbrev@npm:1":
-  version: 1.1.1
-  resolution: "abbrev@npm:1.1.1"
-  checksum: 10/2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243
-  languageName: node
-  linkType: hard
-
 "abbrev@npm:^2.0.0":
   version: 2.0.0
   resolution: "abbrev@npm:2.0.0"
@@ -11906,13 +11899,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3":
-  version: 1.2.0
-  resolution: "aproba@npm:1.2.0"
-  checksum: 10/48def777330afca699880126b555273cd9912525500edc5866b527da6fd6c54badd3ae6cc6039081e5bc22e9b349d8e65fd70f8499beb090f86aa6261e4242dd
-  languageName: node
-  linkType: hard
-
 "archy@npm:^1.0.0":
   version: 1.0.0
   resolution: "archy@npm:1.0.0"
@@ -11927,16 +11913,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"are-we-there-yet@npm:~1.1.2":
-  version: 1.1.4
-  resolution: "are-we-there-yet@npm:1.1.4"
-  dependencies:
-    delegates: "npm:^1.0.0"
-    readable-stream: "npm:^2.0.6"
-  checksum: 10/86947c3ec0c8be746a0a8eb0871033bd89d8619ddbf6d51aae2d4a3a816fc06741df01307db8c0b44b9e9b20d46725fd023f1766bf586ccf1d4636cb1441452f
-  languageName: node
-  linkType: hard
-
 "arg@npm:^4.1.0":
   version: 4.1.3
   resolution: "arg@npm:4.1.3"
@@ -12285,13 +12261,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async-each@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "async-each@npm:1.0.1"
-  checksum: 10/9421203743e3379ce70defb94a78308c828e4e56d8e8bf4ba90b4c788b90a9d0759aabd327831e5a97bb6e484eccfee2f5496c1c2b239bd15f082544d919c60d
-  languageName: node
-  linkType: hard
-
 "async-eventemitter@npm:0.2.4":
   version: 0.2.4
   resolution: "async-eventemitter@npm:0.2.4"
@@ -12875,13 +12844,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"binary-extensions@npm:^1.0.0":
-  version: 1.11.0
-  resolution: "binary-extensions@npm:1.11.0"
-  checksum: 10/839f346e4a1e5d43a96c5e5b3cdc608840e97b178f27a1b2fdc7b670598a23fdec42ab70d736d03db752bef44e18a57c5471e7d3ac11163deff459d6bd580e6a
-  languageName: node
-  linkType: hard
-
 "binary-extensions@npm:^2.0.0":
   version: 2.0.0
   resolution: "binary-extensions@npm:2.0.0"
@@ -13155,7 +13117,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"braces@npm:^2.3.1, braces@npm:^2.3.2":
+"braces@npm:^2.3.1":
   version: 2.3.2
   resolution: "braces@npm:2.3.2"
   dependencies:
@@ -13986,26 +13948,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chokidar@npm:3.5.3":
-  version: 3.5.3
-  resolution: "chokidar@npm:3.5.3"
-  dependencies:
-    anymatch: "npm:~3.1.2"
-    braces: "npm:~3.0.2"
-    fsevents: "npm:~2.3.2"
-    glob-parent: "npm:~5.1.2"
-    is-binary-path: "npm:~2.1.0"
-    is-glob: "npm:~4.0.1"
-    normalize-path: "npm:~3.0.0"
-    readdirp: "npm:~3.6.0"
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: 10/863e3ff78ee7a4a24513d2a416856e84c8e4f5e60efbe03e8ab791af1a183f569b62fc6f6b8044e2804966cb81277ddbbc1dc374fba3265bd609ea8efd62f5b3
-  languageName: node
-  linkType: hard
-
-"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.3.1, chokidar@npm:^3.4.0, chokidar@npm:^3.5.3":
+"chokidar@npm:^3.6.0":
   version: 3.6.0
   resolution: "chokidar@npm:3.6.0"
   dependencies:
@@ -14024,30 +13967,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chokidar@npm:^2.0.0":
-  version: 2.1.8
-  resolution: "chokidar@npm:2.1.8"
-  dependencies:
-    anymatch: "npm:^2.0.0"
-    async-each: "npm:^1.0.1"
-    braces: "npm:^2.3.2"
-    fsevents: "npm:^1.2.7"
-    glob-parent: "npm:^3.1.0"
-    inherits: "npm:^2.0.3"
-    is-binary-path: "npm:^1.0.0"
-    is-glob: "npm:^4.0.0"
-    normalize-path: "npm:^3.0.0"
-    path-is-absolute: "npm:^1.0.0"
-    readdirp: "npm:^2.2.1"
-    upath: "npm:^1.1.1"
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: 10/567c319dd2a9078fddb5a64df46163d87b104857c1b50c2ef6f9b41b3ab28867c48dbc5f0c6ddaafd3c338b147ea33a6498eb9b906c71006cba1e486a0e9350d
-  languageName: node
-  linkType: hard
-
-"chownr@npm:^1.1.1, chownr@npm:^1.1.4":
+"chownr@npm:^1.1.1":
   version: 1.1.4
   resolution: "chownr@npm:1.1.4"
   checksum: 10/115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
@@ -14723,13 +14643,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console-control-strings@npm:^1.0.0, console-control-strings@npm:~1.1.0":
-  version: 1.1.0
-  resolution: "console-control-strings@npm:1.1.0"
-  checksum: 10/27b5fa302bc8e9ae9e98c03c66d76ca289ad0c61ce2fe20ab288d288bee875d217512d2edb2363fc83165e88f1c405180cf3f5413a46e51b4fe1a004840c6cdb
-  languageName: node
-  linkType: hard
-
 "consolidate@npm:^0.16.0":
   version: 0.16.0
   resolution: "consolidate@npm:0.16.0"
@@ -15455,7 +15368,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:3.X, debug@npm:^3.1.0, debug@npm:^3.1.1, debug@npm:^3.2.6, debug@npm:^3.2.7":
+"debug@npm:3.X, debug@npm:^3.1.0, debug@npm:^3.1.1, debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
@@ -15949,15 +15862,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-libc@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "detect-libc@npm:1.0.3"
-  bin:
-    detect-libc: ./bin/detect-libc.js
-  checksum: 10/3849fe7720feb153e4ac9407086956e073f1ce1704488290ef0ca8aab9430a8d48c8a9f8351889e7cdc64e5b1128589501e4fef48f3a4a49ba92cd6d112d0757
-  languageName: node
-  linkType: hard
-
 "detect-newline@npm:^2.0.0":
   version: 2.1.0
   resolution: "detect-newline@npm:2.1.0"
@@ -19137,15 +19041,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^1.2.7":
-  version: 1.2.7
-  resolution: "fs-minipass@npm:1.2.7"
-  dependencies:
-    minipass: "npm:^2.6.0"
-  checksum: 10/6a2d39963eaad748164530ffab49606d0f3462c7867748521af3b7039d13689be533636d50a04e8ba6bd327d4d2e899d0907f8830d1161fe2db467d59cc46dc3
-  languageName: node
-  linkType: hard
-
 "fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
@@ -19198,17 +19093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@npm:^1.2.7":
-  version: 1.2.9
-  resolution: "fsevents@npm:1.2.9"
-  dependencies:
-    nan: "npm:^2.12.1"
-    node-pre-gyp: "npm:^0.12.0"
-  checksum: 10/1d8cb504a54837816badbbe7178fae84d82d2b50731571591404f13881ace67d395cc9cadda8106716f69e362b9888295fa1c3eee58c1041c2c43fc87204da36
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
 "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
   version: 2.3.3
   resolution: "fsevents@npm:2.3.3"
@@ -19228,16 +19112,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@npm%3A^1.2.7#optional!builtin<compat/fsevents>":
-  version: 1.2.9
-  resolution: "fsevents@patch:fsevents@npm%3A1.2.9#optional!builtin<compat/fsevents>::version=1.2.9&hash=d11327"
-  dependencies:
-    nan: "npm:^2.12.1"
-    node-pre-gyp: "npm:^0.12.0"
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
 "fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
   version: 2.3.3
   resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
@@ -19347,22 +19221,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gauge@npm:~2.7.3":
-  version: 2.7.4
-  resolution: "gauge@npm:2.7.4"
-  dependencies:
-    aproba: "npm:^1.0.3"
-    console-control-strings: "npm:^1.0.0"
-    has-unicode: "npm:^2.0.0"
-    object-assign: "npm:^4.1.0"
-    signal-exit: "npm:^3.0.0"
-    string-width: "npm:^1.0.1"
-    strip-ansi: "npm:^3.0.1"
-    wide-align: "npm:^1.1.0"
-  checksum: 10/0db20a7def238f0e8eab50226247e1f94f1446ab24700eab0a56e5ccf23ce85ccf8f0c0c462112b89beb964431b1edabd3f7b31f1f6d5f62294c453594523993
-  languageName: node
-  linkType: hard
-
 "generic-names@npm:^2.0.1":
   version: 2.0.1
   resolution: "generic-names@npm:2.0.1"
@@ -20376,13 +20234,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "has-unicode@npm:2.0.1"
-  checksum: 10/041b4293ad6bf391e21c5d85ed03f412506d6623786b801c4ab39e4e6ca54993f13201bceb544d92963f9e0024e6e7fbf0cb1d84c9d6b31cb9c79c8c990d13d8
-  languageName: node
-  linkType: hard
-
 "has-value@npm:^0.3.1":
   version: 0.3.1
   resolution: "has-value@npm:0.3.1"
@@ -20919,7 +20770,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.4":
+"iconv-lite@npm:0.4.24":
   version: 0.4.24
   resolution: "iconv-lite@npm:0.4.24"
   dependencies:
@@ -20976,15 +20827,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore-walk@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "ignore-walk@npm:3.0.1"
-  dependencies:
-    minimatch: "npm:^3.0.4"
-  checksum: 10/93f871229dfd2f240ad8c9eaef2496675cc31a96f6dbd15a35ddebb0f7ae16b7ca2116f1f48ae3f749badc461103b5198ae2e65206a064bba31c32f681d38571
-  languageName: node
-  linkType: hard
-
 "ignore@npm:^5.1.1, ignore@npm:^5.1.8, ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1":
   version: 5.3.1
   resolution: "ignore@npm:5.3.1"
@@ -21332,15 +21174,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-binary-path@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "is-binary-path@npm:1.0.1"
-  dependencies:
-    binary-extensions: "npm:^1.0.0"
-  checksum: 10/a803c99e9d898170c3b44a86fbdc0736d3d7fcbe737345433fb78e810b9fe30c982657782ad0e676644ba4693ddf05601a7423b5611423218663d6b533341ac9
-  languageName: node
-  linkType: hard
-
 "is-binary-path@npm:~2.1.0":
   version: 2.1.0
   resolution: "is-binary-path@npm:2.1.0"
@@ -25201,7 +25034,7 @@ __metadata:
     bowser: "npm:^2.11.0"
     browserify: "npm:^17.0.0"
     chalk: "npm:^4.1.2"
-    chokidar: "npm:^3.5.3"
+    chokidar: "npm:^3.6.0"
     classnames: "npm:^2.2.6"
     concurrently: "npm:^8.2.2"
     contentful: "npm:^10.8.7"
@@ -25755,7 +25588,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4":
+"micromatch@npm:^3.0.4, micromatch@npm:^3.1.4":
   version: 3.1.10
   resolution: "micromatch@npm:3.1.10"
   dependencies:
@@ -26018,16 +25851,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^2.6.0, minipass@npm:^2.9.0":
-  version: 2.9.0
-  resolution: "minipass@npm:2.9.0"
-  dependencies:
-    safe-buffer: "npm:^5.1.2"
-    yallist: "npm:^3.0.0"
-  checksum: 10/fdd1a77996c184991f8d2ce7c5b3979bec624e2a3225e2e1e140c4038fd65873d7eb90fb29779f8733735a8827b2686f283871a0c74c908f4f7694c56fa8dadf
-  languageName: node
-  linkType: hard
-
 "minipass@npm:^3.0.0":
   version: 3.3.5
   resolution: "minipass@npm:3.3.5"
@@ -26051,15 +25874,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minizlib@npm:^1.3.3":
-  version: 1.3.3
-  resolution: "minizlib@npm:1.3.3"
-  dependencies:
-    minipass: "npm:^2.9.0"
-  checksum: 10/9c2c47e5687d7f896431a9b5585988ef72f848b56c6a974c9489534e8f619388d500d986ef82e1c13aedd46f3a0e81b6a88110cb1b27de7524cc8dabe8885e17
-  languageName: node
-  linkType: hard
-
 "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
   version: 2.1.2
   resolution: "minizlib@npm:2.1.2"
@@ -26422,7 +26236,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nan@npm:^2.12.1, nan@npm:^2.13.2":
+"nan@npm:^2.13.2":
   version: 2.15.0
   resolution: "nan@npm:2.15.0"
   dependencies:
@@ -26505,19 +26319,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"needle@npm:^2.2.1":
-  version: 2.4.0
-  resolution: "needle@npm:2.4.0"
-  dependencies:
-    debug: "npm:^3.2.6"
-    iconv-lite: "npm:^0.4.4"
-    sax: "npm:^1.2.4"
-  bin:
-    needle: ./bin/needle
-  checksum: 10/0f2de9406d07f05f89cae241594a2aa66ff0a371ead42c013942c4684f60c830d57066663a740ea6b524e7d031ec2fc8ebd9bf687c51b8936af12c5dc4f7e526
-  languageName: node
-  linkType: hard
-
 "negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
@@ -26723,26 +26524,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-pre-gyp@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "node-pre-gyp@npm:0.12.0"
-  dependencies:
-    detect-libc: "npm:^1.0.2"
-    mkdirp: "npm:^0.5.1"
-    needle: "npm:^2.2.1"
-    nopt: "npm:^4.0.1"
-    npm-packlist: "npm:^1.1.6"
-    npmlog: "npm:^4.0.2"
-    rc: "npm:^1.2.7"
-    rimraf: "npm:^2.6.1"
-    semver: "npm:^5.3.0"
-    tar: "npm:^4"
-  bin:
-    node-pre-gyp: ./bin/node-pre-gyp
-  checksum: 10/15a25f5e4e8f9dad86b1e72ad939311923c18d270b6eec9122c81d61205227dbd6cc7dc9f0bd97101b8e6b5c88c2c154d741b9c8b017e414ae0f480782c597d0
-  languageName: node
-  linkType: hard
-
 "node-preload@npm:^0.2.1":
   version: 0.2.1
   resolution: "node-preload@npm:0.2.1"
@@ -26768,18 +26549,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nopt@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "nopt@npm:4.0.1"
-  dependencies:
-    abbrev: "npm:1"
-    osenv: "npm:^0.1.4"
-  bin:
-    nopt: ./bin/nopt.js
-  checksum: 10/7e9bc2a1224fd41ec604ef8d420a5f855dd6612fa6362615f8e7e8fc44e985fb117c9acfa5cfbfd5efb081c9fb6380a4b1cf579c49d5d1cd98dd425c9c8be78b
-  languageName: node
-  linkType: hard
-
 "nopt@npm:^7.0.0":
   version: 7.2.1
   resolution: "nopt@npm:7.2.1"
@@ -26861,13 +26630,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-bundled@npm:^1.0.1":
-  version: 1.0.6
-  resolution: "npm-bundled@npm:1.0.6"
-  checksum: 10/db96b54c3e27aff51055748a2e900a9808f5687037bb7247a86f9e91cbe2070426414688bf684feda24e2f20e223899fc9f754ac9c882eea9bfa32a482d589b0
-  languageName: node
-  linkType: hard
-
 "npm-install-checks@npm:^6.0.0":
   version: 6.3.0
   resolution: "npm-install-checks@npm:6.3.0"
@@ -26903,16 +26665,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-packlist@npm:^1.1.6":
-  version: 1.4.1
-  resolution: "npm-packlist@npm:1.4.1"
-  dependencies:
-    ignore-walk: "npm:^3.0.1"
-    npm-bundled: "npm:^1.0.1"
-  checksum: 10/a8891f330760517152dd0b9f82fe017028e32d925985cd54672fc80c3294d4438226347b09b7307fa43dfc022d0b87117de073a4a92f5a423297d88f71af23d6
-  languageName: node
-  linkType: hard
-
 "npm-pick-manifest@npm:^9.0.0":
   version: 9.0.1
   resolution: "npm-pick-manifest@npm:9.0.1"
@@ -26943,18 +26695,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npmlog@npm:^4.0.2":
-  version: 4.1.2
-  resolution: "npmlog@npm:4.1.2"
-  dependencies:
-    are-we-there-yet: "npm:~1.1.2"
-    console-control-strings: "npm:~1.1.0"
-    gauge: "npm:~2.7.3"
-    set-blocking: "npm:~2.0.0"
-  checksum: 10/b6b85c9f33da8f600f72564b6ec71136b1641b8b235fca7cc543d1041acb74c2d989d97fe443a0e65754f438d9a974a2fe1b4ff8723c78ef3f9b7a6d74b02079
-  languageName: node
-  linkType: hard
-
 "nth-check@npm:^2.0.1":
   version: 2.0.1
   resolution: "nth-check@npm:2.0.1"
@@ -27350,7 +27090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-homedir@npm:^1.0.0, os-homedir@npm:^1.0.1":
+"os-homedir@npm:^1.0.1":
   version: 1.0.2
   resolution: "os-homedir@npm:1.0.2"
   checksum: 10/af609f5a7ab72de2f6ca9be6d6b91a599777afc122ac5cad47e126c1f67c176fe9b52516b9eeca1ff6ca0ab8587fe66208bc85e40a3940125f03cdb91408e9d2
@@ -27377,23 +27117,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"os-tmpdir@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "os-tmpdir@npm:1.0.2"
-  checksum: 10/5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
-  languageName: node
-  linkType: hard
-
-"osenv@npm:^0.1.4":
-  version: 0.1.5
-  resolution: "osenv@npm:0.1.5"
-  dependencies:
-    os-homedir: "npm:^1.0.0"
-    os-tmpdir: "npm:^1.0.0"
-  checksum: 10/779d261920f2a13e5e18cf02446484f12747d3f2ff82280912f52b213162d43d312647a40c332373cbccd5e3fb8126915d3bfea8dde4827f70f82da76e52d359
-  languageName: node
-  linkType: hard
-
 "otpauth@npm:^8.0.3":
   version: 8.0.3
   resolution: "otpauth@npm:8.0.3"
@@ -29273,7 +28996,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.7, rc@npm:^1.2.8":
+"rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.8":
   version: 1.2.8
   resolution: "rc@npm:1.2.8"
   dependencies:
@@ -29895,7 +29618,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream-2@npm:readable-stream@^2.3.3, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.4, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6":
+"readable-stream-2@npm:readable-stream@^2.3.3, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.4, readable-stream@npm:^2.0.5, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6":
   version: 2.3.7
   resolution: "readable-stream@npm:2.3.7"
   dependencies:
@@ -29955,17 +29678,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readdirp@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "readdirp@npm:2.2.1"
-  dependencies:
-    graceful-fs: "npm:^4.1.11"
-    micromatch: "npm:^3.1.10"
-    readable-stream: "npm:^2.0.2"
-  checksum: 10/14af3408ac2afa4e72e72a27e2c800d80c03e80bdef7ae4bd4b7907e98dddbeaa1ba37d4788959d9ce1131fc262cc823ce41ca9f024a91d80538241eea112c3c
-  languageName: node
-  linkType: hard
-
 "readdirp@npm:^3.5.0, readdirp@npm:~3.6.0":
   version: 3.6.0
   resolution: "readdirp@npm:3.6.0"
@@ -31020,7 +30732,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
+"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
   checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451
@@ -31316,7 +31028,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sax@npm:>=0.6.0, sax@npm:^1.2.4":
+"sax@npm:>=0.6.0":
   version: 1.3.0
   resolution: "sax@npm:1.3.0"
   checksum: 10/bb571b31d30ecb0353c2ff5f87b117a03e5fb9eb4c1519141854c1a8fbee0a77ddbe8045f413259e711833aa03da210887df8527d19cdc55f299822dbf4b34de
@@ -31485,7 +31197,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.6.0":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.6.0":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
   bin:
@@ -31608,7 +31320,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-blocking@npm:^2.0.0, set-blocking@npm:~2.0.0":
+"set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
   checksum: 10/8980ebf7ae9eb945bb036b6e283c547ee783a1ad557a82babf758a065e2fb6ea337fd82cac30dd565c1e606e423f30024a19fff7afbf4977d784720c4026a8ef
@@ -32493,7 +32205,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
@@ -33217,21 +32929,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^4":
-  version: 4.4.19
-  resolution: "tar@npm:4.4.19"
-  dependencies:
-    chownr: "npm:^1.1.4"
-    fs-minipass: "npm:^1.2.7"
-    minipass: "npm:^2.9.0"
-    minizlib: "npm:^1.3.3"
-    mkdirp: "npm:^0.5.5"
-    safe-buffer: "npm:^5.2.1"
-    yallist: "npm:^3.1.1"
-  checksum: 10/2715b5964578424ba5164632905a85e5a98c8dffeba657860aafa3a771b2602e6fd2a350bca891d78b8bda8cab5c53134c683ed2269b9925533477a24722e73b
-  languageName: node
-  linkType: hard
-
 "tar@npm:^6.1.11, tar@npm:^6.1.13, tar@npm:^6.1.2":
   version: 6.2.1
   resolution: "tar@npm:6.2.1"
@@ -34563,13 +34260,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"upath@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "upath@npm:1.2.0"
-  checksum: 10/ac07351d9e913eb7bc9bc0a17ed7d033a52575f0f2959e19726956c3e96f5d4d75aa6a7a777c4c9506e72372f58e06215e581f8dbff35611fc0a7b68ab4a6ddb
-  languageName: node
-  linkType: hard
-
 "update-browserslist-db@npm:^1.0.13":
   version: 1.0.13
   resolution: "update-browserslist-db@npm:1.0.13"
@@ -35655,15 +35345,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.0":
-  version: 1.1.5
-  resolution: "wide-align@npm:1.1.5"
-  dependencies:
-    string-width: "npm:^1.0.2 || 2 || 3 || 4"
-  checksum: 10/d5f8027b9a8255a493a94e4ec1b74a27bff6679d5ffe29316a3215e4712945c84ef73ca4045c7e20ae7d0c72f5f57f296e04a4928e773d4276a2f1222e4c2e99
-  languageName: node
-  linkType: hard
-
 "widest-line@npm:^2.0.0":
   version: 2.0.1
   resolution: "widest-line@npm:2.0.1"
@@ -35962,7 +35643,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^3.0.0, yallist@npm:^3.0.2, yallist@npm:^3.1.1":
+"yallist@npm:^3.0.2":
   version: 3.1.1
   resolution: "yallist@npm:3.1.1"
   checksum: 10/9af0a4329c3c6b779ac4736c69fae4190ac03029fa27c1aef4e6bcc92119b73dea6fe5db5fe881fb0ce2a0e9539a42cdf60c7c21eda04d1a0b8c082e38509efb

From 1e530e363ecc5ded10e004e208a0e8d33f010e96 Mon Sep 17 00:00:00 2001
From: Harika Jetpoluru <153644847+hjetpoluru@users.noreply.github.com>
Date: Thu, 11 Jul 2024 12:26:00 -0400
Subject: [PATCH 104/236] Chore: cherry pick PR for flaky test vault-decrypt
 (#25774)

Cherry PR for flaky test vault-decryption in the release branch v12.0.0

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25443?quickstart=1)

Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
---
 development/build/index.js               | 1 +
 test/e2e/vault-decryption-chrome.spec.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/development/build/index.js b/development/build/index.js
index cc502607b743..f9a778ed8966 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -95,6 +95,7 @@ async function defineAndRunBuildTasks() {
 
     let scuttleGlobalThisExceptions = [
       // globals used by different mm deps outside of lm compartment
+      'Proxy',
       'toString',
       'getComputedStyle',
       'addEventListener',
diff --git a/test/e2e/vault-decryption-chrome.spec.js b/test/e2e/vault-decryption-chrome.spec.js
index 6db89a79dbd0..9b65ecb90c41 100644
--- a/test/e2e/vault-decryption-chrome.spec.js
+++ b/test/e2e/vault-decryption-chrome.spec.js
@@ -84,9 +84,9 @@ async function getSRP(driver) {
 describe('Vault Decryptor Page', function () {
   it('is able to decrypt the vault using the vault-decryptor webapp', async function () {
     await withFixtures({}, async ({ driver }) => {
-      await driver.navigate();
-      // the first app launch opens a new tab, we need to switch the focus
-      // to the first one.
+      // we don't need to use navigate
+      // since MM will automatically open a new window in prod build
+      await driver.waitUntilXWindowHandles(2);
       await driver.switchToWindowWithTitle('MetaMask');
       // create a new vault through onboarding flow
       await completeCreateNewWalletOnboardingFlowWithOptOut(

From 6c0c7e0be4ecf7fc551a5cb872755ec57a5ccf3c Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 12 Jul 2024 10:01:00 -0230
Subject: [PATCH 105/236] Update trigger-beta-build executor to match the
 prep-build executor

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e52e25b4d8e..478afca164e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -369,7 +369,7 @@ workflows:
 
 jobs:
   trigger-beta-build:
-    executor: node-browsers-small
+    executor: node-browsers-medium-plus
     steps:
       - run: *shallow-git-clone
       - run: sudo corepack enable

From fed29bd23f1ef42f0e9349d8bee3fba88d713963 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 12 Jul 2024 14:00:23 -0230
Subject: [PATCH 106/236] Fix metamaskbot-build-announce.js for the beta build

---
 .circleci/config.yml                      |  6 ++++++
 development/metamaskbot-build-announce.js | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 478afca164e5..30d30afd652f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1637,6 +1637,12 @@ jobs:
           command: |
             echo "export PARENT_COMMIT=$(git merge-base origin/HEAD HEAD)" >> $BASH_ENV
             source $BASH_ENV
+      - run:
+          name: Set commit message env var
+          command: |
+            commit_title=$(git show -s --format='%s' HEAD)
+            echo "export SHA1_COMMIT_TITLE=\"$commit_title\"" >> $BASH_ENV
+            source $BASH_ENV
       - run:
           name: build:announce
           command: ./development/metamaskbot-build-announce.js
diff --git a/development/metamaskbot-build-announce.js b/development/metamaskbot-build-announce.js
index f85d64faa887..5d9ef37850a8 100755
--- a/development/metamaskbot-build-announce.js
+++ b/development/metamaskbot-build-announce.js
@@ -38,6 +38,12 @@ function getPercentageChange(from, to) {
   return parseFloat(((to - from) / Math.abs(from)) * 100).toFixed(2);
 }
 
+function getBetaVersion(commitMsg, defaultVersion = VERSION) {
+  const versionPattern = /Version\s(v\d+\.\d+\.\d+-beta\.\d+)/u;
+
+  return commitMsg.match(versionPattern)?.[1] ?? defaultVersion;
+}
+
 async function start() {
   const {
     GITHUB_COMMENT_TOKEN,
@@ -46,6 +52,7 @@ async function start() {
     CIRCLE_BUILD_NUM,
     CIRCLE_WORKFLOW_JOB_ID,
     PARENT_COMMIT,
+    SHA1_COMMIT_TITLE,
   } = process.env;
 
   console.log('CIRCLE_PULL_REQUEST', CIRCLE_PULL_REQUEST);
@@ -75,7 +82,9 @@ async function start() {
       return `<a href="${url}">${platform}</a>`;
     })
     .join(', ');
-  const betaBuildLinks = `<a href="${BUILD_LINK_BASE}/builds-beta/metamask-beta-chrome-${VERSION}.zip">chrome</a>`;
+
+  const betaVersion = getBetaVersion(SHA1_COMMIT_TITLE, VERSION);
+  const betaBuildLinks = `<a href="${BUILD_LINK_BASE}/builds-beta/metamask-beta-chrome-${betaVersion}.zip">chrome</a>`;
   const flaskBuildLinks = platforms
     .map((platform) => {
       const url =

From 42d502fe20088636a64c4da46aa710b87053515f Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 12 Jul 2024 13:28:23 -0230
Subject: [PATCH 107/236] Version v12.0.0-beta.0


From 74a9bb3281533669b69f5b45903af44281cefb95 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Mon, 15 Jul 2024 14:07:00 +0200
Subject: [PATCH 108/236] chore: Patch security issue in snaps-utils (#25823)

## **Description**

This adds a patch for MetaMask/snaps#2576, which fixes a security issue
in the origin validation in Snaps.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25823?quickstart=1)
---
 ...ask-snaps-utils-npm-7.6.0-5569b09766.patch | 30 ++++++++++++++++
 package.json                                  |  8 +++--
 yarn.lock                                     | 35 +++++++++++++++++--
 3 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 .yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch

diff --git a/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch b/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch
new file mode 100644
index 000000000000..82ddce260b99
--- /dev/null
+++ b/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch
@@ -0,0 +1,30 @@
+diff --git a/dist/chunk-37VHIRUJ.js b/dist/chunk-37VHIRUJ.js
+index a909a4ef20305665a07db5c25b4a9ff7eb0a447e..98dd75bf33a9716dc6cca96a38d184645f6ec033 100644
+--- a/dist/chunk-37VHIRUJ.js
++++ b/dist/chunk-37VHIRUJ.js
+@@ -53,8 +53,8 @@ function assertIsKeyringOrigins(value, ErrorWrapper) {
+ }
+ function createOriginRegExp(matcher) {
+   const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+-  const regex = escaped.replace(/\*/gu, ".*");
+-  return RegExp(regex, "u");
++  const regex = escaped.replace(/\\\*/gu, '.*');
++  return RegExp(`${regex}$`, 'u');
+ }
+ function checkAllowedOrigin(matcher, origin) {
+   if (matcher === "*" || matcher === origin) {
+diff --git a/dist/chunk-K2OTEZZZ.mjs b/dist/chunk-K2OTEZZZ.mjs
+index 15be5da7563a5bdf464d7e9c28ed6f04863e378a..7f38bf328e71c1feb2b8850ba050ce9e55801668 100644
+--- a/dist/chunk-K2OTEZZZ.mjs
++++ b/dist/chunk-K2OTEZZZ.mjs
+@@ -53,8 +53,8 @@ function assertIsKeyringOrigins(value, ErrorWrapper) {
+ }
+ function createOriginRegExp(matcher) {
+   const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+-  const regex = escaped.replace(/\*/gu, ".*");
+-  return RegExp(regex, "u");
++  const regex = escaped.replace(/\\\*/gu, '.*');
++  return RegExp(`${regex}$`, 'u');
+ }
+ function checkAllowedOrigin(matcher, origin) {
+   if (matcher === "*" || matcher === origin) {
diff --git a/package.json b/package.json
index cae7ab4bd986..d1fb74c1a894 100644
--- a/package.json
+++ b/package.json
@@ -258,7 +258,11 @@
     "@metamask/network-controller": "patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch",
     "@solana/web3.js/rpc-websockets": "^8.0.1",
     "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
-    "@metamask/gas-fee-controller@npm:^15.1.1": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch"
+    "@metamask/gas-fee-controller@npm:^15.1.1": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch",
+    "@metamask/snaps-utils@npm:^7.6.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
+    "@metamask/snaps-utils@npm:^7.4.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
+    "@metamask/snaps-utils@npm:^7.5.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
+    "@metamask/snaps-utils@npm:^7.1.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
@@ -341,7 +345,7 @@
     "@metamask/snaps-execution-environments": "^6.4.0",
     "@metamask/snaps-rpc-methods": "^9.1.3",
     "@metamask/snaps-sdk": "^5.0.0",
-    "@metamask/snaps-utils": "^7.6.0",
+    "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
     "@metamask/transaction-controller": "^32.0.0",
     "@metamask/user-operation-controller": "^10.0.0",
     "@metamask/utils": "^8.2.1",
diff --git a/yarn.lock b/yarn.lock
index 7029f2473f62..7b03a0506dd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6356,7 +6356,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^7.1.0, @metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.5.0, @metamask/snaps-utils@npm:^7.6.0":
+"@metamask/snaps-utils@npm:7.6.0":
   version: 7.6.0
   resolution: "@metamask/snaps-utils@npm:7.6.0"
   dependencies:
@@ -6387,6 +6387,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch":
+  version: 7.6.0
+  resolution: "@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch::version=7.6.0&hash=5f2735"
+  dependencies:
+    "@babel/core": "npm:^7.23.2"
+    "@babel/types": "npm:^7.23.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/key-tree": "npm:^9.1.1"
+    "@metamask/permission-controller": "npm:^10.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/slip44": "npm:^3.1.0"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-sdk": "npm:^5.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@noble/hashes": "npm:^1.3.1"
+    "@scure/base": "npm:^1.1.1"
+    chalk: "npm:^4.1.2"
+    cron-parser: "npm:^4.5.0"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    fast-xml-parser: "npm:^4.3.4"
+    marked: "npm:^12.0.1"
+    rfdc: "npm:^1.3.0"
+    semver: "npm:^7.5.4"
+    ses: "npm:^1.1.0"
+    superstruct: "npm:^1.0.3"
+    validate-npm-package-name: "npm:^5.0.0"
+  checksum: 10/73cbed809f410375347fa4360475dbb8154a3fa0a6276af33e1094be85f5b804dddf22b2065853d5f91069d173681b8c7e06312f0f7f9831fe5bb22b298419dc
+  languageName: node
+  linkType: hard
+
 "@metamask/swappable-obj-proxy@npm:^2.2.0":
   version: 2.2.0
   resolution: "@metamask/swappable-obj-proxy@npm:2.2.0"
@@ -24943,7 +24974,7 @@ __metadata:
     "@metamask/snaps-execution-environments": "npm:^6.4.0"
     "@metamask/snaps-rpc-methods": "npm:^9.1.3"
     "@metamask/snaps-sdk": "npm:^5.0.0"
-    "@metamask/snaps-utils": "npm:^7.6.0"
+    "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
     "@metamask/transaction-controller": "npm:^32.0.0"

From 1b8a65a5265bd0b92a73884f7a83140025f91683 Mon Sep 17 00:00:00 2001
From: Owen Craston <owengc12@gmail.com>
Date: Mon, 15 Jul 2024 14:09:23 -0700
Subject: [PATCH 109/236] fix: password reset (#25787)
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**
1. What is the reason for the change?
- This fix addresses a user facing bug in production
- When a user locks the wallet and goes through the forget password
flow, the wallet is not accessible with the new password. Instead the
user must use the old password to unlock the wallet.
- This is a bug in the keyring controller because the encryptionKey gets
generated with the old password and is not reset when the user locks the
wallet and generates a new password.
2. What is the improvement/solution?
- This fix patches the keyring controller such that when the user locks
the wallet the encryption key gets cleared
- We also clear the encryption key in the`#createNewVaultWithKeyring` to
ensure a new encryption key is generated with the new password when the
user logs in again and submitPassword is called.
- This patch will be removed once [this
PR](https://github.com/MetaMask/core/pull/4514) ships in the keyring
controller library

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

## **Related issues**

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

## **Manual testing steps**

- Open the extension
- Proceed to Forget password flow
- Paste your secret recovery phrase
- Set a new different password
- Proceed to Restore your Wallet
- After entering the account, lock it and try to login with the new
password
- It will throw an Invalid password error

## **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/22918444/a63ef8fc-5ddf-40c7-b097-d2af29265765

### **After**


https://github.com/MetaMask/metamask-extension/assets/22918444/a963397e-dd69-41c7-9012-566ccdfce7c2


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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**

- [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.
---
 ...ing-controller-npm-15.0.0-fa070ce311.patch | 106 +++++++++++++-----
 package.json                                  |   3 +-
 yarn.lock                                     |  27 +----
 3 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch b/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch
index 27d866a74888..8b57d767369b 100644
--- a/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch
+++ b/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch
@@ -1,5 +1,5 @@
 diff --git a/dist/chunk-52QZQQKP.mjs b/dist/chunk-52QZQQKP.mjs
-index 934f432c8013a6af5303726e1495bed2335fa078..8de2560fe81dfc3dbfef83dd0079482306c425d9 100644
+index 934f432c8013a6af5303726e1495bed2335fa078..6b1c669ea838dd819e3c88357d69f378e18886f1 100644
 --- a/dist/chunk-52QZQQKP.mjs
 +++ b/dist/chunk-52QZQQKP.mjs
 @@ -2,7 +2,8 @@ import {
@@ -17,21 +17,35 @@ index 934f432c8013a6af5303726e1495bed2335fa078..8de2560fe81dfc3dbfef83dd00794823
      );
      serializedKeyrings.push(...__privateGet(this, _unsupportedKeyrings));
 +    /**
-+     * ============================== PATCH INFORMATION ==============================
-+     * The HD keyring is the default keyring for all wallets if this keyring is missing
-+     * for some reason we should avoid saving the keyrings
-+     *
-+     * The upstream fix is here: https://github.com/MetaMask/core/pull/4168
-+     *
-+     * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
-+     */
++    * ============================== PATCH INFORMATION ==============================
++    * The HD keyring is the default keyring for all wallets if this keyring is missing
++    * for some reason we should avoid saving the keyrings
++    *
++    * The upstream fix is here: https://github.com/MetaMask/core/pull/4168
++    *
++    * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
++    */
 +    if (!serializedKeyrings.some((keyring) => keyring.type === KeyringTypes.hd)) {
 +      throw new Error(KeyringControllerError.NoHdKeyring);
 +    }
      let vault;
      let newEncryptionKey;
      if (__privateGet(this, _cacheEncryptionKey)) {
-@@ -1087,9 +1100,16 @@ getKeyringBuilderForType_fn = function(type) {
+@@ -706,9 +719,13 @@ var KeyringController = class extends BaseController {
+   async setLocked() {
+     __privateMethod(this, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn).call(this);
+     __privateSet(this, _password, void 0);
++    // Needed to ensure that the encryption key/salt are always generated with the latest password
++    // TODO: Remove this patch once https://github.com/MetaMask/core/pull/4514 is shipped in the keyring-controller
+     this.update((state) => {
+       state.isUnlocked = false;
+       state.keyrings = [];
++      delete state.encryptionKey;
++      delete state.encryptionSalt;
+     });
+     await __privateMethod(this, _clearKeyrings, clearKeyrings_fn).call(this);
+     this.messagingSystem.publish(`${name}:lock`);
+@@ -1087,9 +1104,16 @@ getKeyringBuilderForType_fn = function(type) {
  };
  _addQRKeyring = new WeakSet();
  addQRKeyring_fn = async function() {
@@ -39,18 +53,31 @@ index 934f432c8013a6af5303726e1495bed2335fa078..8de2560fe81dfc3dbfef83dd00794823
 -    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.
-+   *
-+   * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
-+   */
++  * 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.
++  *
++  * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
++  */
 +  // @ts-expect-error See patch note
 +  const qrKeyring = await __privateMethod(this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device");
    const accounts = await qrKeyring.getAccounts();
    await __privateMethod(this, _checkForDuplicate, checkForDuplicate_fn).call(this, "QR Hardware Wallet Device" /* qr */, accounts);
    __privateGet(this, _keyrings).push(qrKeyring);
+@@ -1120,6 +1144,12 @@ createNewVaultWithKeyring_fn = async function(password, keyring) {
+   if (typeof password !== "string") {
+     throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
+   }
++  // Needed to ensure that the encryption key/salt are always generated with the latest password
++  // TODO: Remove this patch once https://github.com/MetaMask/core/pull/4514 is shipped in the keyring-controller
++  this.update((state) => {
++    delete state.encryptionKey;
++    delete state.encryptionSalt;
++  });
+   __privateSet(this, _password, password);
+   await __privateMethod(this, _clearKeyrings, clearKeyrings_fn).call(this);
+   await __privateMethod(this, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn).call(this, keyring.type, keyring.opts);
 diff --git a/dist/chunk-CHLPTPMZ.js b/dist/chunk-CHLPTPMZ.js
 index bef1a8e9dd5efe426f8aaaba1fe4501b124f7e87..7b48c000e54708da2a689e2d6cb1b61a279f1205 100644
 --- a/dist/chunk-CHLPTPMZ.js
@@ -64,7 +91,7 @@ index bef1a8e9dd5efe426f8aaaba1fe4501b124f7e87..7b48c000e54708da2a689e2d6cb1b61a
  })(KeyringControllerError || {});
  
 diff --git a/dist/chunk-GXM4O6HW.js b/dist/chunk-GXM4O6HW.js
-index f7539e2e6354f418cbb095cc1a2cda01a5bdeae6..978f4426536c594568ecc56f1c27881db4bfa861 100644
+index f7539e2e6354f418cbb095cc1a2cda01a5bdeae6..38318ed5c8940b1d25840077b7287541f33c3cb8 100644
 --- a/dist/chunk-GXM4O6HW.js
 +++ b/dist/chunk-GXM4O6HW.js
 @@ -582,6 +582,18 @@ var KeyringController = class extends _basecontroller.BaseController {
@@ -86,7 +113,21 @@ index f7539e2e6354f418cbb095cc1a2cda01a5bdeae6..978f4426536c594568ecc56f1c27881d
      let vault;
      let newEncryptionKey;
      if (_chunkCHLPTPMZjs.__privateGet.call(void 0, this, _cacheEncryptionKey)) {
-@@ -1087,9 +1099,16 @@ getKeyringBuilderForType_fn = function(type) {
+@@ -706,9 +718,13 @@ var KeyringController = class extends _basecontroller.BaseController {
+   async setLocked() {
+     _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _unsubscribeFromQRKeyringsEvents, unsubscribeFromQRKeyringsEvents_fn).call(this);
+     _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _password, void 0);
++    // Needed to ensure that the encryption key/salt are always generated with the latest password
++    // TODO: Remove this patch once https://github.com/MetaMask/core/pull/4514 is shipped in the keyring-controller
+     this.update((state) => {
+       state.isUnlocked = false;
+       state.keyrings = [];
++      delete state.encryptionKey;
++      delete state.encryptionSalt;
+     });
+     await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
+     this.messagingSystem.publish(`${name}:lock`);
+@@ -1087,9 +1103,16 @@ getKeyringBuilderForType_fn = function(type) {
  };
  _addQRKeyring = new WeakSet();
  addQRKeyring_fn = async function() {
@@ -94,18 +135,31 @@ index f7539e2e6354f418cbb095cc1a2cda01a5bdeae6..978f4426536c594568ecc56f1c27881d
 -    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.
-+   *
-+   * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
-+   */
++  * 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.
++  *
++  * This patch can be found on the core branch `extension-keyring-controller-v13-patch`
++  */
 +  // @ts-expect-error See patch note
 +  const qrKeyring = await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _newKeyring, newKeyring_fn).call(this, "QR Hardware Wallet Device");
    const accounts = await qrKeyring.getAccounts();
    await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _checkForDuplicate, checkForDuplicate_fn).call(this, "QR Hardware Wallet Device" /* qr */, accounts);
    _chunkCHLPTPMZjs.__privateGet.call(void 0, this, _keyrings).push(qrKeyring);
+@@ -1120,6 +1143,12 @@ createNewVaultWithKeyring_fn = async function(password, keyring) {
+   if (typeof password !== "string") {
+     throw new TypeError("KeyringController - Password must be of type string." /* WrongPasswordType */);
+   }
++  // Needed to ensure that the encryption key/salt are always generated with the latest password
++  // TODO: Remove this patch once https://github.com/MetaMask/core/pull/4514 is shipped in the keyring-controller
++  this.update((state) => {
++    delete state.encryptionKey;
++    delete state.encryptionSalt;
++  });
+   _chunkCHLPTPMZjs.__privateSet.call(void 0, this, _password, password);
+   await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _clearKeyrings, clearKeyrings_fn).call(this);
+   await _chunkCHLPTPMZjs.__privateMethod.call(void 0, this, _createKeyringWithFirstAccount, createKeyringWithFirstAccount_fn).call(this, keyring.type, keyring.opts);
 diff --git a/dist/chunk-NAAWD7HX.mjs b/dist/chunk-NAAWD7HX.mjs
 index b5de23aabec9d502e8e6423480ffaaff26257bfc..a0c027a7c13828883ec5c05cbb7eab92c41f0dc3 100644
 --- a/dist/chunk-NAAWD7HX.mjs
diff --git a/package.json b/package.json
index d1fb74c1a894..723f3cef2c38 100644
--- a/package.json
+++ b/package.json
@@ -262,7 +262,8 @@
     "@metamask/snaps-utils@npm:^7.6.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
     "@metamask/snaps-utils@npm:^7.4.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
     "@metamask/snaps-utils@npm:^7.5.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
-    "@metamask/snaps-utils@npm:^7.1.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch"
+    "@metamask/snaps-utils@npm:^7.1.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
+    "@metamask/keyring-controller@npm:^16.0.0": "patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
diff --git a/yarn.lock b/yarn.lock
index 7b03a0506dd8..d3e35606bd6e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5603,30 +5603,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/keyring-controller@npm:^16.0.0":
-  version: 16.0.0
-  resolution: "@metamask/keyring-controller@npm:16.0.0"
-  dependencies:
-    "@ethereumjs/util": "npm:^8.1.0"
-    "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
-    "@metamask/base-controller": "npm:^5.0.2"
-    "@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:^6.0.0"
-    "@metamask/message-manager": "npm:^8.0.2"
-    "@metamask/utils": "npm:^8.3.0"
-    async-mutex: "npm:^0.2.6"
-    ethereumjs-wallet: "npm:^1.0.1"
-    immer: "npm:^9.0.6"
-  checksum: 10/33c10f4c61acfa0f8de7a3d90c2dfc63be1d137866653254e3d5f68dbf4ee886415e2ab620009e5b82c2a112bfab6d09653f5ad16adeccecd87b89f1f1fa0b7c
-  languageName: node
-  linkType: hard
-
 "@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch":
   version: 15.0.0
-  resolution: "@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch::version=15.0.0&hash=3f5b2f"
+  resolution: "@metamask/keyring-controller@patch:@metamask/keyring-controller@npm%3A15.0.0#~/.yarn/patches/@metamask-keyring-controller-npm-15.0.0-fa070ce311.patch::version=15.0.0&hash=ec3cbc"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
@@ -5641,7 +5620,7 @@ __metadata:
     async-mutex: "npm:^0.2.6"
     ethereumjs-wallet: "npm:^1.0.1"
     immer: "npm:^9.0.6"
-  checksum: 10/76116ea6ba8b85e1d3117f4ceebc31d27e591402d77afa9451f661e629b7c3a697d8fdf3b2a7ec536abf3d30d98fe92d2404c5356a2e8656c9886c38589b04f3
+  checksum: 10/6dfcd42d29f8052edce152ab161b4e1e3c177cdace4a85212a0fd3d1ad143a3d93d684c8e38c8cbb17a4dddba25c16eb26d3d3dd494a54446c2cc1a37cedf46f
   languageName: node
   linkType: hard
 
@@ -5681,7 +5660,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/message-manager@npm:^8.0.1, @metamask/message-manager@npm:^8.0.2":
+"@metamask/message-manager@npm:^8.0.1":
   version: 8.0.2
   resolution: "@metamask/message-manager@npm:8.0.2"
   dependencies:

From 50f347cc952d1b8f2a13cf88eea64d465c469273 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Wed, 17 Jul 2024 14:12:51 +0300
Subject: [PATCH 110/236] fix: (cherry-pick)(Version v12.1.0) Error: new
 BigNumber() more than 15 digits feat: apply ellipsis #25741  (#25804)
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**

Cherry-pick https://github.com/MetaMask/metamask-extension/pull/25741
for Version-v12.1.0

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

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2730
(ellipsis)
Fixes: https://github.com/MetaMask/metamask-extension/issues/25751
(Error)

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/modules/transaction.utils.test.js      | 15 +++++++
 shared/modules/transaction.utils.ts           | 39 ++++++++++++++++++-
 ui/components/app/confirm/info/row/text.tsx   | 22 +++++++++--
 .../info/__snapshots__/info.test.tsx.snap     | 10 ++---
 .../__snapshots__/personal-sign.test.tsx.snap |  4 +-
 .../__snapshots__/siwe-sign.test.tsx.snap     | 32 +++++++--------
 .../advanced-details.test.tsx.snap            |  6 +--
 .../__snapshots__/typed-sign-v1.test.tsx.snap |  4 +-
 .../__snapshots__/typed-sign.test.tsx.snap    | 33 ++++++++--------
 .../permit-simulation.test.tsx.snap           |  8 ++--
 .../permit-simulation/permit-simulation.tsx   | 21 +++++++---
 .../row/__snapshots__/dataTree.test.tsx.snap  | 20 +++++-----
 .../components/confirm/row/dataTree.tsx       | 13 +++++--
 .../typedSignDataV1.test.tsx.snap             |  4 +-
 .../__snapshots__/typedSignData.test.tsx.snap |  8 ++--
 .../simulation-details/formatAmount.test.ts   |  9 +++++
 .../__snapshots__/confirm.test.tsx.snap       | 10 ++---
 .../confirmations/confirm/stories/utils.tsx   |  6 ++-
 18 files changed, 178 insertions(+), 86 deletions(-)

diff --git a/shared/modules/transaction.utils.test.js b/shared/modules/transaction.utils.test.js
index ad43a8aa227b..133f2de9141e 100644
--- a/shared/modules/transaction.utils.test.js
+++ b/shared/modules/transaction.utils.test.js
@@ -395,6 +395,21 @@ describe('Transaction.utils', function () {
         const result = parseTypedDataMessage('{"test": "dummy"}');
         expect(result.test).toBe('dummy');
       });
+
+      it('parses message.value as a string', () => {
+        const result = parseTypedDataMessage(
+          '{"test": "dummy", "message": { "value": 3000123} }',
+        );
+        expect(result.message.value).toBe('3000123');
+      });
+
+      it('parses message.value such that it does not lose precision', () => {
+        const result = parseTypedDataMessage(
+          '{"test": "dummy", "message": { "value": 30001231231212312138768} }',
+        );
+        expect(result.message.value).toBe('30001231231212312138768');
+      });
+
       it('throw error for invalid typedDataMessage', () => {
         expect(() => {
           parseTypedDataMessage('');
diff --git a/shared/modules/transaction.utils.ts b/shared/modules/transaction.utils.ts
index edf24d20be18..e09680c6c4bd 100644
--- a/shared/modules/transaction.utils.ts
+++ b/shared/modules/transaction.utils.ts
@@ -282,5 +282,40 @@ export async function determineTransactionAssetType(
   return { assetType: AssetType.native, tokenStandard: TokenStandard.none };
 }
 
-export const parseTypedDataMessage = (dataToParse: string) =>
-  JSON.parse(dataToParse);
+const REGEX_MESSAGE_VALUE_LARGE =
+  /"message"\s*:\s*\{[^}]*"value"\s*:\s*(\d{15,})/u;
+
+function extractLargeMessageValue(dataToParse: string): string | undefined {
+  if (typeof dataToParse !== 'string') {
+    return undefined;
+  }
+  return dataToParse.match(REGEX_MESSAGE_VALUE_LARGE)?.[1];
+}
+
+/**
+ * JSON.parse has a limitation which coerces values to scientific notation if numbers are greator than
+ * Number.MAX_SAFE_INTEGER. This can cause a loss in precision.
+ *
+ * Aside from precision concerns, if the value returned was a large number greator than 15 digits,
+ * e.g. 3.000123123123121e+26, passing the value to BigNumber will throw the error:
+ * Error: new BigNumber() number type has more than 15 significant digits
+ *
+ * Note that using JSON.parse reviver cannot help since the value will be coerced by the time it
+ * reaches the reviver function.
+ *
+ * This function has a workaround to extract the large value from the message and replace
+ * the message value with the string value.
+ *
+ * @param dataToParse
+ * @returns
+ */
+export const parseTypedDataMessage = (dataToParse: string) => {
+  const result = JSON.parse(dataToParse);
+
+  const messageValue = extractLargeMessageValue(dataToParse);
+  if (result.message?.value) {
+    result.message.value = messageValue || String(result.message.value);
+  }
+
+  return result;
+};
diff --git a/ui/components/app/confirm/info/row/text.tsx b/ui/components/app/confirm/info/row/text.tsx
index dacedf310457..a93b053dd80e 100644
--- a/ui/components/app/confirm/info/row/text.tsx
+++ b/ui/components/app/confirm/info/row/text.tsx
@@ -2,6 +2,7 @@ import React, { useContext } from 'react';
 import { I18nContext } from '../../../../../contexts/i18n';
 import {
   AlignItems,
+  BlockSize,
   Display,
   FlexWrap,
   IconColor,
@@ -10,8 +11,18 @@ import {
 import { Box, ButtonIcon, IconName, Text } from '../../../../component-library';
 import Tooltip from '../../../../ui/tooltip';
 
-const InfoText = ({ text }: { text: string }) => (
-  <Text color={TextColor.inherit} style={{ whiteSpace: 'pre-wrap' }}>
+const InfoText = ({
+  isEllipsis,
+  text,
+}: {
+  isEllipsis: boolean;
+  text: string;
+}) => (
+  <Text
+    color={TextColor.inherit}
+    style={isEllipsis ? {} : { whiteSpace: 'pre-wrap' }}
+    ellipsis={isEllipsis}
+  >
     {text}
   </Text>
 );
@@ -20,12 +31,14 @@ export type ConfirmInfoRowTextProps = {
   text: string;
   onEditClick?: () => void;
   editIconClassName?: string;
+  isEllipsis?: boolean;
   tooltip?: string;
 };
 
 export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
   text,
   onEditClick,
+  isEllipsis = false,
   editIconClassName,
   tooltip,
 }) => {
@@ -39,6 +52,7 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
       alignItems={AlignItems.center}
       flexWrap={FlexWrap.Wrap}
       gap={2}
+      minWidth={BlockSize.Zero}
     >
       {tooltip ? (
         <Tooltip
@@ -47,10 +61,10 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
           wrapperStyle={{ minWidth: 0 }}
           interactive
         >
-          <InfoText text={text} />
+          <InfoText isEllipsis={isEllipsis} text={text} />
         </Tooltip>
       ) : (
-        <InfoText text={text} />
+        <InfoText isEllipsis={isEllipsis} text={text} />
       )}
       {isEditable ? (
         <ButtonIcon
diff --git a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
index d9f473782e78..76b15cccf95f 100644
--- a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
@@ -61,7 +61,7 @@ exports[`Info renders info section for personal sign request 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -223,7 +223,7 @@ exports[`Info renders info section for typed sign request 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -270,7 +270,7 @@ exports[`Info renders info section for typed sign request 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -383,7 +383,7 @@ exports[`Info renders info section for typed sign request 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -480,7 +480,7 @@ exports[`Info renders info section for typed sign request 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
index ccac232b402b..50624e107dff 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
@@ -61,7 +61,7 @@ exports[`PersonalSignInfo handle reverse string properly 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -136,7 +136,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
index d6b27a2629ad..2eabd9cc415a 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -40,7 +40,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -64,7 +64,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -159,7 +159,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -183,7 +183,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -207,7 +207,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -255,7 +255,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -284,7 +284,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -308,7 +308,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -332,7 +332,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -427,7 +427,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -451,7 +451,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -475,7 +475,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -523,7 +523,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -547,7 +547,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -557,7 +557,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
       </p>
     </div>
     <div
-      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
     >
       <p
         class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap
index 295aa2510d56..545446a58003 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap
@@ -34,7 +34,7 @@ exports[`<AdvancedDetails /> does not render component for advanced transaction
         </div>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -82,7 +82,7 @@ exports[`<AdvancedDetails /> renders component for advanced transaction details
         </div>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -118,7 +118,7 @@ exports[`<AdvancedDetails /> renders component for advanced transaction details
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
index 028f709f083c..ce62327bcc45 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
@@ -84,7 +84,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -108,7 +108,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index cc4071497ce2..1d52c4c47392 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -222,7 +222,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -395,7 +395,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <div
                   style="min-width: 0;"
@@ -409,8 +409,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
                     tabindex="0"
                   >
                     <p
-                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
-                      style="white-space: pre-wrap;"
+                      class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-inherit"
                     >
                       3,000
                     </p>
@@ -432,7 +431,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -624,7 +623,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -671,7 +670,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -784,7 +783,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -881,7 +880,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1047,7 +1046,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1094,7 +1093,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1207,7 +1206,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1304,7 +1303,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1470,7 +1469,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1501,7 +1500,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1541,7 +1540,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -1830,7 +1829,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                         </p>
                       </div>
                       <div
-                        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
index fd36805daced..bd24f6cfd799 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -34,7 +34,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
         </div>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -59,13 +59,13 @@ exports[`PermitSimulation renders component correctly 1`] = `
       </div>
       <div
         class="mm-box"
-        style="margin-left: auto;"
+        style="margin-left: auto; max-width: 100%;"
       >
         <div
           class="mm-box mm-box--display-flex"
         >
           <div
-            class="mm-box mm-box--margin-inline-end-1 mm-box--display-inline"
+            class="mm-box mm-box--margin-inline-end-1 mm-box--display-inline mm-box--min-width-0"
           >
             <div
               style="min-width: 0;"
@@ -79,7 +79,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
                 tabindex="0"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+                  class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
                 >
                   30
                 </p>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index af7378f56f3a..aeea86dbcdde 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -16,6 +16,7 @@ import { Box, Text } from '../../../../../../../components/component-library';
 import Tooltip from '../../../../../../../components/ui/tooltip';
 import {
   BackgroundColor,
+  BlockSize,
   BorderRadius,
   Display,
   TextAlign,
@@ -52,10 +53,15 @@ const PermitSimulation: React.FC<{
   }, [exchangeRate, value]);
 
   const { tokenValue, tokenValueMaxPrecision } = useMemo(() => {
-    const valueBN = new BigNumber(value / Math.pow(10, tokenDecimals));
+    const valueBN = new BigNumber(value);
+    const diviserBN = new BigNumber(10).pow(tokenDecimals);
+    const resultBn = valueBN.div(diviserBN);
+
+    // FIXME - Precision may be lost for large values when using formatAmount
+    /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
     return {
-      tokenValue: formatAmount('en-US', valueBN),
-      tokenValueMaxPrecision: formatAmountMaxPrecision('en-US', valueBN),
+      tokenValue: formatAmount('en-US', resultBn),
+      tokenValueMaxPrecision: formatAmountMaxPrecision('en-US', resultBn),
     };
   }, [tokenDecimals, value]);
 
@@ -68,9 +74,13 @@ const PermitSimulation: React.FC<{
         <ConfirmInfoRowText text={t('permitSimulationDetailInfo')} />
       </ConfirmInfoRow>
       <ConfirmInfoRow label={t('approve')}>
-        <Box style={{ marginLeft: 'auto' }}>
+        <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
           <Box display={Display.Flex}>
-            <Box display={Display.Inline} marginInlineEnd={1}>
+            <Box
+              display={Display.Inline}
+              marginInlineEnd={1}
+              minWidth={BlockSize.Zero}
+            >
               <Tooltip
                 position="bottom"
                 title={tokenValueMaxPrecision}
@@ -82,6 +92,7 @@ const PermitSimulation: React.FC<{
                   borderRadius={BorderRadius.XL}
                   paddingInline={2}
                   textAlign={TextAlign.Center}
+                  ellipsis
                 >
                   {tokenValue}
                 </Text>
diff --git a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
index 841f032ef091..b8d470123220 100644
--- a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
@@ -19,7 +19,7 @@ exports[`DataTree correctly renders reverse strings 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -43,7 +43,7 @@ exports[`DataTree correctly renders reverse strings 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -76,7 +76,7 @@ exports[`DataTree should match snapshot 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -116,7 +116,7 @@ exports[`DataTree should match snapshot 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -334,7 +334,7 @@ exports[`DataTree should match snapshot 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -593,7 +593,7 @@ exports[`DataTree should match snapshot 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -626,7 +626,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -648,7 +648,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -670,7 +670,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -692,7 +692,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
index f822651fad0f..f7b35a35f352 100644
--- a/ui/pages/confirmations/components/confirm/row/dataTree.tsx
+++ b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
@@ -81,13 +81,18 @@ const DataField = memo(
       );
     }
     if (isPermit && label === 'value') {
-      const valueBN = new BigNumber(
-        parseInt(value, 10) / Math.pow(10, tokenDecimals),
-      );
-      const tokenValue = formatAmount('en-US', valueBN);
+      const valueBN = new BigNumber(value);
+      const diviserBN = new BigNumber(10).pow(tokenDecimals);
+      const resultBn = valueBN.div(diviserBN);
+
+      // FIXME - Precision may be lost for large values when using formatAmount
+      /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
+      const tokenValue = formatAmount('en-US', resultBn);
       const tokenValueMaxPrecision = formatAmountMaxPrecision('en-US', valueBN);
+
       return (
         <ConfirmInfoRowText
+          isEllipsis={true}
           text={tokenValue}
           tooltip={tokenValueMaxPrecision}
         />
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
index 760f38e61738..21d11d1453ec 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -50,7 +50,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
index f3b0cb0326ad..bb120c6caa50 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
@@ -19,7 +19,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
         </p>
       </div>
       <div
-        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
       >
         <p
           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -50,7 +50,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
             </p>
           </div>
           <div
-            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
           >
             <p
               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -90,7 +90,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -379,7 +379,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
index acb0265468a1..f7a627e46e5c 100644
--- a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
@@ -37,6 +37,15 @@ describe('formatAmount', () => {
     [47361034.006, '47,361,034'],
     ['12130982923409.5', '12,130,982,923,410'],
     ['1213098292340944.5', '1,213,098,292,340,945'],
+    // Precision is lost after the value is greator than Number.MAX_SAFE_INTEGER. The digits after
+    // the 15th digit become 0's.
+    // TODO fix the precision
+    /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
+    ['30001231231212312138768', '30,001,231,231,212,312,000,000'],
+    [
+      '115792089237316195423570985008687907853269984665640564039457584007913129639935',
+      '115,792,089,237,316,200,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000',
+    ],
   ])(
     'formats amount greater than or equal to 1 with appropriate decimal precision (%s => %s)',
     (amount: number, expected: string) => {
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index 89ac8f62ae1c..969eb45905ad 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -188,7 +188,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
                 </p>
               </div>
               <div
-                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -497,7 +497,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                     </p>
                   </div>
                   <div
-                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -528,7 +528,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                         </p>
                       </div>
                       <div
-                        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -568,7 +568,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                             </p>
                           </div>
                           <div
-                            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                            class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
@@ -857,7 +857,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                                 </p>
                               </div>
                               <div
-                                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center"
+                                class="mm-box mm-box--display-flex mm-box--gap-2 mm-box--flex-wrap-wrap mm-box--align-items-center mm-box--min-width-0"
                               >
                                 <p
                                   class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
diff --git a/ui/pages/confirmations/confirm/stories/utils.tsx b/ui/pages/confirmations/confirm/stories/utils.tsx
index 1bbff2f6e851..f50750065032 100644
--- a/ui/pages/confirmations/confirm/stories/utils.tsx
+++ b/ui/pages/confirmations/confirm/stories/utils.tsx
@@ -30,7 +30,11 @@ export function ConfirmStoryTemplate(
     confirm: {
       currentConfirmation,
     },
-    metamask: { ...mockState.metamask, ...metamaskState },
+    metamask: {
+      ...mockState.metamask,
+      ...metamaskState,
+      useTransactionSimulations: true,
+    },
   });
 
   return (

From 4e1ccf23f8bbe9a18231798d1b8b74ab936027fb Mon Sep 17 00:00:00 2001
From: Daniel <80175477+dan437@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:10:32 +0200
Subject: [PATCH 111/236] Cherry pick: feat: Replace "Manage in settings" with
 "No thanks" in the STX Opt In modal, only show the modal for non-zero
 balances (#25893)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts:
app/_locales/de/messages.json
app/_locales/el/messages.json
app/_locales/en/messages.json
app/_locales/es/messages.json
app/_locales/fr/messages.json
app/_locales/hi/messages.json
app/_locales/id/messages.json
app/_locales/ja/messages.json
app/_locales/ko/messages.json
app/_locales/pt/messages.json
app/_locales/ru/messages.json
app/_locales/tl/messages.json
app/_locales/tr/messages.json
app/_locales/vi/messages.json
app/_locales/zh_CN/messages.json
test/e2e/playwright/swap/pageObjects/swap-page.ts #
ui/pages/onboarding-flow/metametrics/metametrics.js

## **Description**
Cherry pick of this PR:
https://github.com/MetaMask/metamask-extension/pull/25848

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25893?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/de/messages.json                 |   9 +-
 app/_locales/el/messages.json                 |   9 +-
 app/_locales/en/messages.json                 |   9 +-
 app/_locales/es/messages.json                 |   9 +-
 app/_locales/fr/messages.json                 |   9 +-
 app/_locales/hi/messages.json                 |   9 +-
 app/_locales/id/messages.json                 |   9 +-
 app/_locales/ja/messages.json                 |   9 +-
 app/_locales/ko/messages.json                 |   9 +-
 app/_locales/pt/messages.json                 |   9 +-
 app/_locales/ru/messages.json                 |   9 +-
 app/_locales/tl/messages.json                 |   9 +-
 app/_locales/tr/messages.json                 |   9 +-
 app/_locales/vi/messages.json                 |   9 +-
 app/_locales/zh_CN/messages.json              |   9 +-
 shared/modules/selectors/index.test.ts        | 116 ++++++++++++++++++
 .../modules/selectors/smart-transactions.ts   |  19 ++-
 .../smart-transactions-opt-in-modal.test.tsx  |  17 +--
 .../smart-transactions-opt-in-modal.tsx       |  20 ++-
 .../metametrics/metametrics.js                |   4 +-
 .../metametrics/metametrics.test.js           |   6 +-
 21 files changed, 195 insertions(+), 122 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index e82214fceddf..e151307a3963 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -2609,9 +2609,6 @@
     "message": "Stellen Sie sicher, dass niemand zuschaut.",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "In Einstellungen verwalten"
-  },
   "max": {
     "message": "Max."
   },
@@ -3045,6 +3042,9 @@
   "noSnaps": {
     "message": "Keine Snaps installiert"
   },
+  "noThanks": {
+    "message": "Nein, danke!"
+  },
   "noTransactions": {
     "message": "Keine Transaktionen"
   },
@@ -3332,9 +3332,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask möchte Nutzungsdaten sammeln, um ein besseres Verständnis zu erhalten, wie unsere Nutzer mit MetaMask interagieren. Diese Daten werden verwendet, um Dienste anzubieten, was auf Ihrer Nutzung basierte Dienstverbesserungen einschließt."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Nein, danke!"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Wir werden Sie informieren, wenn wir beschließen, diese Daten für andere Zwecke zu verwenden. Für weitere Informationen können Sie unsere $1 einsehen. Vergessen Sie nicht, dass Sie jederzeit zu Einstellungen gehen und sich abmelden können.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 24d47016f8bb..dfb5e5aa874c 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -2609,9 +2609,6 @@
     "message": "Βεβαιωθείτε ότι κανείς δεν κοιτάει",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Διαχείριση των ρυθμίσεων"
-  },
   "max": {
     "message": "Μέγ."
   },
@@ -3045,6 +3042,9 @@
   "noSnaps": {
     "message": "Δεν έχετε εγκαταστήσει κανένα snap."
   },
+  "noThanks": {
+    "message": "Όχι, ευχαριστώ"
+  },
   "noTransactions": {
     "message": "Δεν έχετε καμιά συναλλαγή"
   },
@@ -3332,9 +3332,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "Το MetaMask θα ήθελε να συλλέγει δεδομένα χρήσης για να κατανοήσει καλύτερα τον τρόπο με τον οποίο οι χρήστες μας αλληλεπιδρούν με το MetaMask. Τα δεδομένα αυτά θα χρησιμοποιηθούν για την παροχή της υπηρεσίας, η οποία περιλαμβάνει τη βελτίωση της υπηρεσίας με βάση τη χρήση σας."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Όχι, ευχαριστώ"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Θα σας ενημερώσουμε εάν αποφασίσουμε να χρησιμοποιήσουμε αυτά τα δεδομένα για άλλους σκοπούς. Για περισσότερες πληροφορίες, μπορείτε να ανατρέξετε στην $1. Να θυμάστε ότι μπορείτε να μεταβείτε στις ρυθμίσεις και να εξαιρεθείτε ανά πάσα στιγμή.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 6b4803069133..dc333a29c566 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2652,9 +2652,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"
   },
@@ -3091,6 +3088,9 @@
   "noSnaps": {
     "message": "You don't have any snaps installed."
   },
+  "noThanks": {
+    "message": "No thanks"
+  },
   "noTransactions": {
     "message": "You have no transactions"
   },
@@ -3412,9 +3412,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask would like to gather usage data to better understand how our users interact with MetaMask. This data will be used to provide the service, which includes improving the service based on your use."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "No thanks"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "We’ll let you know if we decide to use this data for other purposes. You can review our $1 for more information. Remember, you can go to settings and opt out at any time.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 2be97677557d..b667a9069343 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -2606,9 +2606,6 @@
     "message": "Asegúrese de que nadie esté mirando",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Administrar en configuración"
-  },
   "max": {
     "message": "Máx."
   },
@@ -3042,6 +3039,9 @@
   "noSnaps": {
     "message": "No tiene ningún snap instalado."
   },
+  "noThanks": {
+    "message": "No, gracias"
+  },
   "noTransactions": {
     "message": "No tiene transacciones"
   },
@@ -3329,9 +3329,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask quisiera recopilar datos de uso para comprender mejor cómo nuestros usuarios interactúan con MetaMask. Estos datos se utilizarán para proporcionar el servicio, lo que incluye mejorarlo en función de su uso."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "No, gracias"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Le informaremos si decidimos usar estos datos para otros fines. Puede consultar $1 para obtener más información. Recuerde que puede acceder a la configuración y excluirse en cualquier momento.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 3534270713d3..16af2bc5bd5b 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -2609,9 +2609,6 @@
     "message": "Assurez-vous que personne ne regarde votre écran",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Gérer dans les paramètres"
-  },
   "max": {
     "message": "Max."
   },
@@ -3045,6 +3042,9 @@
   "noSnaps": {
     "message": "Aucun Snap installé"
   },
+  "noThanks": {
+    "message": "Non merci"
+  },
   "noTransactions": {
     "message": "Aucune transaction"
   },
@@ -3332,9 +3332,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask souhaite recueillir des données d’utilisation afin de mieux comprendre comment les utilisateurs interagissent avec MetaMask. Ces données seront utilisées pour améliorer les services que nous proposons ainsi que l’expérience utilisateur."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Non merci"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Nous vous informerons si nous décidons d’utiliser ces données à d’autres fins. Pour plus d’informations, vous pouvez consulter notre $1. N’oubliez pas que vous pouvez aller dans les paramètres et vous désinscrire à tout moment.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 6c2b08cac53b..7c24a1bf4d50 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -2606,9 +2606,6 @@
     "message": "पक्का करें कि इसे कोई भी नहीं देख रहा है",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "सेटिंग्स में मैनेज करें"
-  },
   "max": {
     "message": "अधिकतम"
   },
@@ -3042,6 +3039,9 @@
   "noSnaps": {
     "message": "आपके पास इंस्टाल किए गए Snap नहीं हैं।"
   },
+  "noThanks": {
+    "message": "जी नहीं, धन्यवाद"
+  },
   "noTransactions": {
     "message": "आपके पास कोई ट्रांसेक्शन नहीं है"
   },
@@ -3329,9 +3329,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask यह समझने के लिए इस्तेमाल डेटा एकत्र करना चाहता है कि हमारे यूज़र MetaMask से कैसे इंटरैक्ट करते हैं। इस डेटा का इस्तेमाल सर्विस प्रदान करने के लिए किया जाएगा, जिसमें आपके इस्तेमाल के आधार पर सर्विस में सुधार करना शामिल है।"
   },
-  "onboardingMetametricsDisagree": {
-    "message": "जी नहीं, धन्यवाद"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "यदि हम इस डेटा का उपयोग अन्य उद्देश्यों के लिए करने का निर्णय लेते हैं तो हम आपको बताएंगे। अधिक जानकारी के लिए आप हमारे $1 की समीक्षा कर सकते हैं। याद रखें, आप किसी भी समय सेटिंग्स में जाकर ऑप्ट आउट कर सकते हैं।",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 6436b7e13c7b..e5ddd9293ca6 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -2609,9 +2609,6 @@
     "message": "Pastikan tidak ada yang melihat layar Anda",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Kelola di pengaturan"
-  },
   "max": {
     "message": "Maks"
   },
@@ -3045,6 +3042,9 @@
   "noSnaps": {
     "message": "Belum ada snap yang diinstal."
   },
+  "noThanks": {
+    "message": "Tidak, terima kasih"
+  },
   "noTransactions": {
     "message": "Anda tidak memiliki transaksi"
   },
@@ -3332,9 +3332,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask ingin mengumpulkan data penggunaan untuk lebih memahami cara pengguna kami berinteraksi dengan MetaMask. Data ini akan digunakan untuk menyediakan layanan, termasuk meningkatkan layanan berdasarkan penggunaan Anda."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Tidak, terima kasih"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Kami akan memberitahukan keputusan untuk menggunakan data ini dengan tujuan lain. Anda dapat meninjau $1 kami untuk informasi selengkapnya. Ingat, Anda dapat membuka pengaturan dan memilih keluar setiap saat.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index cf498721afe2..c19fd5bbcd9b 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -2606,9 +2606,6 @@
     "message": "誰にも見られていないことを確認してください",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "設定で管理"
-  },
   "max": {
     "message": "最大"
   },
@@ -3042,6 +3039,9 @@
   "noSnaps": {
     "message": "snapがインストールされていません"
   },
+  "noThanks": {
+    "message": "結構です"
+  },
   "noTransactions": {
     "message": "トランザクションがありません"
   },
@@ -3329,9 +3329,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMaskは、ユーザーによるMetaMaskの使用状況をより詳細に把握するため、使用データを収集したいと考えています。このデータは、使用状況に基づくサービスの改善を含め、サービスの提供を目的に使用されます。"
   },
-  "onboardingMetametricsDisagree": {
-    "message": "結構です"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "このデータを他の目的に使用する際は、お知らせします。詳細は当社の$1をご覧ください。設定でいつでもオプトアウトできます。",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index fc4d896cf0e8..65f6590df9b0 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -2606,9 +2606,6 @@
     "message": "다른 사람이 이 화면을 보고 있지는 않은지 확인하세요.",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "설정에서 관리"
-  },
   "max": {
     "message": "최대"
   },
@@ -3042,6 +3039,9 @@
   "noSnaps": {
     "message": "설치된 스냅이 없습니다"
   },
+  "noThanks": {
+    "message": "괜찮습니다"
+  },
   "noTransactions": {
     "message": "트랜잭션이 없습니다."
   },
@@ -3329,9 +3329,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask는 사용자가 MetaMask를 어떻게 사용하는지 이해하기 위해 기본적인 사용 데이터를 수집하고자 합니다. 이 데이터는 사용자 경험을 통한 서비스 개선에 사용됩니다."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "괜찮습니다"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "이 데이터를 다른 목적으로 사용하기로 결정하면 알려드리겠습니다. 자세한 내용은 $1을(를) 참고하세요. 언제든지 설정으로 이동하여 해제할 수 있습니다.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index b973dd5d67cf..7449d4b334b3 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -2609,9 +2609,6 @@
     "message": "Certifique-se de que ninguém está olhando",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Gerenciar em configurações"
-  },
   "max": {
     "message": "Máximo"
   },
@@ -3045,6 +3042,9 @@
   "noSnaps": {
     "message": "Você não tem nenhum snap instalado."
   },
+  "noThanks": {
+    "message": "Não, obrigado"
+  },
   "noTransactions": {
     "message": "Você não tem transações"
   },
@@ -3332,9 +3332,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "A MetaMask gostaria de reunir dados de uso para entender melhor como nossos usuários interagem com a MetaMask. Esses dados serão usados para prestar o serviço, o que inclui melhorá-lo com base em seu uso."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Não, obrigado"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Informaremos a você se decidirmos usar esses dados para outras finalidades. Você pode analisar nossa $1 para obter mais informações. Lembre-se: você pode acessar as configurações e revogar a permissão a qualquer momento.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 871a49679471..5619ca7df213 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -2609,9 +2609,6 @@
     "message": "Убедитесь, что никто не смотрит",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Управляйте в настройках"
-  },
   "max": {
     "message": "Макс."
   },
@@ -3045,6 +3042,9 @@
   "noSnaps": {
     "message": "Snaps не установлены."
   },
+  "noThanks": {
+    "message": "Нет, спасибо"
+  },
   "noTransactions": {
     "message": "У вас нет транзакций"
   },
@@ -3332,9 +3332,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask хотел бы собрать данные об использовании, чтобы лучше понять, как наши пользователи взаимодействуют с MetaMask. Эти данные будут использоваться для предоставления обслуживания, в том числе его улучшения услуги на основе вашего использования."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Нет, спасибо"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Мы сообщим вам, если решим использовать эти данные для других целей. Вы можете ознакомиться с нашей $1 для получения дополнительной информации. Помните, что вы можете перейти в настройки и отказаться в любой момент.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 2b3de4abe1d0..10684bc3778f 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -2606,9 +2606,6 @@
     "message": "Siguraduhing walang tumitingin",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Pamahalaan sa mga setting"
-  },
   "max": {
     "message": "Max"
   },
@@ -3042,6 +3039,9 @@
   "noSnaps": {
     "message": "Wala kang naka-install na snaps."
   },
+  "noThanks": {
+    "message": "Salamat nalang"
+  },
   "noTransactions": {
     "message": "Wala kang transaksyon"
   },
@@ -3329,9 +3329,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "Nais ng MetaMask na mangalap ng datos ng paggamit upang mas maunawaan kung paano nakikipag-ugnayan ang aming mga user sa MetaMask. Gagamitin ang datos na ito upang ibigay ang serbisyo, na kinabibilangan ng pagpapabuti ng serbisyo batay sa iyong paggamit."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Salamat nalang"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Ipapaalam namin sa iyo kung magdesisyon kaming gamitin ang data na ito para sa ibang layunin. Maaari mong suriin ang aming $1 para sa karagdagang impormasyon. Tandaan, maaari kang magpunta sa mga setting at mag-opt out anumang oras.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 9d59ca5d1475..d12b33d099df 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -2609,9 +2609,6 @@
     "message": "Hiç kimsenin bakmadığından emin olun",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Ayarlar kısmında yönet"
-  },
   "max": {
     "message": "Maksimum"
   },
@@ -3045,6 +3042,9 @@
   "noSnaps": {
     "message": "Yüklü snapiniz yok."
   },
+  "noThanks": {
+    "message": "Hayır, istemiyorum"
+  },
   "noTransactions": {
     "message": "İşleminiz yok"
   },
@@ -3332,9 +3332,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask kullanıcılarımızn MetaMask ile nasıl etkileşimde bulunduklarını daha iyi anlamak amacıyla kullanım verilerini toplamak ister. Bu veriler, hizmeti kullanımınıza göre geliştirmek de dahil olmak üzere hizmeti sunmak için kullanılacaktır."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Hayır, istemiyorum"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Bu verileri başka amaçlar için kullanmaya karar vermemiz durumunda sizi bilgilendireceğiz. Daha fazla bilgi için $1 bölümümüzü inceleyebilirsiniz. Unutmayın, dilediğiniz zaman ayarlar kısmına giderek vazgeçebilirsiniz.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 76f44543f897..4b9830f59232 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -2606,9 +2606,6 @@
     "message": "Đảm bảo không có ai đang nhìn",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "Quản lý trong phần cài đặt"
-  },
   "max": {
     "message": "Tối đa"
   },
@@ -3042,6 +3039,9 @@
   "noSnaps": {
     "message": "Bạn chưa cài đặt bất kỳ Snap nào."
   },
+  "noThanks": {
+    "message": "Không, cảm ơn"
+  },
   "noTransactions": {
     "message": "Bạn không có giao dịch nào"
   },
@@ -3329,9 +3329,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask muốn thu thập dữ liệu sử dụng để hiểu rõ hơn cách người dùng tương tác với MetaMask. Dữ liệu này sẽ được sử dụng để cung cấp dịch vụ, bao gồm cả cải thiện dịch vụ dựa trên quá trình sử dụng của bạn."
   },
-  "onboardingMetametricsDisagree": {
-    "message": "Không, cảm ơn"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "Chúng tôi sẽ thông báo cho bạn nếu chúng tôi quyết định sử dụng dữ liệu này cho các mục đích khác. Bạn có thể xem lại $1 của chúng tôi để biết thêm thông tin. Lưu ý, bạn có thể truy cập cài đặt và chọn không tham gia bất kỳ lúc nào.",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 8caa76780939..f899865bdf37 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -2606,9 +2606,6 @@
     "message": "请确保没有人在看您的屏幕",
     "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
   },
-  "manageInSettings": {
-    "message": "在设置中管理"
-  },
   "max": {
     "message": "最大"
   },
@@ -3042,6 +3039,9 @@
   "noSnaps": {
     "message": "您没有安装 snap。"
   },
+  "noThanks": {
+    "message": "不，谢谢"
+  },
   "noTransactions": {
     "message": "您没有任何交易"
   },
@@ -3329,9 +3329,6 @@
   "onboardingMetametricsDescriptionLegacy": {
     "message": "MetaMask 希望收集使用数据，以更好地了解我们的用户如何与 MetaMask 交互。这些数据将用于提供服务，包括根据您的使用情况改进服务。"
   },
-  "onboardingMetametricsDisagree": {
-    "message": "不，谢谢"
-  },
   "onboardingMetametricsInfuraTerms": {
     "message": "如果我们决定将这些数据用于其他目的，我们会通知您。您可以查看我们的 $1 以了解更多信息。请记住，您可以随时转到设置并选择退出。",
     "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
diff --git a/shared/modules/selectors/index.test.ts b/shared/modules/selectors/index.test.ts
index 6f1298952d76..4bdacaacd93f 100644
--- a/shared/modules/selectors/index.test.ts
+++ b/shared/modules/selectors/index.test.ts
@@ -5,6 +5,7 @@ import {
   getCurrentChainSupportsSmartTransactions,
   getSmartTransactionsEnabled,
   getIsSmartTransaction,
+  getIsSmartTransactionsOptInModalAvailable,
 } from '.';
 
 describe('Selectors', () => {
@@ -24,9 +25,17 @@ describe('Selectors', () => {
                   type: 'Hardware',
                 },
               },
+              address: '0x123',
+              type: 'eip155:eoa',
             },
           },
         },
+        accounts: {
+          '0x123': {
+            address: '0x123',
+            balance: '0x15f6f0b9d4f8d000',
+          },
+        },
         providerConfig: {
           chainId: CHAIN_IDS.MAINNET,
         },
@@ -250,4 +259,111 @@ describe('Selectors', () => {
       expect(result).toBe(false);
     });
   });
+
+  describe('getIsSmartTransactionsOptInModalAvailable', () => {
+    it('returns true for Ethereum Mainnet + supported RPC URL + null opt-in status and non-zero balance', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          preferences: {
+            ...state.metamask.preferences,
+            smartTransactionsOptInStatus: null,
+          },
+        },
+      };
+      expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(true);
+    });
+
+    it('returns false for Polygon Mainnet + supported RPC URL + null opt-in status and non-zero balance', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          preferences: {
+            ...state.metamask.preferences,
+            smartTransactionsOptInStatus: null,
+          },
+          providerConfig: {
+            ...state.metamask.providerConfig,
+            chainId: CHAIN_IDS.POLYGON,
+          },
+        },
+      };
+      expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
+    });
+
+    it('returns false for Ethereum Mainnet + unsupported RPC URL + null opt-in status and non-zero balance', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          preferences: {
+            ...state.metamask.preferences,
+            smartTransactionsOptInStatus: null,
+          },
+          networkConfigurations: {
+            'network-configuration-id-1': {
+              chainId: CHAIN_IDS.MAINNET,
+              ticker: CURRENCY_SYMBOLS.ETH,
+              rpcUrl: 'https://mainnet.quiknode.pro/',
+            },
+          },
+        },
+      };
+      expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
+    });
+
+    it('returns false for Ethereum Mainnet + supported RPC URL + true opt-in status and non-zero balance', () => {
+      const state = createMockState();
+      expect(getIsSmartTransactionsOptInModalAvailable(state)).toBe(false);
+    });
+
+    it('returns false for Ethereum Mainnet + supported RPC URL + null opt-in status and zero balance (0x0)', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          preferences: {
+            ...state.metamask.preferences,
+            smartTransactionsOptInStatus: null,
+          },
+          accounts: {
+            ...state.metamask.accounts,
+            '0x123': {
+              address: '0x123',
+              balance: '0x0',
+            },
+          },
+        },
+      };
+      expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
+    });
+
+    it('returns false for Ethereum Mainnet + supported RPC URL + null opt-in status and zero balance (0x00)', () => {
+      const state = createMockState();
+      const newState = {
+        ...state,
+        metamask: {
+          ...state.metamask,
+          preferences: {
+            ...state.metamask.preferences,
+            smartTransactionsOptInStatus: null,
+          },
+          accounts: {
+            ...state.metamask.accounts,
+            '0x123': {
+              address: '0x123',
+              balance: '0x00',
+            },
+          },
+        },
+      };
+      expect(getIsSmartTransactionsOptInModalAvailable(newState)).toBe(false);
+    });
+  });
 });
diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts
index 24994f1ec203..b29897ecf075 100644
--- a/shared/modules/selectors/smart-transactions.ts
+++ b/shared/modules/selectors/smart-transactions.ts
@@ -7,9 +7,12 @@ import {
   getCurrentChainId,
   getCurrentNetwork,
   accountSupportsSmartTx,
+  getSelectedAccount,
 } from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file.
 import { isProduction } from '../environment';
 
+import { MultichainState } from '../../../ui/selectors/multichain';
+
 type SmartTransactionsMetaMaskState = {
   metamask: {
     preferences: {
@@ -89,13 +92,27 @@ const getIsAllowedRpcUrlForSmartTransactions = (
   return rpcUrl?.hostname?.endsWith('.infura.io');
 };
 
+/**
+ * Checks if the selected account has a non-zero balance.
+ *
+ * @param state - The state object containing account information.
+ * @returns true if the selected account has a non-zero balance, otherwise false.
+ */
+const hasNonZeroBalance = (state: SmartTransactionsMetaMaskState) => {
+  const selectedAccount = getSelectedAccount(
+    state as unknown as MultichainState,
+  );
+  return BigInt(selectedAccount?.balance || '0x0') > 0n;
+};
+
 export const getIsSmartTransactionsOptInModalAvailable = (
   state: SmartTransactionsMetaMaskState,
 ) => {
   return (
     getCurrentChainSupportsSmartTransactions(state) &&
     getIsAllowedRpcUrlForSmartTransactions(state) &&
-    getSmartTransactionsOptInStatus(state) === null
+    getSmartTransactionsOptInStatus(state) === null &&
+    hasNonZeroBalance(state)
   );
 };
 
diff --git a/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.test.tsx b/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.test.tsx
index 3224d85f52a9..193e0cc6aa6c 100644
--- a/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.test.tsx
+++ b/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.test.tsx
@@ -2,14 +2,12 @@ import React from 'react';
 import { fireEvent } from '@testing-library/react';
 import thunk from 'redux-thunk';
 import configureMockStore from 'redux-mock-store';
-import { useHistory } from 'react-router-dom';
 
 import {
   renderWithProvider,
   createSwapsMockStore,
 } from '../../../../test/jest';
 import { setSmartTransactionsOptInStatus } from '../../../store/actions';
-import { ADVANCED_ROUTE } from '../../../helpers/constants/routes';
 import SmartTransactionsOptInModal from './smart-transactions-opt-in-modal';
 
 const middleware = [thunk];
@@ -27,18 +25,14 @@ describe('SmartTransactionsOptInModal', () => {
       store,
     );
     expect(getByText('Enable')).toBeInTheDocument();
-    expect(getByText('Manage in settings')).toBeInTheDocument();
+    expect(getByText('No thanks')).toBeInTheDocument();
     expect(container).toMatchSnapshot();
   });
 
-  it('calls setSmartTransactionsOptInStatus with false when the "Manage in settings" link is clicked and redirects to Advanced Settings', () => {
+  it('calls setSmartTransactionsOptInStatus with false when the "No thanks" link is clicked', () => {
     (setSmartTransactionsOptInStatus as jest.Mock).mockImplementationOnce(() =>
       jest.fn(),
     );
-    const historyPushMock = jest.fn();
-    (useHistory as jest.Mock).mockImplementationOnce(() => ({
-      push: historyPushMock,
-    }));
     const store = configureMockStore(middleware)(createSwapsMockStore());
     const { getByText } = renderWithProvider(
       <SmartTransactionsOptInModal
@@ -47,12 +41,9 @@ describe('SmartTransactionsOptInModal', () => {
       />,
       store,
     );
-    const manageInSettingsLink = getByText('Manage in settings');
-    fireEvent.click(manageInSettingsLink);
+    const noThanksLink = getByText('No thanks');
+    fireEvent.click(noThanksLink);
     expect(setSmartTransactionsOptInStatus).toHaveBeenCalledWith(false);
-    expect(historyPushMock).toHaveBeenCalledWith(
-      `${ADVANCED_ROUTE}#smart-transactions`,
-    );
   });
 
   it('calls setSmartTransactionsOptInStatus with true when the "Enable" button is clicked', () => {
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
index 982c3d463a71..5b8ff09f9237 100644
--- a/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx
+++ b/ui/components/app/smart-transactions/smart-transactions-opt-in-modal.tsx
@@ -1,5 +1,4 @@
 import React, { useCallback, useEffect } from 'react';
-import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
 import { useI18nContext } from '../../../hooks/useI18nContext';
@@ -31,7 +30,6 @@ import {
 } from '../../component-library';
 import { setSmartTransactionsOptInStatus } from '../../../store/actions';
 import { SMART_TRANSACTIONS_LEARN_MORE_URL } from '../../../../shared/constants/smartTransactions';
-import { ADVANCED_ROUTE } from '../../../helpers/constants/routes';
 
 export type SmartTransactionsOptInModalProps = {
   isOpen: boolean;
@@ -75,10 +73,10 @@ const EnableSmartTransactionsButton = ({
   );
 };
 
-const ManageInSettingsLink = ({
-  handleManageInSettingsLinkClick,
+const NoThanksLink = ({
+  handleNoThanksLinkClick,
 }: {
-  handleManageInSettingsLinkClick: () => void;
+  handleNoThanksLinkClick: () => void;
 }) => {
   const t = useI18nContext();
   return (
@@ -87,11 +85,11 @@ const ManageInSettingsLink = ({
       type="link"
       variant={ButtonVariant.Link}
       color={TextColor.textAlternative}
-      onClick={handleManageInSettingsLinkClick}
+      onClick={handleNoThanksLinkClick}
       width={BlockSize.Full}
       className="mm-smart-transactions-opt-in-modal__no-thanks-link"
     >
-      {t('manageInSettings')}
+      {t('noThanks')}
     </Button>
   );
 };
@@ -166,16 +164,14 @@ export default function SmartTransactionsOptInModal({
 }: SmartTransactionsOptInModalProps) {
   const t = useI18nContext();
   const dispatch = useDispatch();
-  const history = useHistory();
 
   const handleEnableButtonClick = useCallback(() => {
     dispatch(setSmartTransactionsOptInStatus(true));
   }, [dispatch]);
 
-  const handleManageInSettingsLinkClick = useCallback(() => {
+  const handleNoThanksLinkClick = useCallback(() => {
     // Set the Smart Transactions opt-in status to false, so the opt-in modal is not shown again.
     dispatch(setSmartTransactionsOptInStatus(false));
-    history.push(`${ADVANCED_ROUTE}#smart-transactions`);
   }, [dispatch]);
 
   useEffect(() => {
@@ -215,9 +211,7 @@ export default function SmartTransactionsOptInModal({
           <EnableSmartTransactionsButton
             handleEnableButtonClick={handleEnableButtonClick}
           />
-          <ManageInSettingsLink
-            handleManageInSettingsLinkClick={handleManageInSettingsLinkClick}
-          />
+          <NoThanksLink handleNoThanksLinkClick={handleNoThanksLinkClick} />
         </Box>
       </ModalContent>
     </Modal>
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index f874c99ca5e0..012af2030015 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -258,7 +258,7 @@ export default function OnboardingMetametrics() {
             large
             onClick={onCancel}
           >
-            {t('onboardingMetametricsDisagree')}
+            {t('noThanks')}
           </Button>
         </div>
       </div>
@@ -392,7 +392,7 @@ export default function OnboardingMetametrics() {
             large
             onClick={onCancel}
           >
-            {t('onboardingMetametricsDisagree')}
+            {t('noThanks')}
           </Button>
         </div>
       </div>
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.test.js b/ui/pages/onboarding-flow/metametrics/metametrics.test.js
index 487987a0f5f5..392055d7f220 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.test.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.test.js
@@ -6,7 +6,7 @@ import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import { ONBOARDING_CREATE_PASSWORD_ROUTE } from '../../../helpers/constants/routes';
 import {
   onboardingMetametricsAgree,
-  onboardingMetametricsDisagree,
+  noThanks,
 } from '../../../../app/_locales/en/messages.json';
 import {
   setParticipateInMetaMetrics,
@@ -102,7 +102,7 @@ describe('Onboarding Metametrics Component', () => {
       mockStore,
     );
 
-    const confirmCancel = queryByText(onboardingMetametricsDisagree.message);
+    const confirmCancel = queryByText(noThanks.message);
 
     fireEvent.click(confirmCancel);
 
@@ -120,7 +120,7 @@ describe('Onboarding Metametrics Component', () => {
       mockStore,
     );
 
-    const confirmCancel = queryByText(onboardingMetametricsDisagree.message);
+    const confirmCancel = queryByText(noThanks.message);
 
     fireEvent.click(confirmCancel);
 

From 365f84b9a1e98d3bdd6e9df49fc7e2132e15a896 Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:44:53 -0400
Subject: [PATCH 112/236] fix (cherry-pick for v12.0.0): reduce spacing in
 asset picker (#25868)
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**

Cherry picks #25576
<!--
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/25868?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../asset-picker/__snapshots__/asset-picker.test.tsx.snap     | 4 ++--
 .../asset-picker-amount/asset-picker/asset-picker.tsx         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
index 9eedf3168b8b..2662eb196a76 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`AssetPicker matches snapshot 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-badge-wrapper mm-box--margin-right-3 mm-box--display-inline-block"
+          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
         >
           <div
             class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
@@ -80,7 +80,7 @@ exports[`AssetPicker render if disabled 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-badge-wrapper mm-box--margin-right-3 mm-box--display-inline-block"
+          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
         >
           <div
             class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index abf9c56eda8c..5cf53d522d98 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -179,7 +179,6 @@ export function AssetPicker({
                 }
               />
             }
-            marginRight={3}
           >
             <AvatarToken
               borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}

From 2a380b77fa34f6d804ae161b05bfa2c5e675850e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Thu, 18 Jul 2024 11:59:35 +0100
Subject: [PATCH 113/236] fix: disables "swap and send" for MMI (#25886)
 (#25904)
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.
-->
No major conflicts.

Cherry picks:
[c12237fd66d112fb3124f491ced4a39736427760](https://github.com/MetaMask/metamask-extension/commit/c12237fd66d112fb3124f491ced4a39736427760)
Original PR: https://github.com/MetaMask/metamask-extension/pull/25886

————————————————————————

Fixes:

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

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

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

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

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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.


<!--
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/25904?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../tests/swap-send/swap-send-erc20.spec.ts   |  2 +-
 .../e2e/tests/swap-send/swap-send-eth.spec.ts |  2 +-
 .../asset-picker/asset-picker.tsx             | 16 +++++++++++-
 .../send/components/recipient-content.tsx     | 26 ++++++++++++++++---
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/test/e2e/tests/swap-send/swap-send-erc20.spec.ts b/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
index 10b18592f42b..b12068052773 100644
--- a/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
+++ b/test/e2e/tests/swap-send/swap-send-erc20.spec.ts
@@ -14,7 +14,7 @@ import { SWAP_SEND_QUOTES_RESPONSE_TST_ETH } from './mocks/erc20-data';
 
 const RECIPIENT_ADDRESS = '0xc427D562164062a23a5cFf596A4a3208e72Acd28';
 
-describe('Swap-Send ERC20', function () {
+describe('Swap-Send ERC20 @no-mmi', function () {
   describe('to non-contract address with data that matches swap data signature', function (this: Suite) {
     it('submits a transaction successfully', async function () {
       await withFixtures(
diff --git a/test/e2e/tests/swap-send/swap-send-eth.spec.ts b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
index 244693d513a2..8a33bdd0ef8e 100644
--- a/test/e2e/tests/swap-send/swap-send-eth.spec.ts
+++ b/test/e2e/tests/swap-send/swap-send-eth.spec.ts
@@ -13,7 +13,7 @@ import {
 
 const RECIPIENT_ADDRESS = '0xc427D562164062a23a5cFf596A4a3208e72Acd28';
 
-describe('Swap-Send ETH', function () {
+describe('Swap-Send ETH @no-mmi', function () {
   describe('to non-contract address with data that matches swap data signature', function (this: Suite) {
     it('submits a transaction successfully', async function () {
       await withFixtures(
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 5cf53d522d98..85115498a1a7 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -36,7 +36,9 @@ import {
 import Tooltip from '../../../ui/tooltip';
 import { LARGE_SYMBOL_LENGTH } from '../constants';
 import { getAssetImageURL } from '../../../../helpers/utils/util';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
 import { useI18nContext } from '../../../../hooks/useI18nContext';
+///: END:ONLY_INCLUDE_IF
 import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
@@ -66,7 +68,9 @@ export function AssetPicker({
   sendingAsset,
   isDisabled = false,
 }: AssetPickerProps) {
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const t = useI18nContext();
+  ///: END:ONLY_INCLUDE_IF
   const trackEvent = useContext(MetaMetricsContext);
   const sendAnalytics = useSelector(getSendAnalyticProperties);
 
@@ -119,6 +123,16 @@ export function AssetPicker({
   const currentNetwork = useSelector(getCurrentNetwork);
   const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
 
+  const handleAssetPickerTitle = (): string | undefined => {
+    ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+    if (isDisabled) {
+      return t('swapTokenNotAvailable');
+    }
+    ///: END:ONLY_INCLUDE_IF
+
+    return undefined;
+  };
+
   return (
     <>
       {/* This is the Modal that ask to choose token to send */}
@@ -162,7 +176,7 @@ export function AssetPicker({
           marginInlineStart: 0,
           display: isDisabled ? Display.None : Display.InlineBlock,
         }}
-        title={isDisabled ? t('swapTokenNotAvailable') : undefined}
+        title={handleAssetPickerTitle()}
       >
         <Box display={Display.Flex} alignItems={AlignItems.center} gap={3}>
           <BadgeWrapper
diff --git a/ui/components/multichain/pages/send/components/recipient-content.tsx b/ui/components/multichain/pages/send/components/recipient-content.tsx
index 097214d7cd25..7babefec6de4 100644
--- a/ui/components/multichain/pages/send/components/recipient-content.tsx
+++ b/ui/components/multichain/pages/send/components/recipient-content.tsx
@@ -1,4 +1,10 @@
-import React, { useCallback, useMemo, useRef } from 'react';
+import React, {
+  useCallback,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  useMemo,
+  ///: END:ONLY_INCLUDE_IF
+  useRef,
+} from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
   BannerAlert,
@@ -11,9 +17,11 @@ import {
   acknowledgeRecipientWarning,
   getBestQuote,
   getCurrentDraftTransaction,
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   getIsSwapAndSendDisabledForNetwork,
-  getSendAsset,
   getSwapsBlockedTokens,
+  ///: END:ONLY_INCLUDE_IF
+  getSendAsset,
 } from '../../../../../ducks/send';
 import { AssetType } from '../../../../../../shared/constants/transaction';
 import { CONTRACT_ADDRESS_LINK } from '../../../../../helpers/constants/common';
@@ -21,10 +29,13 @@ import { Display } from '../../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { AssetPickerAmount } from '../../..';
 import { decimalToHex } from '../../../../../../shared/modules/conversion.utils';
+///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
 import {
   getIsSwapsChain,
   getUseExternalServices,
 } from '../../../../../selectors';
+///: END:ONLY_INCLUDE_IF
+
 import type { Quote } from '../../../../../ducks/send/swap-and-send-utils';
 import { isEqualCaseInsensitive } from '../../../../../../shared/modules/string-utils';
 import { SendHexData, SendPageRow, QuoteCard } from '.';
@@ -45,6 +56,13 @@ export const SendPageRecipientContent = ({
     isSwapQuoteLoading,
   } = useSelector(getCurrentDraftTransaction);
 
+  let isSwapAllowed;
+
+  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+  isSwapAllowed = false;
+  ///: END:ONLY_INCLUDE_IF
+
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
   const isBasicFunctionality = useSelector(getUseExternalServices);
   const isSwapsChain = useSelector(getIsSwapsChain);
   const isSwapAndSendDisabledForNetwork = useSelector(
@@ -54,12 +72,14 @@ export const SendPageRecipientContent = ({
   const memoizedSwapsBlockedTokens = useMemo(() => {
     return new Set(swapsBlockedTokens);
   }, [swapsBlockedTokens]);
-  const isSwapAllowed =
+
+  isSwapAllowed =
     isSwapsChain &&
     !isSwapAndSendDisabledForNetwork &&
     [AssetType.token, AssetType.native].includes(sendAsset.type) &&
     isBasicFunctionality &&
     !memoizedSwapsBlockedTokens.has(sendAsset.details?.address?.toLowerCase());
+  ///: END:ONLY_INCLUDE_IF
 
   const bestQuote: Quote = useSelector(getBestQuote);
 

From a87217d6047ebc5664a011fd2d299cebea4476ad Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:22:23 +0300
Subject: [PATCH 114/236] feat: (cherry-pick)(Version v12.1.0) update Permit
 Signature Redesign "Spending cap" copy (#25618) (#25898)
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.
-->
Cherry-picks https://github.com/MetaMask/metamask-extension/pull/25618
into `Version-v12.1.0`

Updates Permit signature redesign copy "Approve spend limit" → "Spending
cap"

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25618?quickstart=1)

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

1. Go to test dapp
2. Click on Malicious Permit within the ppom section

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

<img width="320"

src="https://github.com/MetaMask/metamask-extension/assets/20778143/c63c615e-4ae3-4cc2-a74d-fe00c9416ece">

<img width="320"

src="https://github.com/MetaMask/metamask-extension/assets/20778143/00fc3099-25f9-46ff-bc85-f93b8e36ae86">

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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.


<!--
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/25898?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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__/permit-simulation.test.tsx.snap               | 2 +-
 .../info/typed-sign/permit-simulation/permit-simulation.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
index bd24f6cfd799..a671b24d02a7 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -54,7 +54,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
         >
-          Approve spend limit
+          Spending cap
         </p>
       </div>
       <div
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index aeea86dbcdde..97b212d08256 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -73,7 +73,7 @@ const PermitSimulation: React.FC<{
       >
         <ConfirmInfoRowText text={t('permitSimulationDetailInfo')} />
       </ConfirmInfoRow>
-      <ConfirmInfoRow label={t('approve')}>
+      <ConfirmInfoRow label={t('spendingCap')}>
         <Box style={{ marginLeft: 'auto', maxWidth: '100%' }}>
           <Box display={Display.Flex}>
             <Box

From 787665059ed8b14ad8fd665fa3aa8d9a265da5c7 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 19 Jul 2024 03:09:27 -0500
Subject: [PATCH 115/236] fix: v12: Fix layout of add contact page (#25943)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes: https://github.com/MetaMask/metamask-extension/issues/25890

## **Description**

Borrowed this fix from
https://github.com/MetaMask/metamask-extension/pull/23697

I'm not cherry-picking that entire PR because it's much too large and
wide in scope.

Fixes the layout of the the Add Contact page in the popup

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

## **Related issues**

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

## **Manual testing steps**

1. Open MetaMask Popup
2. Go to Settings -> Contacts -> Add Contact
3. See well-formed layout

## **Screenshots/Recordings**

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

### **Before**

<img width="360" alt="SCR-20240718-irii"
src="https://github.com/user-attachments/assets/6e11879c-de7b-46a8-a0d4-97e1c1ff7148">


### **After**

<img width="359" alt="SCR-20240718-irfh"
src="https://github.com/user-attachments/assets/5f5c2788-f9de-4e5a-a2de-f0c133c0464b">


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/settings/contact-list-tab/index.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/pages/settings/contact-list-tab/index.scss b/ui/pages/settings/contact-list-tab/index.scss
index e563c3255db4..191032620d43 100644
--- a/ui/pages/settings/contact-list-tab/index.scss
+++ b/ui/pages/settings/contact-list-tab/index.scss
@@ -179,9 +179,10 @@
 
   &__add-contact {
     display: flex;
-    flex-flow: column nowrap;
+    flex-flow: column nowrap !important;
     padding-bottom: 0 !important;
     height: 100%;
+    width: 100%;
     padding-top: 0;
 
     &__content {

From ebcd5a2dfe15f29b86110c9a98f99e059c36a993 Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Fri, 19 Jul 2024 16:13:50 +0100
Subject: [PATCH 116/236] fix (cherry-pick for v12.0.0): notification slowness
 and crashes (#25979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This is a cherry pick for
https://github.com/MetaMask/metamask-extension/pull/25946
(https://github.com/MetaMask/metamask-extension/commit/003ee98e7b3ed3ed9e3ff54093f4a5f807ea27fb)

------

This is a series of fixes added to core libraries. Adding to extension,
and soon we will migrate extension to use shared libraries.

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

## **Related issues**

https://github.com/MetaMask/core/pull/4530
https://github.com/MetaMask/core/pull/4531
https://github.com/MetaMask/core/pull/4532
https://github.com/MetaMask/core/pull/4533
https://github.com/MetaMask/core/pull/4536

https://github.com/MetaMask/metamask-extension/issues/25749

## **Manual testing steps**

1. Create multiple accounts
2. Go to notification settings page
3. Wait for settings to load, and try toggling notifications

Before: some settings would error or not load
After: you should be able to toggle accounts and not see errors.

## **Screenshots/Recordings**

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

### **Before**

[<!-- [screenshots/recordings]
-->](https://github.com/MetaMask/metamask-extension/issues/25749)

### **After**


https://www.loom.com/share/49b582e8c33b4199bdafc994a3f6087f?sid=9f94a885-351b-4fee-84d8-f72c97506e7d

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.test.ts         |   6 +-
 .../authentication-controller.ts              |  39 ++++---
 .../metamask-notifications.ts                 |  36 ++++---
 .../services/feature-announcements.ts         |  19 ++--
 .../metamask-notifications/utils/utils.ts     |   2 +-
 .../user-storage/user-storage-controller.ts   |  16 ++-
 .../useSwitchNotifications.ts                 |  77 +++++++++++++-
 .../notifications-settings-per-account.tsx    | 100 ++++++++++--------
 .../notifications-settings.tsx                |  55 +++++-----
 9 files changed, 233 insertions(+), 117 deletions(-)

diff --git a/app/scripts/controllers/authentication/authentication-controller.test.ts b/app/scripts/controllers/authentication/authentication-controller.test.ts
index 1a86cee38c82..b9b272c51a62 100644
--- a/app/scripts/controllers/authentication/authentication-controller.test.ts
+++ b/app/scripts/controllers/authentication/authentication-controller.test.ts
@@ -280,11 +280,7 @@ function createMockAuthenticationMessenger() {
       );
     }
 
-    function exhaustedMessengerMocks(action: never) {
-      throw new Error(`MOCK_FAIL - unsupported messenger call: ${action}`);
-    }
-
-    return exhaustedMessengerMocks(actionType);
+    throw new Error(`MOCK_FAIL - unsupported messenger call: ${actionType}`);
   });
 
   return { messenger, mockSnapGetPublicKey, mockSnapSignMessage };
diff --git a/app/scripts/controllers/authentication/authentication-controller.ts b/app/scripts/controllers/authentication/authentication-controller.ts
index 24da63bd58bf..d3586e05419b 100644
--- a/app/scripts/controllers/authentication/authentication-controller.ts
+++ b/app/scripts/controllers/authentication/authentication-controller.ts
@@ -4,7 +4,6 @@ import {
   StateMetadata,
 } from '@metamask/base-controller';
 import { HandleSnapRequest } from '@metamask/snaps-controllers';
-import { UserStorageControllerDisableProfileSyncing } from '../user-storage/user-storage-controller';
 import {
   createSnapPublicKeyRequest,
   createSnapSignMessageRequest,
@@ -84,9 +83,7 @@ export type AuthenticationControllerGetSessionProfile =
 export type AuthenticationControllerIsSignedIn = ActionsObj['isSignedIn'];
 
 // Allowed Actions
-export type AllowedActions =
-  | HandleSnapRequest
-  | UserStorageControllerDisableProfileSyncing;
+export type AllowedActions = HandleSnapRequest;
 
 // Messenger
 export type AuthenticationControllerMessenger = RestrictedControllerMessenger<
@@ -271,8 +268,6 @@ export default class AuthenticationController extends BaseController<
       };
     } catch (e) {
       console.error('Failed to authenticate', e);
-      // Disable Profile Syncing
-      this.messagingSystem.call('UserStorageController:disableProfileSyncing');
       const errorMessage =
         e instanceof Error ? e.message : JSON.stringify(e ?? '');
       throw new Error(
@@ -299,28 +294,48 @@ export default class AuthenticationController extends BaseController<
     return THIRTY_MIN_MS > diffMs;
   }
 
+  #_snapPublicKeyCache: string | undefined;
+
   /**
    * Returns the auth snap public key.
    *
    * @returns The snap public key.
    */
-  #snapGetPublicKey(): Promise<string> {
-    return this.messagingSystem.call(
+  async #snapGetPublicKey(): Promise<string> {
+    if (this.#_snapPublicKeyCache) {
+      return this.#_snapPublicKeyCache;
+    }
+
+    const result = (await this.messagingSystem.call(
       'SnapController:handleRequest',
       createSnapPublicKeyRequest(),
-    ) as Promise<string>;
+    )) as string;
+
+    this.#_snapPublicKeyCache = result;
+
+    return result;
   }
 
+  #_snapSignMessageCache: Record<`metamask:${string}`, string> = {};
+
   /**
    * Signs a specific message using an underlying auth snap.
    *
    * @param message - A specific tagged message to sign.
    * @returns A Signature created by the snap.
    */
-  #snapSignMessage(message: `metamask:${string}`): Promise<string> {
-    return this.messagingSystem.call(
+  async #snapSignMessage(message: `metamask:${string}`): Promise<string> {
+    if (this.#_snapSignMessageCache[message]) {
+      return this.#_snapSignMessageCache[message];
+    }
+
+    const result = (await this.messagingSystem.call(
       'SnapController:handleRequest',
       createSnapSignMessageRequest(message),
-    ) as Promise<string>;
+    )) as string;
+
+    this.#_snapSignMessageCache[message] = result;
+
+    return result;
   }
 }
diff --git a/app/scripts/controllers/metamask-notifications/metamask-notifications.ts b/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
index f9929a049b54..4af08474769c 100644
--- a/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
+++ b/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
@@ -266,22 +266,34 @@ export class MetamaskNotificationsController extends BaseController<
 
   #pushNotifications = {
     enablePushNotifications: async (UUIDs: string[]) => {
-      return await this.messagingSystem.call(
-        'PushPlatformNotificationsController:enablePushNotifications',
-        UUIDs,
-      );
+      try {
+        await this.messagingSystem.call(
+          'PushPlatformNotificationsController:enablePushNotifications',
+          UUIDs,
+        );
+      } catch (e) {
+        log.error('Silently failed to enable push notifications', e);
+      }
     },
     disablePushNotifications: async (UUIDs: string[]) => {
-      return await this.messagingSystem.call(
-        'PushPlatformNotificationsController:disablePushNotifications',
-        UUIDs,
-      );
+      try {
+        await this.messagingSystem.call(
+          'PushPlatformNotificationsController:disablePushNotifications',
+          UUIDs,
+        );
+      } catch (e) {
+        log.error('Silently failed to disable push notifications', e);
+      }
     },
     updatePushNotifications: async (UUIDs: string[]) => {
-      return await this.messagingSystem.call(
-        'PushPlatformNotificationsController:updateTriggerPushNotifications',
-        UUIDs,
-      );
+      try {
+        await this.messagingSystem.call(
+          'PushPlatformNotificationsController:updateTriggerPushNotifications',
+          UUIDs,
+        );
+      } catch (e) {
+        log.error('Silently failed to update push notifications', e);
+      }
     },
     subscribe: () => {
       this.messagingSystem.subscribe(
diff --git a/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts b/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
index 0fb911497cd7..8b3c3870627e 100644
--- a/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
+++ b/app/scripts/controllers/metamask-notifications/services/feature-announcements.ts
@@ -26,7 +26,7 @@ export type ContentfulResult = {
 
 async function fetchFromContentful(
   url: string,
-  retries = 3,
+  retries = 1,
   retryDelay = 1000,
 ): Promise<ContentfulResult | null> {
   let lastError: Error | null = null;
@@ -113,10 +113,17 @@ async function fetchFeatureAnnouncementNotifications(): Promise<
 export async function getFeatureAnnouncementNotifications(): Promise<
   Notification[]
 > {
-  const rawNotifications = await fetchFeatureAnnouncementNotifications();
-  const notifications = rawNotifications.map((notification) =>
-    processFeatureAnnouncement(notification),
-  );
+  if (
+    process.env.CONTENTFUL_ACCESS_SPACE_ID &&
+    process.env.CONTENTFUL_ACCESS_TOKEN
+  ) {
+    const rawNotifications = await fetchFeatureAnnouncementNotifications();
+    const notifications = rawNotifications.map((notification) =>
+      processFeatureAnnouncement(notification),
+    );
+
+    return notifications;
+  }
 
-  return notifications;
+  return [];
 }
diff --git a/app/scripts/controllers/metamask-notifications/utils/utils.ts b/app/scripts/controllers/metamask-notifications/utils/utils.ts
index f71f9e568dcd..547a38b217d5 100644
--- a/app/scripts/controllers/metamask-notifications/utils/utils.ts
+++ b/app/scripts/controllers/metamask-notifications/utils/utils.ts
@@ -603,7 +603,7 @@ export async function makeApiCall<T>(
   endpoint: string,
   method: 'POST' | 'DELETE',
   body: T,
-  retries = 3,
+  retries = 1,
   retryDelay = 1000,
 ): Promise<Response> {
   const options: RequestInit = {
diff --git a/app/scripts/controllers/user-storage/user-storage-controller.ts b/app/scripts/controllers/user-storage/user-storage-controller.ts
index bcbc81618da8..bc5c0b77c2bb 100644
--- a/app/scripts/controllers/user-storage/user-storage-controller.ts
+++ b/app/scripts/controllers/user-storage/user-storage-controller.ts
@@ -365,17 +365,27 @@ export default class UserStorageController extends BaseController<
     return storageKey;
   }
 
+  #_snapSignMessageCache: Record<`metamask:${string}`, string> = {};
+
   /**
    * Signs a specific message using an underlying auth snap.
    *
    * @param message - A specific tagged message to sign.
    * @returns A Signature created by the snap.
    */
-  #snapSignMessage(message: `metamask:${string}`): Promise<string> {
-    return this.messagingSystem.call(
+  async #snapSignMessage(message: `metamask:${string}`): Promise<string> {
+    if (this.#_snapSignMessageCache[message]) {
+      return this.#_snapSignMessageCache[message];
+    }
+
+    const result = (await this.messagingSystem.call(
       'SnapController:handleRequest',
       createSnapSignMessageRequest(message),
-    ) as Promise<string>;
+    )) as string;
+
+    this.#_snapSignMessageCache[message] = result;
+
+    return result;
   }
 
   async #setIsProfileSyncingUpdateLoading(
diff --git a/ui/hooks/metamask-notifications/useSwitchNotifications.ts b/ui/hooks/metamask-notifications/useSwitchNotifications.ts
index 0d60b16714a2..53e121473bac 100644
--- a/ui/hooks/metamask-notifications/useSwitchNotifications.ts
+++ b/ui/hooks/metamask-notifications/useSwitchNotifications.ts
@@ -1,5 +1,5 @@
-import { useState, useCallback } from 'react';
-import { useDispatch } from 'react-redux';
+import { useState, useCallback, useMemo, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import log from 'loglevel';
 import {
   setFeatureAnnouncementsEnabled,
@@ -8,6 +8,7 @@ import {
   updateOnChainTriggersByAccount,
   hideLoadingIndication,
 } from '../../store/actions';
+import { getIsUpdatingMetamaskNotificationsAccount } from '../../selectors/metamask-notifications/metamask-notifications';
 
 export function useSwitchFeatureAnnouncementsChange(): {
   onChange: (state: boolean) => Promise<void>;
@@ -114,3 +115,75 @@ export function useSwitchAccountNotificationsChange(): {
     error,
   };
 }
+
+function useRefetchAccountSettings() {
+  const dispatch = useDispatch();
+
+  const getAccountSettings = useCallback(async (accounts: string[]) => {
+    try {
+      const result = (await dispatch(
+        checkAccountsPresence(accounts),
+      )) as unknown as UseSwitchAccountNotificationsData;
+
+      return result;
+    } catch {
+      return {};
+    }
+  }, []);
+
+  return getAccountSettings;
+}
+
+/**
+ * Account Settings Hook.
+ * Gets initial loading states, and returns enable/disable account states.
+ * Also exposes an update() method so each switch can be manually updated.
+ *
+ * @param accounts - the accounts we are checking to see if notifications are enabled/disabled
+ * @returns props for settings page
+ */
+export function useAccountSettingsProps(accounts: string[]) {
+  const accountsBeingUpdated = useSelector(
+    getIsUpdatingMetamaskNotificationsAccount,
+  );
+  const fetchAccountSettings = useRefetchAccountSettings();
+  const [data, setData] = useState<UseSwitchAccountNotificationsData>({});
+  const [loading, setLoading] = useState<boolean>(false);
+  const [error, setError] = useState<string | null>(null);
+
+  // Memoize the accounts array to avoid unnecessary re-fetching
+  const jsonAccounts = useMemo(() => JSON.stringify(accounts), [accounts]);
+
+  const update = useCallback(async (addresses: string[]) => {
+    try {
+      setLoading(true);
+      setError(null);
+      const res = await fetchAccountSettings(addresses);
+      setData(res);
+    } catch {
+      setError('Failed to get account settings');
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  // Effect - async get if accounts are enabled/disabled
+  useEffect(() => {
+    try {
+      const memoAccounts: string[] = JSON.parse(jsonAccounts);
+      update(memoAccounts);
+    } catch {
+      setError('Failed to get account settings');
+    } finally {
+      setLoading(false);
+    }
+  }, [jsonAccounts, fetchAccountSettings]);
+
+  return {
+    data,
+    initialLoading: loading,
+    error,
+    accountsBeingUpdated,
+    update,
+  };
+}
diff --git a/ui/pages/notifications-settings/notifications-settings-per-account.tsx b/ui/pages/notifications-settings/notifications-settings-per-account.tsx
index a591a4f81ea9..6ebfcdad5f0f 100644
--- a/ui/pages/notifications-settings/notifications-settings-per-account.tsx
+++ b/ui/pages/notifications-settings/notifications-settings-per-account.tsx
@@ -1,89 +1,95 @@
-import React, { useEffect, useState, useCallback, useContext } from 'react';
+import React, { useState, useCallback, useContext } from 'react';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../shared/constants/metametrics';
-import { useMetamaskNotificationsContext } from '../../contexts/metamask-notifications/metamask-notifications';
-import {
-  useSwitchAccountNotifications,
-  useSwitchAccountNotificationsChange,
-  type UseSwitchAccountNotificationsData,
-} from '../../hooks/metamask-notifications/useSwitchNotifications';
+import { useSwitchAccountNotificationsChange } from '../../hooks/metamask-notifications/useSwitchNotifications';
 import {
   NotificationsSettingsBox,
   NotificationsSettingsAccount,
 } from '../../components/multichain';
+import { useListNotifications } from '../../hooks/metamask-notifications/useNotifications';
 
 type NotificationsSettingsPerAccountProps = {
   address: string;
   name: string;
-  disabled: boolean;
-  loading: boolean;
+
+  isEnabled: boolean;
+  isLoading?: boolean;
+  disabledSwitch?: boolean;
+  refetchAccountSettings: () => Promise<void>;
 };
 
+function useUpdateAccountSetting(
+  address: string,
+  refetchAccountSettings: () => Promise<void>,
+) {
+  const { onChange: switchAccountNotifications, error } =
+    useSwitchAccountNotificationsChange();
+  const { listNotifications: refetch } = useListNotifications();
+
+  // Local states
+  const [loading, setLoading] = useState(false);
+
+  const toggleAccount = useCallback(
+    async (state: boolean) => {
+      setLoading(true);
+      try {
+        await switchAccountNotifications([address], state);
+        await refetchAccountSettings();
+        refetch();
+      } catch {
+        // Do nothing (we don't need to propagate this)
+      }
+      setLoading(false);
+    },
+    [address, refetch, refetchAccountSettings, switchAccountNotifications],
+  );
+
+  return { toggleAccount, loading, error };
+}
+
 export const NotificationsSettingsPerAccount = ({
   address,
   name,
-  disabled,
-  loading,
+  isEnabled,
+  isLoading,
+  disabledSwitch,
+  refetchAccountSettings,
 }: NotificationsSettingsPerAccountProps) => {
-  const { listNotifications } = useMetamaskNotificationsContext();
   const trackEvent = useContext(MetaMetricsContext);
 
-  // Hooks
   const {
-    onChange: onChangeAccountNotifications,
-    error: errorAccountNotificationsChange,
-  } = useSwitchAccountNotificationsChange();
-  const { switchAccountNotifications, error: errorSwitchAccountNotifications } =
-    useSwitchAccountNotifications();
-
-  const [data, setData] = useState<
-    UseSwitchAccountNotificationsData | undefined
-  >(undefined);
-  const [isLoading, setIsLoading] = useState<boolean>(false);
-
-  useEffect(() => {
-    const fetchData = async () => {
-      const fetchedData = await switchAccountNotifications([address]);
-      setData(fetchedData || {});
-    };
-    fetchData();
-  }, [address, switchAccountNotifications]);
-
-  useEffect(() => {
-    setIsLoading(loading);
-  }, [loading]);
+    toggleAccount,
+    loading: isUpdatingAccount,
+    error: accountError,
+  } = useUpdateAccountSetting(address, refetchAccountSettings);
 
-  const error =
-    errorAccountNotificationsChange || errorSwitchAccountNotifications;
+  const loading = isLoading || isUpdatingAccount;
+  const error = accountError;
 
   const handleToggleAccountNotifications = useCallback(async () => {
-    const originalValue = data?.[address];
-    await onChangeAccountNotifications([address], !originalValue);
     trackEvent({
       category: MetaMetricsEventCategory.NotificationSettings,
-      event: originalValue
+      event: isEnabled
         ? MetaMetricsEventName.DisablingAccountNotifications
         : MetaMetricsEventName.EnablingAccountNotifications,
       properties: {
         address,
       },
     });
-    const fetchedData = await switchAccountNotifications([address]);
-    setData(fetchedData || {});
-    listNotifications();
-  }, [address, data, onChangeAccountNotifications]);
+    await toggleAccount(!isEnabled);
+  }, [address, isEnabled, toggleAccount, trackEvent]);
 
   return (
     <>
       <NotificationsSettingsBox
-        value={data?.[address] ?? false}
+        value={isEnabled ?? false}
         onToggle={handleToggleAccountNotifications}
         key={address}
-        disabled={disabled}
-        loading={isLoading || !data}
+        disabled={disabledSwitch}
+        loading={loading}
         error={error}
       >
         <NotificationsSettingsAccount address={address} name={name} />
diff --git a/ui/pages/notifications-settings/notifications-settings.tsx b/ui/pages/notifications-settings/notifications-settings.tsx
index c4e71e97f273..7261daeed02f 100644
--- a/ui/pages/notifications-settings/notifications-settings.tsx
+++ b/ui/pages/notifications-settings/notifications-settings.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import type { InternalAccount } from '@metamask/keyring-api';
@@ -26,9 +26,9 @@ import { Content, Header } from '../../components/multichain/pages/page';
 import {
   selectIsMetamaskNotificationsEnabled,
   getIsUpdatingMetamaskNotifications,
-  getIsUpdatingMetamaskNotificationsAccount,
 } from '../../selectors/metamask-notifications/metamask-notifications';
 import { getInternalAccounts } from '../../selectors';
+import { useAccountSettingsProps } from '../../hooks/metamask-notifications/useSwitchNotifications';
 import { NotificationsSettingsAllowNotifications } from './notifications-settings-allow-notifications';
 import { NotificationsSettingsTypes } from './notifications-settings-types';
 import { NotificationsSettingsPerAccount } from './notifications-settings-per-account';
@@ -56,36 +56,23 @@ export default function NotificationsSettings() {
   const isUpdatingMetamaskNotifications = useSelector(
     getIsUpdatingMetamaskNotifications,
   );
-  const isUpdatingMetamaskNotificationsAccount = useSelector(
-    getIsUpdatingMetamaskNotificationsAccount,
-  );
   const accounts: AccountType[] = useSelector(getInternalAccounts);
 
   // States
   const [loadingAllowNotifications, setLoadingAllowNotifications] =
     useState<boolean>(isUpdatingMetamaskNotifications);
-  const [updatingAccountList, setUpdatingAccountList] = useState<string[]>([]);
-  const [updatingAccount, setUpdatingAccount] = useState<boolean>(false);
-
-  useEffect(() => {
-    if (updatingAccountList.length > 0) {
-      setUpdatingAccount(true);
-    } else {
-      setUpdatingAccount(false);
-    }
-  }, [updatingAccountList]);
 
-  useEffect(() => {
-    if (isUpdatingMetamaskNotifications) {
-      setLoadingAllowNotifications(isUpdatingMetamaskNotifications);
-    }
-  }, [isUpdatingMetamaskNotifications]);
+  const accountAddresses = useMemo(
+    () => accounts.map((a) => a.address),
+    [accounts],
+  );
 
-  useEffect(() => {
-    if (isUpdatingMetamaskNotificationsAccount) {
-      setUpdatingAccountList(isUpdatingMetamaskNotificationsAccount);
-    }
-  }, [isUpdatingMetamaskNotificationsAccount]);
+  // Account Settings
+  const accountSettingsProps = useAccountSettingsProps(accountAddresses);
+  const updatingAccounts = accountSettingsProps.accountsBeingUpdated.length > 0;
+  const refetchAccountSettings = async () => {
+    await accountSettingsProps.update(accountAddresses);
+  };
 
   return (
     <NotificationsPage>
@@ -108,7 +95,7 @@ export default function NotificationsSettings() {
           loading={loadingAllowNotifications}
           setLoading={setLoadingAllowNotifications}
           data-testid="notifications-settings-allow-notifications"
-          disabled={updatingAccount}
+          disabled={updatingAccounts}
         />
         <Box
           borderColor={BorderColor.borderMuted}
@@ -120,7 +107,7 @@ export default function NotificationsSettings() {
           <>
             {/* Notifications settings per types */}
             <NotificationsSettingsTypes
-              disabled={loadingAllowNotifications || updatingAccount}
+              disabled={loadingAllowNotifications || updatingAccounts}
             />
 
             {/* Notifications settings per account */}
@@ -160,8 +147,18 @@ export default function NotificationsSettings() {
                     key={account.id}
                     address={account.address}
                     name={account.metadata.name}
-                    disabled={updatingAccountList.length > 0}
-                    loading={updatingAccountList.includes(account.address)}
+                    disabledSwitch={
+                      accountSettingsProps.initialLoading || updatingAccounts
+                    }
+                    isLoading={accountSettingsProps.accountsBeingUpdated.includes(
+                      account.address,
+                    )}
+                    isEnabled={
+                      accountSettingsProps.data?.[
+                        account.address.toLowerCase()
+                      ] ?? false
+                    }
+                    refetchAccountSettings={refetchAccountSettings}
                   />
                 ))}
               </Box>

From 9f0c42a2440ec2f59b648b03693c299d7e6fb866 Mon Sep 17 00:00:00 2001
From: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Date: Fri, 19 Jul 2024 11:14:52 -0400
Subject: [PATCH 117/236] Cherry-pick d721e7f (PR #25500) to V12.1.0 (#25872)

This PR cherry-picks the commit
[d721e7f](https://github.com/MetaMask/metamask-extension/commit/d721e7f7b1d7a915624fb14050a8b4037c524d96)
(https://github.com/MetaMask/metamask-extension/pull/25500) into the
release v12.1.0

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

Co-authored-by: Monte Lai <monte.lai@consensys.net>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
Co-authored-by: Charly Chevalier <charly.chevalier@consensys.net>
---
 test/e2e/helpers.js                           |  9 +++++
 .../tests/multichain/connection-page.spec.js  | 33 +++++++++++++++++++
 .../account-list-item.test.js.snap            |  2 ++
 .../account-list-item/account-list-item.js    |  6 +++-
 .../app-header-unlocked-content.tsx           |  2 ++
 .../connected-site-menu.js                    |  2 +-
 .../__snapshots__/connections.test.tsx.snap   |  1 +
 .../send/__snapshots__/send.test.js.snap      |  1 +
 .../__snapshots__/your-accounts.test.tsx.snap |  6 ++++
 .../remove-snap-account.test.js.snap          |  1 +
 10 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index ba32c94cabec..cab7c2fb1157 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -672,6 +672,14 @@ const openDapp = async (driver, contract = null, dappURL = DAPP_URL) => {
     : await driver.openNewPage(dappURL);
 };
 
+const openDappConnectionsPage = async (driver) => {
+  await driver.openNewPage(
+    `${driver.extensionUrl}/home.html#connections/${encodeURIComponent(
+      DAPP_URL,
+    )}`,
+  );
+};
+
 const createDappTransaction = async (driver, transaction) => {
   await openDapp(
     driver,
@@ -1150,6 +1158,7 @@ module.exports = {
   importWrongSRPOnboardingFlow,
   testSRPDropdownIterations,
   openDapp,
+  openDappConnectionsPage,
   createDappTransaction,
   switchToOrOpenDapp,
   connectToDapp,
diff --git a/test/e2e/tests/multichain/connection-page.spec.js b/test/e2e/tests/multichain/connection-page.spec.js
index e5594de82840..2d1d2f2d106c 100644
--- a/test/e2e/tests/multichain/connection-page.spec.js
+++ b/test/e2e/tests/multichain/connection-page.spec.js
@@ -183,4 +183,37 @@ describe('Connections page', function () {
       },
     );
   });
+
+  // Skipped until issue where firefox connecting to dapp is resolved.
+  // it('shows that the account is connected to the dapp', async function () {
+  //   await withFixtures(
+  //     {
+  //       dapp: true,
+  //       fixtures: new FixtureBuilder().build(),
+  //       title: this.test.fullTitle(),
+  //       ganacheOptions: defaultGanacheOptions,
+  //     },
+  //     async ({ driver, ganacheServer }) => {
+  //       const ACCOUNT = '0x5CfE73b6021E818B776b421B1c4Db2474086a7e1';
+  //       const SHORTENED_ACCOUNT = shortenAddress(ACCOUNT);
+  //       await logInWithBalanceValidation(driver, ganacheServer);
+  //       await openDappConnectionsPage(driver);
+  //       // Verify that there are no connected accounts
+  //       await driver.assertElementNotPresent(
+  //         '[data-testid="account-list-address"]',
+  //       );
+
+  //       await connectToDapp(driver);
+  //       await openDappConnectionsPage(driver);
+
+  //       const account = await driver.findElement(
+  //         '[data-testid="account-list-address"]',
+  //       );
+  //       const accountAddress = await account.getText();
+
+  //       // Dapp should contain single connected account address
+  //       assert.strictEqual(accountAddress, SHORTENED_ACCOUNT);
+  //     },
+  //   );
+  // });
 });
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 0b2b13a29277..ae53a1353084 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
@@ -262,6 +262,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
         >
           <p
             class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+            data-testid="account-list-address"
           >
             bc1qn3s...5eker
           </p>
@@ -557,6 +558,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
         >
           <p
             class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+            data-testid="account-list-address"
           >
             0x0DCD5...3E7bc
           </p>
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 c3e09207cb7a..2b48bcb79baf 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -320,7 +320,11 @@ export const AccountListItem = ({
           justifyContent={JustifyContent.spaceBetween}
         >
           <Box display={Display.Flex} alignItems={AlignItems.center}>
-            <Text variant={TextVariant.bodySm} color={Color.textAlternative}>
+            <Text
+              variant={TextVariant.bodySm}
+              color={Color.textAlternative}
+              data-testid="account-list-address"
+            >
               {shortenAddress(normalizeSafeAddress(account.address))}
             </Text>
           </Box>
diff --git a/ui/components/multichain/app-header/app-header-unlocked-content.tsx b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
index 0cca531b5fc1..2be2d5ffd342 100644
--- a/ui/components/multichain/app-header/app-header-unlocked-content.tsx
+++ b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
@@ -41,6 +41,7 @@ import { GlobalMenu } from '../global-menu';
 import {
   getSelectedInternalAccount,
   getTestNetworkBackgroundColor,
+  getOriginOfCurrentTab,
 } from '../../../selectors';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { normalizeSafeAddress } from '../../../../app/scripts/lib/multichain/address';
@@ -80,6 +81,7 @@ export const AppHeaderUnlockedContent = ({
   const t = useI18nContext();
   const history = useHistory();
   const dispatch = useDispatch();
+  const origin = useSelector(getOriginOfCurrentTab);
   const [accountOptionsMenuOpen, setAccountOptionsMenuOpen] = useState(false);
   const testNetworkBackgroundColor = useSelector(getTestNetworkBackgroundColor);
 
diff --git a/ui/components/multichain/connected-site-menu/connected-site-menu.js b/ui/components/multichain/connected-site-menu/connected-site-menu.js
index c7811b3e819c..4f532710288e 100644
--- a/ui/components/multichain/connected-site-menu/connected-site-menu.js
+++ b/ui/components/multichain/connected-site-menu/connected-site-menu.js
@@ -137,5 +137,5 @@ ConnectedSiteMenu.propTypes = {
   /**
    *  Disable the connected site menu if the account is non-evm
    */
-  disabled: PropTypes.boolean,
+  disabled: PropTypes.bool,
 };
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 faa7a4fac173..3864de9c921e 100644
--- a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
+++ b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
@@ -317,6 +317,7 @@ exports[`Connections Content should render correctly 1`] = `
                 >
                   <p
                     class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                    data-testid="account-list-address"
                   >
                     0x0DCD5...3E7bc
                   </p>
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 59f5db9f8385..a3ee231d6ae2 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -489,6 +489,7 @@ exports[`SendPage render and initialization should render correctly even when a
                         >
                           <p
                             class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                            data-testid="account-list-address"
                           >
                             0x0
                           </p>
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 411ee70e4ea3..901e7def9c2c 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
@@ -265,6 +265,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="account-list-address"
             >
               0x0DCD5...3E7bc
             </p>
@@ -561,6 +562,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="account-list-address"
             >
               0xEC1Ad...9251B
             </p>
@@ -857,6 +859,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="account-list-address"
             >
               0xc42ED...D8813
             </p>
@@ -1162,6 +1165,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="account-list-address"
             >
               0xeB9e6...64823
             </p>
@@ -1458,6 +1462,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="account-list-address"
             >
               0xb5526...FEe5D
             </p>
@@ -1767,6 +1772,7 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
           >
             <p
               class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+              data-testid="account-list-address"
             >
               0xca8f1...Cf281
             </p>
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
index 7a411efb53ed..e0305e1c6533 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
@@ -361,6 +361,7 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
                       >
                         <p
                           class="mm-box mm-text mm-text--body-sm mm-box--color-text-alternative"
+                          data-testid="account-list-address"
                         >
                           0x0DCD5...3E7bc
                         </p>

From c2f65c4a928a83129b49017f5e119c260b9799bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Regadas?= <apregadas@gmail.com>
Date: Fri, 19 Jul 2024 16:29:46 +0100
Subject: [PATCH 118/236] chore: v12.1.0 cherry pick 56c9dc (#25677)
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**

No conflicts.

Cherry picks the commit:
https://github.com/MetaMask/metamask-extension/commit/56c9dc2fdac3d8f0eb8e15acddf93c4edb2ed89b
PR: https://github.com/MetaMask/metamask-extension/pull/25631

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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 |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index ee1f76f2f80c..6a0d9c50bcbf 100644
--- a/package.json
+++ b/package.json
@@ -276,7 +276,7 @@
     "@lavamoat/lavadome-react": "0.0.17",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@metamask-institutional/custody-controller": "^0.2.30",
+    "@metamask-institutional/custody-controller": "^0.2.31",
     "@metamask-institutional/custody-keyring": "^2.0.3",
     "@metamask-institutional/extension": "^0.3.27",
     "@metamask-institutional/institutional-features": "^1.3.5",
diff --git a/yarn.lock b/yarn.lock
index 6658ee69abfe..111122cc5078 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4616,16 +4616,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask-institutional/custody-controller@npm:^0.2.30":
-  version: 0.2.30
-  resolution: "@metamask-institutional/custody-controller@npm:0.2.30"
+"@metamask-institutional/custody-controller@npm:^0.2.30, @metamask-institutional/custody-controller@npm:^0.2.31":
+  version: 0.2.31
+  resolution: "@metamask-institutional/custody-controller@npm:0.2.31"
   dependencies:
     "@ethereumjs/util": "npm:^8.0.5"
     "@metamask-institutional/custody-keyring": "npm:^2.0.3"
     "@metamask-institutional/sdk": "npm:^0.1.30"
     "@metamask-institutional/types": "npm:^1.1.0"
     "@metamask/obs-store": "npm:^9.0.0"
-  checksum: 10/3d5ad6675d09f67bff924461b2d72f6c406a8cf86523119bcc8dea0f473501b8644f2dafd3babfcc4d2a0cbeb44d32b1a15dad701b481daac34c5eb4e5bcdd4b
+  checksum: 10/f856c98db42a21639d9ec5d1c835bc302b5a1b3fb821aae8641f63a9400f8303b8fa578368a2f2d2a1ec0c148c070f809b8c0fa46fa3fd2fa29f80e0ec1da207
   languageName: node
   linkType: hard
 
@@ -25156,7 +25156,7 @@ __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.30"
+    "@metamask-institutional/custody-controller": "npm:^0.2.31"
     "@metamask-institutional/custody-keyring": "npm:^2.0.3"
     "@metamask-institutional/extension": "npm:^0.3.27"
     "@metamask-institutional/institutional-features": "npm:^1.3.5"

From d9dd85ae2de8c7229418d596d75e00cbda3ba620 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 22 Jul 2024 12:44:19 -0230
Subject: [PATCH 119/236] fix: Fix v12.0.0 lint error (#26005)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix a lint error introduced in #25893. A type was imported that does not
exist on this branch. The type was not needed on this branch either.

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

## **Related issues**

Fixes a lint error introduced in #25893

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 shared/modules/selectors/smart-transactions.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts
index b29897ecf075..2ee51f652f5d 100644
--- a/shared/modules/selectors/smart-transactions.ts
+++ b/shared/modules/selectors/smart-transactions.ts
@@ -11,8 +11,6 @@ import {
 } from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file.
 import { isProduction } from '../environment';
 
-import { MultichainState } from '../../../ui/selectors/multichain';
-
 type SmartTransactionsMetaMaskState = {
   metamask: {
     preferences: {
@@ -99,9 +97,7 @@ const getIsAllowedRpcUrlForSmartTransactions = (
  * @returns true if the selected account has a non-zero balance, otherwise false.
  */
 const hasNonZeroBalance = (state: SmartTransactionsMetaMaskState) => {
-  const selectedAccount = getSelectedAccount(
-    state as unknown as MultichainState,
-  );
+  const selectedAccount = getSelectedAccount(state);
   return BigInt(selectedAccount?.balance || '0x0') > 0n;
 };
 

From b8884110e9aeddb38b255e183f284f7686f990a5 Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Mon, 22 Jul 2024 17:27:10 +0200
Subject: [PATCH 120/236] fix: remove showing nft autodetection modal (#25993)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Remove showing NFT autodetection modal when user disables it in settings
for this version.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25993?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/home/home.component.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 33ca2b67a181..ca0b5f2dd576 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -15,7 +15,6 @@ 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';
 import AutoDetectTokenModal from '../../components/app/auto-detect-token/auto-detect-token-modal';
-import AutoDetectNftModal from '../../components/app/auto-detect-nft/auto-detect-nft-modal';
 ///: END:ONLY_INCLUDE_IF
 import HomeNotification from '../../components/app/home-notification';
 import MultipleNotifications from '../../components/app/multiple-notifications';
@@ -154,7 +153,6 @@ export default class Home extends PureComponent {
     onboardedInThisUISession: PropTypes.bool,
     isSmartTransactionsOptInModalAvailable: PropTypes.bool.isRequired,
     isShowTokenAutodetectModal: PropTypes.bool.isRequired,
-    isShowNftAutodetectModal: PropTypes.bool.isRequired,
     ///: END:ONLY_INCLUDE_IF
     newNetworkAddedConfigurationId: PropTypes.string,
     isNotification: PropTypes.bool.isRequired,
@@ -979,8 +977,6 @@ export default class Home extends PureComponent {
       isShowTokenAutodetectModal,
       setTokenAutodetectModal,
       setShowTokenAutodetectModalOnUpgrade,
-      isShowNftAutodetectModal,
-      setNftAutodetectModal,
       ///: END:ONLY_INCLUDE_IF
     } = this.props;
 
@@ -1012,12 +1008,6 @@ export default class Home extends PureComponent {
       isShowTokenAutodetectModal &&
       !showSmartTransactionsOptInModal &&
       !showWhatsNew;
-    // TODO show ths after token autodetect modal is merged
-    const showNftAutoDetectionModal =
-      canSeeModals &&
-      isShowNftAutodetectModal &&
-      !showSmartTransactionsOptInModal &&
-      !showWhatsNew;
 
     const showTermsOfUse =
       completedOnboarding && !onboardedInThisUISession && showTermsOfUsePopup;
@@ -1052,10 +1042,6 @@ export default class Home extends PureComponent {
             }
           />
 
-          <AutoDetectNftModal
-            isOpen={showNftAutoDetectionModal}
-            onClose={setNftAutodetectModal}
-          />
           {showWhatsNew ? <WhatsNewPopup onClose={hideWhatsNewPopup} /> : null}
           {!showWhatsNew && showRecoveryPhraseReminder ? (
             <RecoveryPhraseReminder

From b91ee2fe025eecbf8d7540dfc42c034a19e5279e Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Mon, 22 Jul 2024 17:03:55 +0100
Subject: [PATCH 121/236] fix (cherry-pick 12.0.0): Version v12.0.0 permission
 page fix (#25970)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If Experimental settings `Select Networks for each site` is off, the
domains are undefined. In this case, the fallback network should be the
current network.

## **Related issues**

Fixes:
[#25887](https://github.com/MetaMask/metamask-extension/issues/25887)

## **Manual testing steps**

1. Connect MetaMask to Dapp
2. Go to Permissions, check the logo of network is specific to connected
network
3. Turn the experimental setting off, Go back to all permissions page.
Now the network logo should be same as globally selected network for all
the dapps

## **Screenshots/Recordings**


### **Before**

![Screenshot 2024-07-19 at 12 06

29 AM](https://github.com/user-attachments/assets/53fc2ee5-2c0f-46ff-892c-3ee48ad28a6d)

### **After**



https://github.com/user-attachments/assets/fe0bed9e-c050-4ab8-8607-bf933e1eac63



## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25970?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../multichain/all-permissions-page.spec.js   | 98 +++++++++++++++++++
 ui/selectors/selectors.js                     | 40 ++++----
 2 files changed, 120 insertions(+), 18 deletions(-)
 create mode 100644 test/e2e/tests/multichain/all-permissions-page.spec.js

diff --git a/test/e2e/tests/multichain/all-permissions-page.spec.js b/test/e2e/tests/multichain/all-permissions-page.spec.js
new file mode 100644
index 000000000000..5bb718bd8d20
--- /dev/null
+++ b/test/e2e/tests/multichain/all-permissions-page.spec.js
@@ -0,0 +1,98 @@
+const { strict: assert } = require('assert');
+const {
+  withFixtures,
+  WINDOW_TITLES,
+  connectToDapp,
+  logInWithBalanceValidation,
+  defaultGanacheOptions,
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+
+describe('Permissions Page', function () {
+  it('should show connected site permissions when a single dapp is connected', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test.fullTitle(),
+        ganacheOptions: defaultGanacheOptions,
+      },
+      async ({ driver, ganacheServer }) => {
+        await logInWithBalanceValidation(driver, ganacheServer);
+        await connectToDapp(driver);
+
+        // close test dapp window to avoid future confusion
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.closeWindowHandle(windowHandles[1]);
+        // disconnect dapp in fullscreen view
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.clickElement(
+          '[data-testid ="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        await driver.clickElementAndWaitToDisappear({
+          text: 'Got it',
+          tag: 'button',
+        });
+        const connectedDapp = await driver.isElementPresent({
+          text: '127.0.0.1:8080',
+          tag: 'p',
+        });
+        assert.ok(connectedDapp, 'Account connected to Dapp1');
+      },
+    );
+  });
+
+  it('should show all permissions listed when experimental settings toggle is off', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        title: this.test.fullTitle(),
+        ganacheOptions: defaultGanacheOptions,
+      },
+      async ({ driver, ganacheServer }) => {
+        await logInWithBalanceValidation(driver, ganacheServer);
+        await connectToDapp(driver);
+
+        // close test dapp window to avoid future confusion
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.closeWindowHandle(windowHandles[1]);
+        // disconnect dapp in fullscreen view
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'Settings', tag: 'div' });
+        await driver.clickElement({
+          text: 'Experimental',
+          tag: 'div',
+        });
+
+        await driver.clickElement(
+          '[data-testid="experimental-setting-toggle-request-queue"] label',
+        );
+        await driver.clickElement(
+          '.settings-page__header__title-container__close-button',
+        );
+        await driver.clickElement(
+          '[data-testid ="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'All Permissions', tag: 'div' });
+        await driver.clickElementAndWaitToDisappear({
+          text: 'Got it',
+          tag: 'button',
+        });
+        const connectedDapp = await driver.isElementPresent({
+          text: '127.0.0.1:8080',
+          tag: 'p',
+        });
+        assert.ok(connectedDapp, 'Account connected to Dapp1');
+      },
+    );
+  });
+});
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 452fbeea375b..b96650bb0328 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1494,24 +1494,6 @@ export const getConnectedSitesList = createDeepEqualSelector(
   },
 );
 
-export const getConnectedSitesListWithNetworkInfo = createDeepEqualSelector(
-  getConnectedSitesList,
-  getAllDomains,
-  getAllNetworks,
-  (sitesList, domains, networks) => {
-    Object.keys(sitesList).forEach((siteKey) => {
-      const connectedNetwork = networks.find(
-        (network) => network.id === domains[siteKey],
-      );
-      // For the testnets, if we do not have an image, we will have a fallback string
-      sitesList[siteKey].networkIconUrl =
-        connectedNetwork.rpcPrefs?.imageUrl || '';
-      sitesList[siteKey].networkName = connectedNetwork.nickname;
-    });
-    return sitesList;
-  },
-);
-
 export const getConnectedSnapsList = createDeepEqualSelector(
   getSnapsList,
   (snapsData) => {
@@ -1827,6 +1809,28 @@ export const getCurrentNetwork = createDeepEqualSelector(
   },
 );
 
+export const getConnectedSitesListWithNetworkInfo = createDeepEqualSelector(
+  getConnectedSitesList,
+  getAllDomains,
+  getAllNetworks,
+  getCurrentNetwork,
+  (sitesList, domains, networks, currentNetwork) => {
+    Object.keys(sitesList).forEach((siteKey) => {
+      const connectedNetwork = networks.find(
+        (network) => network.id === domains[siteKey],
+      );
+      // For the testnets, if we do not have an image, we will have a fallback string
+      sitesList[siteKey].networkIconUrl =
+        connectedNetwork?.rpcPrefs?.imageUrl ||
+        currentNetwork?.rpcPrefs?.imageUrl ||
+        '';
+      sitesList[siteKey].networkName =
+        connectedNetwork?.nickname || currentNetwork?.nickname || '';
+    });
+    return sitesList;
+  },
+);
+
 /**
  * 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

From cea988a1d1ccd61bcff4f170dc4d4e49e8afe81e Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Mon, 22 Jul 2024 17:04:04 +0100
Subject: [PATCH 122/236] fix (cherry-pick 12.0.0): Version v12.0.0 permission
 page width cherry pick (#25978)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For full screen view, the permissions page width should follow the page
size what we have for other screens

## **Related issues**

Fixes: #25678

## **Manual testing steps**

1. Go to Full Screen View
2. Go to Permissions Page
3. Check the Permissions Page has same width as the other pages

## **Screenshots/Recordings**

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

### **Before**
![Screenshot 2024-07-16 at 6 30

05 PM](https://github.com/user-attachments/assets/09de7ac4-ec50-4fb0-bea2-0f489e9d3164)


### **After**
![Screenshot 2024-07-16 at 6 26

32 PM](https://github.com/user-attachments/assets/ee9d0ccd-17dd-4283-a305-d77787c4673e)


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/25978?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../connections/__snapshots__/connections.test.tsx.snap      | 2 +-
 ui/components/multichain/pages/connections/connections.tsx   | 5 ++++-
 .../__snapshots__/permissions-page.test.js.snap              | 2 +-
 .../multichain/pages/permissions-page/permissions-page.js    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

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 19c9f8e3a22e..c2f877fd9069 100644
--- a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
+++ b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Connections Content should render correctly 1`] = `
     class="mm-box multichain-page mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
   >
     <div
-      class="mm-box multichain-page__inner-container connections-page mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
+      class="mm-box multichain-page__inner-container main-container connections-page mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
       data-testid="connections-page"
     >
       <div
diff --git a/ui/components/multichain/pages/connections/connections.tsx b/ui/components/multichain/pages/connections/connections.tsx
index 6dc382288ef4..6e75c222c59d 100644
--- a/ui/components/multichain/pages/connections/connections.tsx
+++ b/ui/components/multichain/pages/connections/connections.tsx
@@ -191,7 +191,10 @@ export const Connections = () => {
   );
 
   return (
-    <Page data-testid="connections-page" className="connections-page">
+    <Page
+      data-testid="connections-page"
+      className="main-container connections-page"
+    >
       <Header
         backgroundColor={BackgroundColor.backgroundDefault}
         startAccessory={
diff --git a/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap b/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap
index 0cfc19680cd0..69054c8eaa43 100644
--- a/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap
+++ b/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap
@@ -6,7 +6,7 @@ exports[`All Connections render renders correctly 1`] = `
     class="mm-box multichain-page mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
   >
     <div
-      class="mm-box multichain-page__inner-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
+      class="mm-box multichain-page__inner-container main-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
       data-testid="permissions-page"
     >
       <div
diff --git a/ui/components/multichain/pages/permissions-page/permissions-page.js b/ui/components/multichain/pages/permissions-page/permissions-page.js
index 2b2691c5c210..a9b6e8467969 100644
--- a/ui/components/multichain/pages/permissions-page/permissions-page.js
+++ b/ui/components/multichain/pages/permissions-page/permissions-page.js
@@ -69,7 +69,7 @@ export const PermissionsPage = () => {
     });
 
   return (
-    <Page data-testid="permissions-page">
+    <Page className="main-container" data-testid="permissions-page">
       <Header
         backgroundColor={BackgroundColor.backgroundDefault}
         startAccessory={

From 6e890df98754df72aaf6c0857cad20b12e078ad0 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Mon, 22 Jul 2024 23:44:03 +0530
Subject: [PATCH 123/236] fix: data passed over to false positive blockaid
 report (#25867)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
Blockaid false positive portal does not show all fields. This issue is
happening only in branch `12.0.0` and is relate d to previous
cherry-pick PR:
https://github.com/MetaMask/metamask-extension/pull/25743

## **Related issues**

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

## **Manual testing steps**

1. Go to the test dapp
2. Trigger a malicious permit
3. Click Blockaid details
4. Click Report
5. See report missing fields

## **Screenshots/Recordings**
<img width="1510" alt="Screenshot 2024-07-16 at 3 56 00 PM"
src="https://github.com/user-attachments/assets/fa26f9ee-e38c-4f0a-978a-39af70efb48b">

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts b/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts
index 62bbe0c49918..e13605e296da 100644
--- a/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts
+++ b/ui/pages/confirmations/hooks/alerts/useBlockaidAlert.ts
@@ -43,13 +43,13 @@ const useBlockaidAlerts = (): Alert[] => {
 
   let stringifiedJSONData: string | undefined;
 
-  if (securityAlertResponse && currentConfirmation) {
+  if (signatureSecurityAlertResponse && currentConfirmation) {
     const {
       block,
       features,
       reason,
       result_type: resultType,
-    } = securityAlertResponse as SecurityAlertResponse;
+    } = signatureSecurityAlertResponse as SecurityAlertResponse;
     const { chainId, msgParams, origin, type, txParams } = currentConfirmation;
 
     const isFailedResultType = resultType === BlockaidResultType.Errored;

From 0da0363d9563147da104fc1e555e02dab1713cc9 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 22 Jul 2024 16:04:53 -0230
Subject: [PATCH 124/236] v12.0.0: Update attributions workflow (#26003)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The attributions workflow on v12 was not completely working, a number of
changes were made to it after we initially branched for v12. We weren't
correctly linking the attributions file in the About page either. All
attributions related changes have been cherry-picked in this PR.

## **Related issues**

The following PRs have been cherry-picked into v12 to fix the
attributions workflow:

* #25180
* #25211
* #25731
* #25947

## **Manual testing steps**

Not easily tested until this is merged. We can test this after it has
been merged by attempting to update attributions (using the
`@metamaskbot update-attributions` bot comment), then seeing whether
they appear correct and pass the "check-attributions" CI job. We should
also check the about page to ensure they link the correct file for
v12.0.0 (note that the file won't exist until after the release is
merged because the tag is used in the URL, and the tag is created upon
merge)

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Nicholas Ellul <nicholas.ellul1@gmail.com>
Co-authored-by: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
---
 .github/workflows/update-attributions.yml     | 45 ++++++++++++++++---
 test/e2e/mmi/specs/navigation.spec.ts         |  8 ----
 test/env.js                                   |  1 +
 .../settings/about-metamask/ui-validation.csv |  2 +-
 .../settings/info-tab/info-tab.component.js   |  4 +-
 ui/pages/settings/info-tab/info-tab.test.tsx  |  2 +-
 6 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/update-attributions.yml b/.github/workflows/update-attributions.yml
index 6ef2bd0f59fa..ca4dbeadeb13 100644
--- a/.github/workflows/update-attributions.yml
+++ b/.github/workflows/update-attributions.yml
@@ -1,14 +1,31 @@
-name: Update Attibutions
+name: Update Attributions
 
 on:
   issue_comment:
     types: created
 
 jobs:
+  is-fork-pull-request:
+    name: Determine whether this issue comment was on a pull request from a fork
+    if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '@metamaskbot update-attributions') }}
+    runs-on: ubuntu-latest
+    outputs:
+      IS_FORK: ${{ steps.is-fork.outputs.IS_FORK }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Determine whether this PR is from a fork
+        id: is-fork
+        run: echo "IS_FORK=$(gh pr view --json isCrossRepository --jq '.isCrossRepository' "${PR_NUMBER}" )" >> "$GITHUB_OUTPUT"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_NUMBER: ${{ github.event.issue.number }}
+
   react-to-comment:
     name: React to the comment
     runs-on: ubuntu-latest
-    if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '@metamaskbot update-attributions') }}
+    needs: is-fork-pull-request
+    # Early exit if this is a fork, since later steps are skipped for forks
+    if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -22,13 +39,15 @@ jobs:
             -f content='+1'
         env:
           COMMENT_ID: ${{ github.event.comment.id }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
           REPO: ${{ github.repository }}
 
   prepare:
     name: Prepare dependencies
     runs-on: ubuntu-latest
-    if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '@metamaskbot update-attributions') }}
+    needs: is-fork-pull-request
+    # Early exit if this is a fork, since later steps are skipped for forks
+    if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     outputs:
       COMMIT_SHA: ${{ steps.commit-sha.outputs.COMMIT_SHA }}
     steps:
@@ -56,6 +75,9 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - prepare
+      - is-fork-pull-request
+    # Early exit if this is a fork, since later steps are skipped for forks
+    if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -72,7 +94,7 @@ jobs:
           cache: 'yarn'
       - name: Install dependencies from cache
         run: yarn --immutable --immutable-cache
-      - name: Generate Atributions
+      - name: Generate Attributions
         run: yarn attributions:generate
       - name: Cache attributions file
         uses: actions/cache/save@v3
@@ -85,7 +107,9 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - prepare
+      - is-fork-pull-request
       - update-attributions
+    if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -122,6 +146,8 @@ jobs:
           git config --global user.email 'metamaskbot@users.noreply.github.com'
           git commit -am "Update Attributions"
           git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
       - name: Post comment
         run: |
           if [[ $HAS_CHANGES == 'true' ]]
@@ -132,7 +158,7 @@ jobs:
           fi
         env:
           HAS_CHANGES: ${{ steps.attributions-changes.outputs.HAS_CHANGES }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
           PR_NUMBER: ${{ github.event.issue.number }}
 
   check-status:
@@ -140,6 +166,9 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - commit-updated-attributions
+      - is-fork-pull-request
+    # Early exit if this is a fork, since later steps are skipped for forks
+    if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     outputs:
       PASSED: ${{ steps.set-output.outputs.PASSED }}
     steps:
@@ -149,8 +178,10 @@ jobs:
 
   failure-comment:
     name: Comment about the attributions update failure
+    if: ${{ always() && needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     runs-on: ubuntu-latest
     needs:
+      - is-fork-pull-request
       - check-status
     steps:
       - uses: actions/checkout@v4
@@ -163,6 +194,6 @@ jobs:
             gh pr comment "${PR_NUMBER}" --body "Attributions update failed. You can [review the logs or retry the attributions update here](${ACTION_RUN_URL})"
           fi
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
           PR_NUMBER: ${{ github.event.issue.number }}
           ACTION_RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
diff --git a/test/e2e/mmi/specs/navigation.spec.ts b/test/e2e/mmi/specs/navigation.spec.ts
index ad6b011e3662..718da44cbd6b 100644
--- a/test/e2e/mmi/specs/navigation.spec.ts
+++ b/test/e2e/mmi/specs/navigation.spec.ts
@@ -18,8 +18,6 @@ const supportContactUs =
 const mmiHomePage = 'https://metamask.io/institutions/';
 const privacyAndPolicy = 'https://consensys.io/privacy-policy';
 const openSeaTermsOfUse = 'https://opensea.io/securityproviderterms';
-const metamaskAttributions =
-  'https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/attribution.txt';
 const termsOfUse = 'https://consensys.io/terms-of-use';
 const learnMoreArticles = 'https://support.metamask.io/hc/en-us/articles';
 
@@ -155,12 +153,6 @@ test.describe('MMI Navigation', () => {
       privacyAndPolicy,
     );
     await checkLinkURL(context, mainMenuPage.page, 'Terms of use', termsOfUse);
-    await checkLinkURL(
-      context,
-      mainMenuPage.page,
-      'Attributions',
-      metamaskAttributions,
-    );
     await checkLinkURL(
       context,
       mainMenuPage.page,
diff --git a/test/env.js b/test/env.js
index 8dbdd0aaa6bc..d5be7480ccde 100644
--- a/test/env.js
+++ b/test/env.js
@@ -13,3 +13,4 @@ process.env.NOTIFICATIONS_SERVICE_URL =
   'https://mock-test-notifications-api.metamask.io';
 process.env.PUSH_NOTIFICATIONS_SERVICE_URL =
   'https://mock-test-push-notifications-api.metamask.io';
+process.env.METAMASK_VERSION = 'MOCK_VERSION';
diff --git a/test/manual-scenarios/settings/about-metamask/ui-validation.csv b/test/manual-scenarios/settings/about-metamask/ui-validation.csv
index 05917f67437a..475158a54cff 100644
--- a/test/manual-scenarios/settings/about-metamask/ui-validation.csv
+++ b/test/manual-scenarios/settings/about-metamask/ui-validation.csv
@@ -11,6 +11,6 @@ Step,Test Steps,Test Data,Expected Result,Notes
 9,Click on the link for the 'Privacy policy',,Privacy policy 'https://consensys.io/privacy-policy' page is loaded,Critical because it's the only way to access privacy policy
 10,Click on the link for the 'Terms of use',,Terms of use page 'https://consensys.io/terms-of-use' is loaded,
 11,Click on the link for the 'Visit our support center',,Support page 'https://support.metamask.io/hc/en-us' is loaded,
-12,Click on the link for the 'Attributions',,Attributions 'https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/attribution.txt' page is loaded,
+12,Click on the link for the 'Attributions',,Attributions 'https://raw.githubusercontent.com/MetaMask/metamask-extension/{CURRENT_METAMASK_VERSION}/attribution.txt' page is loaded,
 13,Click on the link for the 'Visit our website',,Visit our website 'https://metamask.io/' page is loaded,
 14,Click on the link for the 'Contact us',,Contact us 'https://support.metamask.io/hc/en-us' code page is loaded,
diff --git a/ui/pages/settings/info-tab/info-tab.component.js b/ui/pages/settings/info-tab/info-tab.component.js
index c3c44e425561..121f29e7c52c 100644
--- a/ui/pages/settings/info-tab/info-tab.component.js
+++ b/ui/pages/settings/info-tab/info-tab.component.js
@@ -29,7 +29,7 @@ import {
 
 export default class InfoTab extends PureComponent {
   state = {
-    version: global.platform?.getVersion() ?? '<unknown>',
+    version: process.env.METAMASK_VERSION,
   };
 
   static contextTypes = {
@@ -113,7 +113,7 @@ export default class InfoTab extends PureComponent {
         <div ref={this.settingsRefs[4]} className="info-tab__link-item">
           <Button
             type="link"
-            href="https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/attribution.txt"
+            href={`https://raw.githubusercontent.com/MetaMask/metamask-extension/v${this.state.version}/attribution.txt`}
             target="_blank"
             rel="noopener noreferrer"
             className="info-tab__link-text"
diff --git a/ui/pages/settings/info-tab/info-tab.test.tsx b/ui/pages/settings/info-tab/info-tab.test.tsx
index 5ee43f6c82d9..f7405912e8bc 100644
--- a/ui/pages/settings/info-tab/info-tab.test.tsx
+++ b/ui/pages/settings/info-tab/info-tab.test.tsx
@@ -31,7 +31,7 @@ describe('InfoTab', () => {
       const attributionsLink = getByText('Attributions');
       expect(attributionsLink).toHaveAttribute(
         'href',
-        'https://raw.githubusercontent.com/MetaMask/metamask-extension/develop/attribution.txt',
+        `https://raw.githubusercontent.com/MetaMask/metamask-extension/vMOCK_VERSION/attribution.txt`,
       );
     });
 

From cb7248eb14b5aabc4d60184eed707dabfaeb277d Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Mon, 22 Jul 2024 20:58:49 +0100
Subject: [PATCH 125/236] fix (cherry-pick for v12.0.0): remove/disable profile
 syncing for existing users migration (#26021)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This is a cherry pick for
https://github.com/MetaMask/metamask-extension/pull/26004
(https://github.com/MetaMask/metamask-extension/commit/afe1120f00bb40af1398586563fdcb45d17fb3ea)

Ensures that existing users will not have profile syncing enabled (must
opt into profile syncing)

<!--
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/26021?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../user-storage/user-storage-controller.ts   |  2 +-
 app/scripts/migrations/120.1.test.ts          | 75 +++++++++++++++++++
 app/scripts/migrations/120.1.ts               | 52 +++++++++++++
 app/scripts/migrations/index.js               |  1 +
 ...rs-after-init-opt-in-background-state.json |  2 +-
 .../errors-after-init-opt-in-ui-state.json    |  2 +-
 6 files changed, 131 insertions(+), 3 deletions(-)
 create mode 100644 app/scripts/migrations/120.1.test.ts
 create mode 100644 app/scripts/migrations/120.1.ts

diff --git a/app/scripts/controllers/user-storage/user-storage-controller.ts b/app/scripts/controllers/user-storage/user-storage-controller.ts
index bc5c0b77c2bb..57f4930d1d2f 100644
--- a/app/scripts/controllers/user-storage/user-storage-controller.ts
+++ b/app/scripts/controllers/user-storage/user-storage-controller.ts
@@ -27,7 +27,7 @@ export type UserStorageControllerState = {
   /**
    * Condition used by UI and to determine if we can use some of the User Storage methods.
    */
-  isProfileSyncingEnabled: boolean;
+  isProfileSyncingEnabled: boolean | null;
   /**
    * Loading state for the profile syncing update
    */
diff --git a/app/scripts/migrations/120.1.test.ts b/app/scripts/migrations/120.1.test.ts
new file mode 100644
index 000000000000..83cacd2e3c12
--- /dev/null
+++ b/app/scripts/migrations/120.1.test.ts
@@ -0,0 +1,75 @@
+import { migrate, version } from './120.1';
+
+const oldVersion = 120;
+
+describe('migration #120.1', () => {
+  afterEach(() => jest.resetAllMocks());
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('sets isProfileSyncingEnabled to null', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        UserStorageController: {
+          isProfileSyncingEnabled: true,
+          isProfileSyncingUpdateLoading: false,
+        },
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.data.UserStorageController).toStrictEqual({
+      isProfileSyncingEnabled: null,
+      isProfileSyncingUpdateLoading: false,
+    });
+  });
+
+  it('initializes a default user storage state if it did not exist before', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        OtherController: {},
+      },
+    };
+
+    const expectedStorageData = {
+      OtherController: {},
+      UserStorageController: {
+        isProfileSyncingEnabled: null,
+      },
+    };
+
+    const newStorage = await migrate(oldStorage);
+    expect(newStorage.data).toStrictEqual(expectedStorageData);
+  });
+
+  it('should do nothing if existing UserStorageController state is malformed', async () => {
+    const actAssertInvalidUserStorageState = async (state: unknown) => {
+      const oldStorage = {
+        meta: { version: oldVersion },
+        data: {
+          OtherController: {},
+          UserStorageController: state,
+        },
+      };
+
+      const newStorage = await migrate(oldStorage);
+      expect(newStorage.data).toStrictEqual(oldStorage.data);
+    };
+
+    actAssertInvalidUserStorageState('user storage state is not an object');
+    actAssertInvalidUserStorageState({
+      // missing the isProfileSyncingEnabled field
+      isProfileSyncingUpdateLoading: false,
+    });
+  });
+});
diff --git a/app/scripts/migrations/120.1.ts b/app/scripts/migrations/120.1.ts
new file mode 100644
index 000000000000..bf68b6c4815a
--- /dev/null
+++ b/app/scripts/migrations/120.1.ts
@@ -0,0 +1,52 @@
+import { cloneDeep, isObject } from 'lodash';
+import { hasProperty } from '@metamask/utils';
+import { captureException } from '@sentry/browser';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 120.1;
+
+/**
+ * Add a default value for importTime in the InternalAccount
+ *
+ * @param originalVersionedData
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+function transformState(
+  state: Record<string, unknown>,
+): Record<string, unknown> {
+  // Existing users who do not have UserStorageController state.
+  // Provide some initial state & nullify `isProfileSyncingEnabled`
+  if (!hasProperty(state, 'UserStorageController')) {
+    state.UserStorageController = {
+      isProfileSyncingEnabled: null,
+    };
+    return state;
+  }
+
+  if (
+    !isObject(state.UserStorageController) ||
+    !hasProperty(state.UserStorageController, 'isProfileSyncingEnabled')
+  ) {
+    captureException(
+      `Migration ${version}: Invalid UserStorageController state: ${typeof state.UserStorageController}`,
+    );
+    return state;
+  }
+
+  // Existing users who do have UserStorageController state.
+  // nullify `isProfileSyncingEnabled`
+  state.UserStorageController.isProfileSyncingEnabled = null;
+  return state;
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index f3503f750344..a07558c8c4bd 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -131,6 +131,7 @@ const migrations = [
   require('./118'),
   require('./119'),
   require('./120'),
+  require('./120.1'),
 ];
 
 export default migrations;
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 0fb145d3fe62..823e0550976f 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -289,7 +289,7 @@
   },
   "UserOperationController": { "userOperations": "object" },
   "UserStorageController": {
-    "isProfileSyncingEnabled": true,
+    "isProfileSyncingEnabled": null,
     "isProfileSyncingUpdateLoading": "boolean"
   }
 }
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 19a73249cc2b..9f075c00de7a 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -193,7 +193,7 @@
     "nameSources": "object",
     "userOperations": "object",
     "isSignedIn": "boolean",
-    "isProfileSyncingEnabled": true,
+    "isProfileSyncingEnabled": null,
     "isProfileSyncingUpdateLoading": "boolean",
     "subscriptionAccountsSeen": "object",
     "isMetamaskNotificationsFeatureSeen": "boolean",

From 3a1aa6dd35df1b2df04f6f29806cee7904a60f69 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Tue, 23 Jul 2024 11:03:12 +0200
Subject: [PATCH 126/236] fix: map the supported block explorers (#25908)
 (#26030)
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.
-->

This PR introduces a new object to map the block explorers needed to
display certain details of the notifications. The created object is
intentionally as simple as possible. The goal of the notifications team
is to define a more complete object in a shared library among the
different clients to correctly render notifications where necessary.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25908?quickstart=1)

Fixes:
- https://github.com/MetaMask/metamask-extension/issues/25882
- https://github.com/MetaMask/metamask-extension/issues/25880
- https://github.com/MetaMask/metamask-extension/issues/25878
- https://github.com/MetaMask/metamask-extension/issues/25881

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

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

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

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

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [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.


<!--
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/26030?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/de/messages.json                 |  2 +-
 app/_locales/el/messages.json                 |  2 +-
 app/_locales/en/messages.json                 |  2 +-
 app/_locales/es/messages.json                 |  2 +-
 app/_locales/fr/messages.json                 |  2 +-
 app/_locales/hi/messages.json                 |  2 +-
 app/_locales/id/messages.json                 |  2 +-
 app/_locales/ja/messages.json                 |  2 +-
 app/_locales/ko/messages.json                 |  2 +-
 app/_locales/pt/messages.json                 |  2 +-
 app/_locales/ru/messages.json                 |  2 +-
 app/_locales/tl/messages.json                 |  2 +-
 app/_locales/tr/messages.json                 |  2 +-
 app/_locales/vi/messages.json                 |  2 +-
 app/_locales/zh_CN/messages.json              |  2 +-
 ...ification-detail-block-explorer-button.tsx | 20 ++++-
 .../metamask-notifications.ts                 | 53 +++++++++++
 ui/helpers/utils/notification.util.ts         | 89 ++++++++++++++-----
 18 files changed, 152 insertions(+), 40 deletions(-)
 create mode 100644 ui/helpers/constants/metamask-notifications/metamask-notifications.ts

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index e151307a3963..addd2939cd81 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -3214,7 +3214,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Auf $1 ansehen",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Benachrichtigungen"
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index dfb5e5aa874c..ce6f24891c60 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -3214,7 +3214,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Προβολή σε $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Ειδοποιήσεις"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index dc333a29c566..c4bae0ac3fd3 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3263,7 +3263,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "View on $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Notifications"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index b667a9069343..e0e7a7ddcd05 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -3211,7 +3211,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Ver en $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Notificaciones"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 16af2bc5bd5b..2a3a6a80749a 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -3214,7 +3214,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Consulter sur $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Notifications"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 7c24a1bf4d50..20ec2edf614a 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -3211,7 +3211,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "$1 पर देखें",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "सूचनाएं"
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index e5ddd9293ca6..0f2062fe9765 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -3214,7 +3214,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Lihat di $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Notifikasi"
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index c19fd5bbcd9b..120cf43805fb 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -3211,7 +3211,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "$1で表示",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "通知"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 65f6590df9b0..15558fc6e1ee 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -3211,7 +3211,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "$1에서 보기",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "알림"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 7449d4b334b3..b48d5c4e8c48 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -3214,7 +3214,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Ver em $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Notificações"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 5619ca7df213..c9cdd53e9f23 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -3214,7 +3214,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Смотреть на $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Уведомления"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 10684bc3778f..75eadda97e75 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -3211,7 +3211,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Tingnan sa $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Mga Abiso"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index d12b33d099df..12e3455ba82c 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -3214,7 +3214,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "$1 üzerinde görüntüle",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Bildirimler"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 4b9830f59232..d7c95b1c3292 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -3211,7 +3211,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "Xem trên $1",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "Thông báo"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index f899865bdf37..bb92bffe2c5d 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -3211,7 +3211,7 @@
   },
   "notificationTransactionSuccessView": {
     "message": "在 $1 上查看",
-    "description": "Additional content in browser notification that appears when a transaction is confirmed and has a block explorer URL"
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
   },
   "notifications": {
     "message": "通知"
diff --git a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
index 23237a70a0c7..c6ec119857ef 100644
--- a/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
+++ b/ui/components/multichain/notification-detail-block-explorer-button/notification-detail-block-explorer-button.tsx
@@ -26,7 +26,7 @@ export const NotificationDetailBlockExplorerButton = ({
   const t = useI18nContext();
 
   const chainIdHex = decimalToHex(chainId);
-  const { nativeBlockExplorerUrl } = getNetworkDetailsByChainId(
+  const { blockExplorerConfig } = getNetworkDetailsByChainId(
     `0x${chainIdHex}` as keyof typeof CHAIN_IDS,
   );
 
@@ -36,7 +36,21 @@ export const NotificationDetailBlockExplorerButton = ({
   }, [defaultNetworks]);
 
   const blockExplorerUrl =
-    defaultNetwork?.rpcPrefs?.blockExplorerUrl ?? nativeBlockExplorerUrl;
+    defaultNetwork?.rpcPrefs?.blockExplorerUrl ?? blockExplorerConfig?.url;
+
+  const getBlockExplorerButtonText = () => {
+    if (defaultNetwork?.rpcPrefs?.blockExplorerUrl) {
+      return t('notificationItemCheckBlockExplorer');
+    }
+    if (blockExplorerConfig?.name) {
+      return t('notificationTransactionSuccessView', [
+        blockExplorerConfig.name,
+      ]);
+    }
+    return t('notificationItemCheckBlockExplorer');
+  };
+
+  const blockExplorerButtonText = getBlockExplorerButtonText();
 
   if (!blockExplorerUrl) {
     return null;
@@ -46,7 +60,7 @@ export const NotificationDetailBlockExplorerButton = ({
     <NotificationDetailButton
       notification={notification}
       variant={ButtonVariant.Secondary}
-      text={t('notificationItemCheckBlockExplorer') || ''}
+      text={blockExplorerButtonText}
       href={`${blockExplorerUrl}/tx/${txHash}`}
       id={id}
       isExternal={true}
diff --git a/ui/helpers/constants/metamask-notifications/metamask-notifications.ts b/ui/helpers/constants/metamask-notifications/metamask-notifications.ts
new file mode 100644
index 000000000000..0b7169ce57a8
--- /dev/null
+++ b/ui/helpers/constants/metamask-notifications/metamask-notifications.ts
@@ -0,0 +1,53 @@
+import { CHAIN_IDS } from '../../../../shared/constants/network';
+
+/**
+ * Configuration for a block explorer.
+ *
+ * @property {string} url - The URL of the block explorer.
+ * @property {string} name - The name of the block explorer.
+ */
+export type BlockExplorerConfig = {
+  url: string;
+  name: string;
+};
+
+/**
+ * Map of all supported block explorers for notifications.
+ */
+export const SUPPORTED_NOTIFICATION_BLOCK_EXPLORERS = {
+  // ETHEREUM
+  [CHAIN_IDS.MAINNET]: {
+    url: 'https://etherscan.io',
+    name: 'Etherscan',
+  },
+  // OPTIMISM
+  [CHAIN_IDS.OPTIMISM]: {
+    url: 'https://optimistic.etherscan.io',
+    name: 'Optimistic Etherscan',
+  },
+  // BSC
+  [CHAIN_IDS.BSC]: {
+    url: 'https://bscscan.com',
+    name: 'BscScan',
+  },
+  // POLYGON
+  [CHAIN_IDS.POLYGON]: {
+    url: 'https://polygonscan.com',
+    name: 'PolygonScan',
+  },
+  // ARBITRUM
+  [CHAIN_IDS.ARBITRUM]: {
+    url: 'https://arbiscan.io',
+    name: 'Arbiscan',
+  },
+  // AVALANCHE
+  [CHAIN_IDS.AVALANCHE]: {
+    url: 'https://snowtrace.io',
+    name: 'Snowtrace',
+  },
+  // LINEA
+  [CHAIN_IDS.LINEA_MAINNET]: {
+    url: 'https://lineascan.build',
+    name: 'LineaScan',
+  },
+} as const;
diff --git a/ui/helpers/utils/notification.util.ts b/ui/helpers/utils/notification.util.ts
index 8c8d1544737a..1efe78adf3bb 100644
--- a/ui/helpers/utils/notification.util.ts
+++ b/ui/helpers/utils/notification.util.ts
@@ -5,7 +5,6 @@ import {
   CHAIN_IDS,
   CHAIN_ID_TO_CURRENCY_SYMBOL_MAP,
   CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
-  ETHERSCAN_SUPPORTED_NETWORKS,
   NETWORK_TO_NAME_MAP,
   FEATURED_RPCS,
   MAINNET_RPC_URL,
@@ -16,17 +15,65 @@ import {
   LINEA_MAINNET_RPC_URL,
   LOCALHOST_RPC_URL,
 } from '../../../shared/constants/network';
+import { SUPPORTED_NOTIFICATION_BLOCK_EXPLORERS } from '../constants/metamask-notifications/metamask-notifications';
 import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
 import type {
   OnChainRawNotification,
   OnChainRawNotificationsWithNetworkFields,
 } from '../../../app/scripts/controllers/metamask-notifications/types/on-chain-notification/on-chain-notification';
+import type { BlockExplorerConfig } from '../constants/metamask-notifications/metamask-notifications';
 import {
   hexWEIToDecGWEI,
   hexWEIToDecETH,
   decimalToHex,
 } from '../../../shared/modules/conversion.utils';
 
+/**
+ * Type guard to ensure a key is present in an object.
+ *
+ * @param object - The object to check.
+ * @param key - The key to check for.
+ * @returns True if the key is present, false otherwise.
+ */
+function isKey<T extends object>(object: T, key: PropertyKey): key is keyof T {
+  return key in object;
+}
+
+/**
+ * Checks if 2 date objects are on the same day
+ *
+ * @param currentDate
+ * @param dateToCheck
+ * @returns boolean if dates are same day.
+ */
+const isSameDay = (currentDate: Date, dateToCheck: Date) =>
+  currentDate.getFullYear() === dateToCheck.getFullYear() &&
+  currentDate.getMonth() === dateToCheck.getMonth() &&
+  currentDate.getDate() === dateToCheck.getDate();
+
+/**
+ * Checks if a date is "yesterday" from the current date
+ *
+ * @param currentDate
+ * @param dateToCheck
+ * @returns boolean if dates were "yesterday"
+ */
+const isYesterday = (currentDate: Date, dateToCheck: Date) => {
+  const yesterday = new Date(currentDate);
+  yesterday.setDate(currentDate.getDate() - 1);
+  return isSameDay(yesterday, dateToCheck);
+};
+
+/**
+ * Checks if 2 date objects are in the same year.
+ *
+ * @param currentDate
+ * @param dateToCheck
+ * @returns boolean if dates were in same year
+ */
+const isSameYear = (currentDate: Date, dateToCheck: Date) =>
+  currentDate.getFullYear() === dateToCheck.getFullYear();
+
 /**
  * Formats a given date into different formats based on how much time has elapsed since that date.
  *
@@ -34,11 +81,10 @@ import {
  * @returns The formatted date.
  */
 export function formatMenuItemDate(date: Date) {
-  const elapsed = Math.abs(Date.now() - date.getTime());
-  const diffDays = elapsed / (1000 * 60 * 60 * 24);
+  const currentDate = new Date();
 
-  // E.g. Yesterday
-  if (diffDays < 1) {
+  // E.g. 12:21
+  if (isSameDay(currentDate, date)) {
     return new Intl.DateTimeFormat('en', {
       hour: 'numeric',
       minute: 'numeric',
@@ -46,8 +92,8 @@ export function formatMenuItemDate(date: Date) {
     }).format(date);
   }
 
-  // E.g. 12:21
-  if (Math.floor(diffDays) === 1) {
+  // E.g. Yesterday
+  if (isYesterday(currentDate, date)) {
     return new Intl.RelativeTimeFormat('en', { numeric: 'auto' }).format(
       -1,
       'day',
@@ -55,7 +101,7 @@ export function formatMenuItemDate(date: Date) {
   }
 
   // E.g. 21 Oct
-  if (diffDays > 1 && diffDays < 365) {
+  if (isSameYear(currentDate, date)) {
     return new Intl.DateTimeFormat('en', {
       month: 'short',
       day: 'numeric',
@@ -267,7 +313,7 @@ export function getNetworkDetailsByChainId(chainId?: keyof typeof CHAIN_IDS): {
   nativeCurrencySymbol: string;
   nativeCurrencyLogo: string;
   nativeCurrencyAddress: string;
-  nativeBlockExplorerUrl?: string;
+  blockExplorerConfig?: BlockExplorerConfig;
 } {
   const fullNativeCurrencyName =
     NETWORK_TO_NAME_MAP[chainId as keyof typeof NETWORK_TO_NAME_MAP] ?? '';
@@ -281,22 +327,16 @@ export function getNetworkDetailsByChainId(chainId?: keyof typeof CHAIN_IDS): {
       chainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
     ];
   const nativeCurrencyAddress = '0x0000000000000000000000000000000000000000';
-
   const blockExplorerConfig =
-    ETHERSCAN_SUPPORTED_NETWORKS[
-      chainId as keyof typeof ETHERSCAN_SUPPORTED_NETWORKS
-    ];
-  let nativeBlockExplorerUrl;
-  if (blockExplorerConfig) {
-    nativeBlockExplorerUrl = `https://www.${blockExplorerConfig.domain}`;
-  }
-
+    chainId && isKey(SUPPORTED_NOTIFICATION_BLOCK_EXPLORERS, chainId)
+      ? SUPPORTED_NOTIFICATION_BLOCK_EXPLORERS[chainId]
+      : undefined;
   return {
     nativeCurrencyName,
     nativeCurrencySymbol,
     nativeCurrencyLogo,
     nativeCurrencyAddress,
-    nativeBlockExplorerUrl,
+    blockExplorerConfig,
   };
 }
 
@@ -375,9 +415,14 @@ export const getNetworkFees = async (notification: OnChainRawNotification) => {
   }
 
   const chainId = decimalToHex(notification.chain_id);
-  const provider = new JsonRpcProvider(
-    getRpcUrlByChainId(`0x${chainId}` as HexChainId),
-  );
+  const rpcUrl = getRpcUrlByChainId(`0x${chainId}` as HexChainId);
+  const connection = {
+    url: rpcUrl,
+    headers: {
+      'Infura-Source': 'metamask/metamask',
+    },
+  };
+  const provider = new JsonRpcProvider(connection);
 
   if (!provider) {
     throw new Error(`No provider found for chainId ${chainId}`);

From b2b41b4fedef896f74c1843851dc2215f9ef0d60 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 23 Jul 2024 07:48:53 -0230
Subject: [PATCH 127/236] Cherry-pick: Fix permissions for
 `update-attributions` workflow (#26019) (#26022)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This is a cherry-pick of #26019, original description is as follows:

The `update-attributions` workflow was using a low-privilege token for
checking out the repository. The checkout step is what determines which
credentials are used upon `push`. The later step with `git push` was
failing with a HTTP 403 response despite having a token declared with
write access, because `git push` uses the credentials setup during
checkout.

Example failure:
https://github.com/MetaMask/metamask-extension/actions/runs/10046473531

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26019?quickstart=1)

## **Related issues**

Relates to https://github.com/MetaMask/MetaMask-planning/issues/1947

## **Manual testing steps**

We can't easily test this until after it's merged. Once this is merged,
we can see that it works by using the command `@metamaskbot
update-attributions`. We can see that the changes made here reflect how
the `update-policies` workflow works, which uses the same type of
authorization.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .github/workflows/update-attributions.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/update-attributions.yml b/.github/workflows/update-attributions.yml
index ca4dbeadeb13..0a674975d0e5 100644
--- a/.github/workflows/update-attributions.yml
+++ b/.github/workflows/update-attributions.yml
@@ -115,7 +115,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           # Use PAT to ensure that the commit later can trigger status check workflows
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
       - name: Checkout pull request
         run: gh pr checkout "${PR_NUMBER}"
         env:
@@ -146,8 +146,6 @@ jobs:
           git config --global user.email 'metamaskbot@users.noreply.github.com'
           git commit -am "Update Attributions"
           git push
-        env:
-          GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
       - name: Post comment
         run: |
           if [[ $HAS_CHANGES == 'true' ]]

From 656679ebff13002df1778df68fcf26753c5ea99c Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Tue, 23 Jul 2024 12:45:04 +0200
Subject: [PATCH 128/236] fix: update token detection modal css (#26025)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Cherry picks https://github.com/MetaMask/metamask-extension/pull/25961

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26025?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../auto-detect-nft/auto-detect-nft-modal.tsx | 21 +++++++++----------
 .../auto-detect-token-modal.tsx               | 12 +++++------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.tsx b/ui/components/app/auto-detect-nft/auto-detect-nft-modal.tsx
index 3fa744a72e89..114b7129b2e8 100644
--- a/ui/components/app/auto-detect-nft/auto-detect-nft-modal.tsx
+++ b/ui/components/app/auto-detect-nft/auto-detect-nft-modal.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback, useContext } from 'react';
 
 import { useDispatch, useSelector } from 'react-redux';
+
 import {
   Modal,
   ModalContent,
@@ -10,6 +11,7 @@ import {
   Text,
   ModalBody,
   ModalFooter,
+  ButtonVariant,
 } from '../../component-library';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
@@ -18,7 +20,6 @@ import {
   Display,
   FlexDirection,
   JustifyContent,
-  TextAlign,
   TextVariant,
 } from '../../../helpers/constants/design-system';
 import { setOpenSeaEnabled, setUseNftDetection } from '../../../store/actions';
@@ -93,13 +94,9 @@ function AutoDetectNftModal({ isOpen, onClose }: AutoDetectNftModalProps) {
           >
             <img src="/images/wallet-alpha.png" />
           </Box>
-          <Text
-            variant={TextVariant.bodyMd}
-            textAlign={TextAlign.Justify}
-            padding={0}
-          >
+          <Text variant={TextVariant.bodyMd}>
             {t('allowMetaMaskToDetectNFTs')}
-            <Box textAlign={TextAlign.Justify} paddingLeft={2}>
+            <Box paddingLeft={2}>
               <Text variant={TextVariant.inherit} as="li" paddingTop={2}>
                 {t('immediateAccessToYourNFTs')}
               </Text>
@@ -114,15 +111,17 @@ function AutoDetectNftModal({ isOpen, onClose }: AutoDetectNftModalProps) {
         </ModalBody>
         <ModalFooter
           onSubmit={() => handleNftAutoDetection(true)}
-          submitButtonProps={{
-            children: t('allow'),
-            block: true,
-          }}
           onCancel={() => handleNftAutoDetection(false)}
           cancelButtonProps={{
             children: t('notRightNow'),
             block: true,
+            variant: ButtonVariant.Link,
+          }}
+          submitButtonProps={{
+            children: t('allow'),
+            block: true,
           }}
+          containerProps={{ flexDirection: FlexDirection.ColumnReverse }}
         />
       </ModalContent>
     </Modal>
diff --git a/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx b/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx
index c050d53c64cd..c636fdda7e36 100644
--- a/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx
+++ b/ui/components/app/auto-detect-token/auto-detect-token-modal.tsx
@@ -10,6 +10,7 @@ import {
   Text,
   ModalBody,
   ModalFooter,
+  ButtonVariant,
 } from '../../component-library';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
@@ -18,7 +19,6 @@ import {
   Display,
   FlexDirection,
   JustifyContent,
-  TextAlign,
   TextVariant,
 } from '../../../helpers/constants/design-system';
 import { setUseTokenDetection } from '../../../store/actions';
@@ -101,13 +101,9 @@ function AutoDetectTokenModal({
           >
             <img src="/images/wallet-alpha.png" />
           </Box>
-          <Text
-            variant={TextVariant.bodyMd}
-            textAlign={TextAlign.Justify}
-            padding={0}
-          >
+          <Text variant={TextVariant.bodyMd}>
             {t('allowMetaMaskToDetectTokens')}
-            <Box textAlign={TextAlign.Justify} paddingLeft={2}>
+            <Box paddingLeft={2}>
               <Text variant={TextVariant.inherit} as="li" paddingTop={2}>
                 {t('immediateAccessToYourTokens')}
               </Text>
@@ -129,8 +125,10 @@ function AutoDetectTokenModal({
           onCancel={() => handleTokenAutoDetection(false)}
           cancelButtonProps={{
             children: t('notRightNow'),
+            variant: ButtonVariant.Link,
             block: true,
           }}
+          containerProps={{ flexDirection: FlexDirection.ColumnReverse }}
         />
       </ModalContent>
     </Modal>

From 82579a717e37c290f76e078e0167c9cb8fda0f17 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 23 Jul 2024 05:46:57 -0500
Subject: [PATCH 129/236] test (cherry-pick): UX: Multichain: Add E2E for
 signaling network change from Network menu to dapp, Autoswitching networks
 (#25765) (#26017)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds an end to end tests for:
* Autoswitching networks upon UI load
* Autoswitching networks upon last confirmation rejection/confirmation
* Signaling network change from extension to dapp

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25765?quickstart=1)

Fixes:

1. N/A, this is a E2E addition

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

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

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

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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.


<!--
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/26017?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/scripts/ui.js                         |  18 +++
 test/e2e/tests/request-queuing/ui.spec.js | 184 +++++++++++++++++++++-
 test/e2e/webdriver/chrome.js              |   6 +-
 test/e2e/webdriver/firefox.js             |   5 +-
 test/e2e/webdriver/index.js               |  15 +-
 5 files changed, 220 insertions(+), 8 deletions(-)

diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index 50917836a4b8..90ae1485e8a5 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -263,6 +263,24 @@ async function start() {
 }
 
 async function queryCurrentActiveTab(windowType) {
+  // Shims the activeTab for E2E test runs only if the
+  // "activeTabOrigin" querystring key=value is set
+  if (process.env.IN_TEST) {
+    const searchParams = new URLSearchParams(window.location.search);
+    const mockUrl = searchParams.get('activeTabOrigin');
+    if (mockUrl) {
+      const { origin, protocol } = new URL(mockUrl);
+      const returnUrl = {
+        id: 'mock-site',
+        title: 'Mock Site',
+        url: mockUrl,
+        origin,
+        protocol,
+      };
+      return returnUrl;
+    }
+  }
+
   // At the time of writing we only have the `activeTab` permission which means
   // that this query will only succeed in the popup context (i.e. after a "browserAction")
   if (windowType !== ENVIRONMENT_TYPE_POPUP) {
diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js
index 4c0aa8fea3e1..cea9e045ceed 100644
--- a/test/e2e/tests/request-queuing/ui.spec.js
+++ b/test/e2e/tests/request-queuing/ui.spec.js
@@ -1,5 +1,5 @@
 const { strict: assert } = require('assert');
-const { Browser } = require('selenium-webdriver');
+const { Browser, until } = require('selenium-webdriver');
 const FixtureBuilder = require('../../fixture-builder');
 const {
   withFixtures,
@@ -124,10 +124,16 @@ async function confirmTransaction(driver) {
 }
 
 async function switchToNetworkByName(driver, networkName) {
-  await driver.clickElement('[data-testid="network-display"]');
+  await driver.clickElement('.mm-picker-network');
   await driver.clickElement(`[data-testid="${networkName}"]`);
 }
 
+async function openPopupWithActiveTabOrigin(driver, origin) {
+  await driver.openNewPage(
+    `${driver.extensionUrl}/${PAGES.POPUP}.html?activeTabOrigin=${origin}`,
+  );
+}
+
 async function validateBalanceAndActivity(
   driver,
   expectedBalance,
@@ -428,6 +434,178 @@ describe('Request-queue UI changes', function () {
     );
   });
 
+  it('should signal from UI to dapp the network change @no-mmi', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test.fullTitle(),
+        driverOptions: { constrainWindowSize: true },
+      },
+      async ({ driver }) => {
+        // Navigate to extension home screen
+        await unlockWallet(driver);
+
+        // Open the first dapp which starts on chain '0x539
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Ensure the dapp starts on the correct network
+        await driver.wait(
+          until.elementTextContains(
+            await driver.findElement('#chainId'),
+            '0x539',
+          ),
+        );
+
+        // Open the popup with shimmed activeTabOrigin
+        await openPopupWithActiveTabOrigin(driver, DAPP_URL);
+
+        // Switch to mainnet
+        await switchToNetworkByName(driver, 'Ethereum Mainnet');
+
+        // Switch back to the Dapp tab
+        await driver.switchToWindowWithUrl(DAPP_URL);
+
+        // Check to make sure the dapp network changed
+        await driver.wait(
+          until.elementTextContains(
+            await driver.findElement('#chainId'),
+            '0x1',
+          ),
+        );
+      },
+    );
+  });
+
+  it('should autoswitch networks to the last used network for domain', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        // Open fullscreen
+        await unlockWallet(driver);
+
+        // Open the first dapp which starts on chain '0x539
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open tab 2, switch to Ethereum Mainnet
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1', 4);
+
+        // Open the popup with shimmed activeTabOrigin
+        await openPopupWithActiveTabOrigin(driver, DAPP_URL);
+
+        // Ensure network was reset to original
+        await driver.findElement({
+          css: '.multichain-app-header__contents--avatar-network .mm-text',
+          text: 'Localhost 8545',
+        });
+
+        // Ensure toast is shown to the user
+        await driver.findElement({
+          css: '.toast-text',
+          text: 'Localhost 8545 is now active on 127.0.0.1:8080',
+        });
+      },
+    );
+  });
+
+  it('should autoswitch networks when last confirmation from another network is rejected', async function () {
+    const port = 8546;
+    const chainId = 1338;
+
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.fullTitle(),
+        driverOptions: { constrainWindowSize: true },
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Open the first dapp which starts on chain '0x539
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open tab 2, switch to Ethereum Mainnet
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1', 4);
+        await driver.waitForSelector({
+          css: '.error-message-text',
+          text: 'You are on the Ethereum Mainnet.',
+        });
+        await driver.delay(veryLargeDelayMs);
+
+        // Start a Send on Ethereum Mainnet
+        await driver.clickElement('#sendButton');
+        await driver.delay(regularDelayMs);
+
+        // Open the popup with shimmed activeTabOrigin
+        await openPopupWithActiveTabOrigin(driver, DAPP_URL);
+
+        // Ensure the confirmation pill shows Ethereum Mainnet
+        await driver.waitForSelector({
+          css: '[data-testid="network-display"]',
+          text: 'Ethereum Mainnet',
+        });
+
+        // Reject the confirmation
+        await driver.clickElement(
+          '[data-testid="page-container-footer-cancel"]',
+        );
+
+        // Wait for network to automatically change to localhost
+        await driver.waitForSelector({
+          css: '.multichain-app-header__contents--avatar-network .mm-text',
+          text: 'Localhost 8545',
+        });
+
+        // Ensure toast is shown to the user
+        await driver.waitForSelector({
+          css: '.toast-text',
+          text: 'Localhost 8545 is now active on 127.0.0.1:8080',
+        });
+      },
+    );
+  });
+
   it('should gracefully handle network connectivity failure for signatures @no-mmi', async function () {
     const port = 8546;
     const chainId = 1338;
@@ -471,7 +649,7 @@ describe('Request-queue UI changes', function () {
         await driver.switchToWindowWithTitle(
           WINDOW_TITLES.ExtensionInFullScreenView,
         );
-        await driver.findElement({
+        await driver.waitForSelector({
           css: '[data-testid="network-display"]',
           text: 'Ethereum Mainnet',
         });
diff --git a/test/e2e/webdriver/chrome.js b/test/e2e/webdriver/chrome.js
index b5068759812a..fe56f5b77b6f 100644
--- a/test/e2e/webdriver/chrome.js
+++ b/test/e2e/webdriver/chrome.js
@@ -16,7 +16,7 @@ const HTTPS_PROXY_HOST = `${
  * A wrapper around a {@code WebDriver} instance exposing Chrome-specific functionality
  */
 class ChromeDriver {
-  static async build({ openDevToolsForTabs, port }) {
+  static async build({ openDevToolsForTabs, constrainWindowSize, port }) {
     const args = [
       `--proxy-server=${HTTPS_PROXY_HOST}`, // Set proxy in the way that doesn't interfere with Selenium Manager
       '--disable-features=OptimizationGuideModelDownloading,OptimizationHintsFetching,OptimizationTargetPrediction,OptimizationHints,NetworkTimeServiceQuerying', // Stop chrome from calling home so much (auto-downloads of AI models; time sync)
@@ -36,6 +36,10 @@ class ChromeDriver {
       args.push('--auto-open-devtools-for-tabs');
     }
 
+    if (constrainWindowSize) {
+      args.push('--window-size=320,600');
+    }
+
     args.push('--log-level=3');
     args.push('--enable-logging');
 
diff --git a/test/e2e/webdriver/firefox.js b/test/e2e/webdriver/firefox.js
index f56436dc3892..96df030d52a9 100644
--- a/test/e2e/webdriver/firefox.js
+++ b/test/e2e/webdriver/firefox.js
@@ -36,9 +36,10 @@ class FirefoxDriver {
    * @param {object} options - the options for the build
    * @param options.responsive
    * @param options.port
+   * @param options.constrainWindowSize
    * @returns {Promise<{driver: !ThenableWebDriver, extensionUrl: string, extensionId: string}>}
    */
-  static async build({ responsive, port }) {
+  static async build({ responsive, port, constrainWindowSize }) {
     const templateProfile = fs.mkdtempSync(TEMP_PROFILE_PATH_PREFIX);
     const options = new firefox.Options().setProfile(templateProfile);
 
@@ -87,7 +88,7 @@ class FirefoxDriver {
     const extensionId = await fxDriver.installExtension('dist/firefox');
     const internalExtensionId = await fxDriver.getInternalId();
 
-    if (responsive) {
+    if (responsive || constrainWindowSize) {
       await driver.manage().window().setRect({ width: 320, height: 600 });
     }
 
diff --git a/test/e2e/webdriver/index.js b/test/e2e/webdriver/index.js
index 900e2f599157..ddc0d5543822 100644
--- a/test/e2e/webdriver/index.js
+++ b/test/e2e/webdriver/index.js
@@ -3,14 +3,25 @@ const { Driver } = require('./driver');
 const ChromeDriver = require('./chrome');
 const FirefoxDriver = require('./firefox');
 
-async function buildWebDriver({ openDevToolsForTabs, port, timeOut } = {}) {
+async function buildWebDriver({
+  openDevToolsForTabs,
+  port,
+  constrainWindowSize,
+  timeOut,
+  proxyPort,
+} = {}) {
   const browser = process.env.SELENIUM_BROWSER;
 
   const {
     driver: seleniumDriver,
     extensionId,
     extensionUrl,
-  } = await buildBrowserWebDriver(browser, { openDevToolsForTabs, port });
+  } = await buildBrowserWebDriver(browser, {
+    openDevToolsForTabs,
+    port,
+    constrainWindowSize,
+    proxyPort,
+  });
   const driver = new Driver(seleniumDriver, browser, extensionUrl, timeOut);
 
   return {

From b31ad7464f1c553a38c3fb53d77c8cfca8ceba6b Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:27:19 +0000
Subject: [PATCH 130/236] Update Attributions

---
 attribution.txt | 304 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 222 insertions(+), 82 deletions(-)

diff --git a/attribution.txt b/attribution.txt
index 364128f620f3..493e487992d2 100644
--- a/attribution.txt
+++ b/attribution.txt
@@ -1599,7 +1599,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************
 
 @babel/runtime
-7.24.5 <https://github.com/babel/babel>
+7.24.6 <https://github.com/babel/babel>
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
@@ -2410,7 +2410,7 @@ SOFTWARE.
 ******************************
 
 @blockaid/ppom_release
-1.4.6 <>
+1.4.8 <>
 Blockaid BSL License, Version 1.0 (EPL-1.0)
 
 Licensor:  Blockaid, Inc.
@@ -12868,7 +12868,7 @@ SOFTWARE.
 ******************************
 
 @grpc/grpc-js
-1.9.14 <https://github.com/grpc/grpc-node/tree/master/packages/grpc-js>
+1.9.15 <https://github.com/grpc/grpc-node/tree/master/packages/grpc-js>
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -18189,7 +18189,7 @@ authors: Maarten Zuidhoorn <maarten@zuidhoorn.com>
 ******************************
 
 @metamask/accounts-controller
-14.0.0 <https://github.com/MetaMask/core>
+15.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18319,7 +18319,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 ******************************
 
 @metamask/assets-controllers
-29.0.0 <https://github.com/MetaMask/core>
+30.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -18488,6 +18488,32 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+******************************
+
+@metamask/controller-utils
+10.0.0 <https://github.com/MetaMask/core>
+MIT License
+
+Copyright (c) 2018 MetaMask
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
+
 ******************************
 
 @metamask/controller-utils
@@ -19250,7 +19276,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/custody-controller
-0.2.27 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.2.30 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19277,7 +19303,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/custody-keyring
-2.0.0 <https://github.com/consensys-vertical-apps/metamask-institutional>
+2.0.3 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19304,7 +19330,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/extension
-0.3.24 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.3.27 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19331,7 +19357,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/institutional-features
-1.3.2 <https://github.com/consensys-vertical-apps/metamask-institutional>
+1.3.5 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19412,7 +19438,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/sdk
-0.1.27 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.1.30 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19466,7 +19492,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/transaction-update
-0.2.2 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.2.5 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19520,7 +19546,7 @@ SOFTWARE.
 ******************************
 
 @metamask-institutional/websocket-client
-0.2.2 <https://github.com/consensys-vertical-apps/metamask-institutional>
+0.2.5 <https://github.com/consensys-vertical-apps/metamask-institutional>
 MIT License
 
 Copyright (c) 2023 ConsenSys Vertical Apps
@@ -19607,6 +19633,27 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+******************************
+
+@metamask/json-rpc-engine
+9.0.0 <https://github.com/MetaMask/core>
+ISC License
+
+Copyright (c) 2022 MetaMask
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
 ******************************
 
 @metamask/json-rpc-middleware-stream
@@ -19628,6 +19675,27 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
+******************************
+
+@metamask/json-rpc-middleware-stream
+8.0.0 <https://github.com/MetaMask/core>
+ISC License
+
+Copyright (c) 2020 MetaMask
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
 ******************************
 
 @metamask/keyring-api
@@ -19638,7 +19706,7 @@ authors: undefined
 ******************************
 
 @metamask/keyring-api
-6.3.1 <https://github.com/MetaMask/keyring-api>
+6.4.0 <https://github.com/MetaMask/keyring-api>
 license: Custom: https://docs.metamask.io/snaps/
 authors: undefined
 
@@ -19805,7 +19873,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/name-controller
-6.0.1 <https://github.com/MetaMask/core>
+8.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2023 MetaMask
@@ -20000,7 +20068,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/obs-store
-8.1.0 <https://github.com/MetaMask/obs-store>
+9.0.0 <https://github.com/MetaMask/obs-store>
 ISC License
 
 Copyright (c) 2020 MetaMask
@@ -20020,23 +20088,28 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************
 
-@metamask/obs-store
-9.0.0 <https://github.com/MetaMask/obs-store>
-ISC License
+@metamask/permission-controller
+10.0.0 <https://github.com/MetaMask/core>
+MIT License
 
-Copyright (c) 2020 MetaMask
+Copyright (c) 2018 MetaMask
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 
 ******************************
@@ -20092,7 +20165,33 @@ If you have any questions, comments or interest in pursuing any other use cases,
 ******************************
 
 @metamask/phishing-controller
-9.0.2 <https://github.com/MetaMask/core>
+10.0.0 <https://github.com/MetaMask/core>
+MIT License
+
+Copyright (c) 2018 MetaMask
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
+
+******************************
+
+@metamask/phishing-controller
+9.0.4 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2018 MetaMask
@@ -20251,7 +20350,7 @@ SOFTWARE.
 ******************************
 
 @metamask/providers
-16.1.0 <https://github.com/MetaMask/providers>
+17.0.0 <https://github.com/MetaMask/providers>
 MIT License
 
 Copyright (c) 2020 MetaMask
@@ -20278,7 +20377,7 @@ SOFTWARE.
 ******************************
 
 @metamask/queued-request-controller
-0.10.0 <https://github.com/MetaMask/core>
+2.0.0 <https://github.com/MetaMask/core>
 MIT License
 
 Copyright (c) 2023 MetaMask
@@ -20485,7 +20584,7 @@ authors: Dan Finlay <dan@danfinlay.com>
 ******************************
 
 @metamask/smart-transactions-controller
-10.0.1 <https://github.com/MetaMask/smart-transactions-controller>
+10.1.2 <https://github.com/MetaMask/smart-transactions-controller>
 Copyright ConsenSys Software Inc. 2020. All rights reserved.
  
 You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
@@ -20509,7 +20608,31 @@ If you have any questions, comments or interest in pursuing any other use cases,
 ******************************
 
 @metamask/snaps-controllers
-8.2.0 <https://github.com/MetaMask/snaps>
+8.4.0 <https://github.com/MetaMask/snaps>
+Copyright ConsenSys Software Inc. 2021. All rights reserved.
+ 
+You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
+ 
+Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.
+ 
+You are granted a non-exclusive, non-transferable, non-sublicensable license to distribute, publish, copy, modify, merge, combine with another program or create derivative works of the Program (such resulting program, collectively, the “Resulting Program”) solely for Non-Commercial Use as long as you:
+ 1. give prominent notice (“Notice”) with each copy of the Resulting Program that the Program is used in the Resulting Program and that the Program is the copyright of ConsenSys; and
+ 2. subject the Resulting Program and any distribution, publication, copy, modification, merger therewith, combination with another program or derivative works thereof to the same Notice requirement and Non-Commercial Use restriction set forth herein.
+ 
+“Non-Commercial Use” means each use as described in clauses (1)-(3) below, as reasonably determined by ConsenSys in its sole discretion: 
+ 1. personal use for research, personal study, private entertainment, hobby projects or amateur pursuits, in each case without any anticipated commercial application;
+ 2. use by any charitable organization, educational institution, public research organization, public safety or health organization, environmental protection organization or government institution; or
+ 3. the number of monthly active users of the Resulting Program across all versions thereof and platforms globally do not exceed 10,000 at any time.
+ 
+You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos.
+ 
+If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at metamask.license@consensys.net.
+
+
+******************************
+
+@metamask/snaps-controllers
+9.0.0 <https://github.com/MetaMask/snaps>
 Copyright ConsenSys Software Inc. 2021. All rights reserved.
  
 You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
@@ -20533,7 +20656,7 @@ If you have any questions, comments or interest in pursuing any other use cases,
 ******************************
 
 @metamask/snaps-execution-environments
-6.2.0 <https://github.com/MetaMask/snaps>
+6.4.0 <https://github.com/MetaMask/snaps>
 Copyright ConsenSys Software Inc. 2022. All rights reserved.
 
 You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
@@ -20766,7 +20889,7 @@ If you have any questions, comments or interest in pursuing any other use cases,
 ******************************
 
 @metamask/snaps-rpc-methods
-9.1.0 <https://github.com/MetaMask/snaps>
+9.1.3 <https://github.com/MetaMask/snaps>
 Copyright ConsenSys Software Inc. 2021. All rights reserved.
  
 You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
@@ -20790,7 +20913,7 @@ If you have any questions, comments or interest in pursuing any other use cases,
 ******************************
 
 @metamask/snaps-sdk
-4.3.0 <https://github.com/MetaMask/snaps>
+5.0.0 <https://github.com/MetaMask/snaps>
 ISC License
 
 Copyright (c) 2023 MetaMask
@@ -20811,7 +20934,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************
 
 @metamask/snaps-utils
-7.4.0 <https://github.com/MetaMask/snaps>
+7.6.0 <https://github.com/MetaMask/snaps>
 ISC License
 
 Copyright (c) 2022 MetaMask
@@ -23498,7 +23621,7 @@ authors: Kazuhiko Arase
 ******************************
 
 qrcode.react
-1.0.1 <https://github.com/zpao/qrcode.react>
+3.1.0 <https://github.com/zpao/qrcode.react>
 ISC License
 
 Copyright (c) 2015, Paul O’Shannessy
@@ -23515,18 +23638,8 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
-
-******************************
-
-qr.js
-0.0.0 <https://github.com/shtylman/qr.js>
-Copyright (c) 2013 Roman Shtylman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+This product bundles QR Code Generator, which is available under a
+"MIT" license. For details, see src/third-party/qrcodegen.
 
 
 ******************************
@@ -24015,7 +24128,7 @@ SOFTWARE.
 ******************************
 
 react-redux
-7.2.0 <https://github.com/reduxjs/react-redux>
+7.2.9 <https://github.com/reduxjs/react-redux>
 The MIT License (MIT)
 
 Copyright (c) 2015-present Dan Abramov
@@ -25864,7 +25977,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ******************************
 
 rpc-websockets
-7.11.1 <https://github.com/elpheria/rpc-websockets>
+8.0.1 <https://github.com/elpheria/rpc-websockets>
 Copyright (c) Elpheria j.d.o.o.
 
 rpc-websockets is an Open Source project licensed under the terms of
@@ -29118,6 +29231,33 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
     SOFTWARE
 
 
+******************************
+
+@types/hoist-non-react-statics
+3.3.1 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
+
+
 ******************************
 
 @types/jsonwebtoken
@@ -29388,6 +29528,33 @@ authors: Mohamed Hegazy <https://github.com/mhegazy>
     SOFTWARE
 
 
+******************************
+
+@types/react-redux
+7.1.33 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
+
+
 ******************************
 
 @types/react-transition-group
@@ -31555,34 +31722,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 ******************************
 
 ws
-7.4.6 <https://github.com/websockets/ws>
-The MIT License (MIT)
-
-Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-******************************
-
-ws
-7.5.9 <https://github.com/websockets/ws>
+7.5.10 <https://github.com/websockets/ws>
 The MIT License (MIT)
 
 Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
@@ -31609,7 +31749,7 @@ SOFTWARE.
 ******************************
 
 ws
-8.16.0 <https://github.com/websockets/ws>
+8.17.1 <https://github.com/websockets/ws>
 Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>
 Copyright (c) 2013 Arnout Kazemier and contributors
 Copyright (c) 2016 Luigi Pinca and contributors

From 7d3ece74a34a3eb141ee9ce9d0d0cb29840b9848 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Tue, 23 Jul 2024 15:52:24 +0200
Subject: [PATCH 131/236] =?UTF-8?q?fix:=20:label:=20update=20the=20text=20?=
 =?UTF-8?q?in=20the=20popup=20to=20enable=20notifications=20(#2=E2=80=A6?=
 =?UTF-8?q?=20(#26042)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…6026)

## **Description**

This PR fixes the reported bug:
https://github.com/MetaMask/metamask-extension/issues/25994. The PR
changes the text to inform the user about the option to disable
notifications from the notifications settings page (see images). The
ability to enable/disable notifications directly from the general
settings is expected to be implemented in future releases.

<img width="376" alt="Screenshot 2024-07-22 at 22 37 30"
src="https://github.com/user-attachments/assets/a426fb14-fa2c-45fb-a3d1-bde270df17e8">
<img width="371" alt="Screenshot 2024-07-22 at 22 37 38"
src="https://github.com/user-attachments/assets/b178faf5-0a8f-472a-8971-3519e2932726">


[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26026?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/26042?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/_locales/en/messages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index c4bae0ac3fd3..6b0db821c516 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -6023,7 +6023,7 @@
     "message": "Stay in the loop on what's happening in your wallet with notifications."
   },
   "turnOnMetamaskNotificationsMessagePrivacyBold": {
-    "message": "Settings > Notifications."
+    "message": "notifications settings."
   },
   "turnOnMetamaskNotificationsMessagePrivacyLink": {
     "message": "Learn how we protect your privacy while using this feature."
@@ -6032,7 +6032,7 @@
     "message": "To use wallet notifications, we use a profile to sync some settings across your devices. $1"
   },
   "turnOnMetamaskNotificationsMessageThird": {
-    "message": "You can turn off notifications at any time in $1"
+    "message": "You can turn off notifications at any time in the $1"
   },
   "turnOnTokenDetection": {
     "message": "Turn on enhanced token detection"

From 2ee2ade92be14a81a609a82329e1daea2b11e53a Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Tue, 23 Jul 2024 13:45:36 -0400
Subject: [PATCH 132/236] fix (cherry-pick for v12.0.0): vertically align asset
 image (#26056)
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**

Cherry-picks #25988

<!--
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/26056?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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__/asset-picker.test.tsx.snap  | 62 +++++++++++--------
 .../asset-picker/asset-picker.tsx             | 48 +++++++-------
 2 files changed, 60 insertions(+), 50 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
index 2662eb196a76..2f7765a5f200 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
@@ -13,29 +13,33 @@ exports[`AssetPicker matches snapshot 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+          class="mm-box mm-box--display-flex"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
-          >
-            <img
-              aria-hidden="true"
-              class="mm-avatar-token__token-image--blurred"
-              src="./images/eth_logo.svg"
-            />
-            <img
-              alt="NATIVE TICKER logo"
-              class="mm-avatar-token__token-image--size-reduced"
-              src="./images/eth_logo.svg"
-            />
-          </div>
-          <div
-            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+            class="mm-box mm-badge-wrapper mm-box--display-inline-block"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-muted box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
+            >
+              <img
+                aria-hidden="true"
+                class="mm-avatar-token__token-image--blurred"
+                src="./images/eth_logo.svg"
+              />
+              <img
+                alt="NATIVE TICKER logo"
+                class="mm-avatar-token__token-image--size-reduced"
+                src="./images/eth_logo.svg"
+              />
+            </div>
+            <div
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
             >
-              ?
+              <div
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-muted box--border-style-solid box--border-width-1"
+              >
+                ?
+              </div>
             </div>
           </div>
         </div>
@@ -80,20 +84,24 @@ exports[`AssetPicker render if disabled 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
+          class="mm-box mm-box--display-flex"
         >
           <div
-            class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
-          >
-            s
-          </div>
-          <div
-            class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
+            class="mm-box mm-badge-wrapper mm-box--display-inline-block"
           >
             <div
-              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-default box--border-style-solid box--border-width-1"
+              class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
+            >
+              s
+            </div>
+            <div
+              class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
             >
-              ?
+              <div
+                class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-default box--border-style-solid box--border-width-1"
+              >
+                ?
+              </div>
             </div>
           </div>
         </div>
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 85115498a1a7..100c6708fe7e 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -179,30 +179,32 @@ export function AssetPicker({
         title={handleAssetPickerTitle()}
       >
         <Box display={Display.Flex} alignItems={AlignItems.center} gap={3}>
-          <BadgeWrapper
-            badge={
-              <AvatarNetwork
-                size={AvatarNetworkSize.Xs}
-                name={currentNetwork?.nickname}
-                src={currentNetwork?.rpcPrefs?.imageUrl}
-                backgroundColor={testNetworkBackgroundColor}
-                borderColor={
-                  primaryTokenImage
-                    ? BorderColor.borderMuted
-                    : BorderColor.borderDefault
-                }
+          <Box display={Display.Flex}>
+            <BadgeWrapper
+              badge={
+                <AvatarNetwork
+                  size={AvatarNetworkSize.Xs}
+                  name={currentNetwork?.nickname}
+                  src={currentNetwork?.rpcPrefs?.imageUrl}
+                  backgroundColor={testNetworkBackgroundColor}
+                  borderColor={
+                    primaryTokenImage
+                      ? BorderColor.borderMuted
+                      : BorderColor.borderDefault
+                  }
+                />
+              }
+            >
+              <AvatarToken
+                borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}
+                src={primaryTokenImage}
+                size={AvatarTokenSize.Md}
+                showHalo={!isNFT}
+                name={symbol}
+                {...(isNFT && { backgroundColor: BackgroundColor.transparent })}
               />
-            }
-          >
-            <AvatarToken
-              borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}
-              src={primaryTokenImage}
-              size={AvatarTokenSize.Md}
-              showHalo={!isNFT}
-              name={symbol}
-              {...(isNFT && { backgroundColor: BackgroundColor.transparent })}
-            />
-          </BadgeWrapper>
+            </BadgeWrapper>
+          </Box>
 
           <Tooltip disabled={!isSymbolLong} title={symbol} position="bottom">
             <Text className="asset-picker__symbol" variant={TextVariant.bodyMd}>

From 1f754b3b083365fc54325a3bbe5dce9f4cc967d6 Mon Sep 17 00:00:00 2001
From: Ethan Wessel <ejwessel@gmail.com>
Date: Tue, 23 Jul 2024 12:52:38 -0700
Subject: [PATCH 133/236] CP #25047 to Version-v12.0.0 (#25954)
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.
-->

<!--
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/25047?quickstart=1)

Fixes:

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

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

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

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

- [ ] 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.

- [ ] 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.

---------


<!--
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/25954?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

Signed-off-by: Ethan Wessel <ethan.wessel@consensys.net>
Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
Co-authored-by: Erik Marks <rekmarks@protonmail.com>
---
 .../tx-verification-middleware.test.ts        | 255 ++++++++++++++++++
 .../tx-verification-middleware.ts             | 115 ++++++++
 app/scripts/metamask-controller.js            |   6 +
 lavamoat/browserify/beta/policy.json          | 208 ++++++++------
 lavamoat/browserify/desktop/policy.json       | 208 ++++++++------
 lavamoat/browserify/flask/policy.json         | 208 ++++++++------
 lavamoat/browserify/main/policy.json          | 208 ++++++++------
 lavamoat/browserify/mmi/policy.json           | 208 ++++++++------
 package.json                                  |   3 +
 shared/constants/app.ts                       |   2 +
 shared/constants/first-party-contracts.ts     |  26 +-
 shared/constants/verification.ts              |  28 ++
 ui/hooks/useFirstPartyContractName.ts         |  10 +-
 yarn.lock                                     |   5 +-
 14 files changed, 1059 insertions(+), 431 deletions(-)
 create mode 100644 app/scripts/lib/tx-verification/tx-verification-middleware.test.ts
 create mode 100644 app/scripts/lib/tx-verification/tx-verification-middleware.ts
 create mode 100644 shared/constants/verification.ts

diff --git a/app/scripts/lib/tx-verification/tx-verification-middleware.test.ts b/app/scripts/lib/tx-verification/tx-verification-middleware.test.ts
new file mode 100644
index 000000000000..110a2dc3040e
--- /dev/null
+++ b/app/scripts/lib/tx-verification/tx-verification-middleware.test.ts
@@ -0,0 +1,255 @@
+import { NetworkController } from '@metamask/network-controller';
+import { JsonRpcParams, jsonrpc2, Hex } from '@metamask/utils';
+import {
+  EXPERIENCES_TYPE,
+  FIRST_PARTY_CONTRACT_NAMES,
+} from '../../../../shared/constants/first-party-contracts';
+import {
+  createTxVerificationMiddleware,
+  TxParams,
+} from './tx-verification-middleware';
+
+const getMockNetworkController = (chainId: `0x${string}` = '0x1') =>
+  ({ state: { providerConfig: { chainId } } } as unknown as NetworkController);
+
+const mockTrustedSigners: Partial<Record<EXPERIENCES_TYPE, Hex>> = {
+  [EXPERIENCES_TYPE.METAMASK_BRIDGE]:
+    '0xe672B534ccf9876a7554a1dD1685a2a5C2Cc8e8C',
+};
+
+const jsonRpcTemplate = { jsonrpc: jsonrpc2, id: 1 };
+
+const getMiddlewareParams = (method: string, params: JsonRpcParams = []) => {
+  const req = { ...jsonRpcTemplate, method, params };
+  const res = { ...jsonRpcTemplate, result: null };
+  const next = jest.fn();
+  const end = jest.fn();
+  return { req, res, next, end };
+};
+
+const getBridgeTxParams = (txParams: Partial<TxParams> = {}): [TxParams] => {
+  return [
+    {
+      data: '0x1',
+      from: '0x1',
+      to: '0x1',
+      value: '0x1',
+      ...txParams,
+    },
+  ];
+};
+
+describe('tx verification middleware', () => {
+  it('ignores methods other than eth_sendTransaction', () => {
+    const middleware = createTxVerificationMiddleware(
+      getMockNetworkController(),
+      mockTrustedSigners,
+    );
+    const { req, res, next, end } = getMiddlewareParams('foo');
+    middleware(req, res, next, end);
+
+    expect(next).toHaveBeenCalledTimes(1);
+    expect(end).not.toHaveBeenCalled();
+  });
+
+  // @ts-expect-error Our test types are broken
+  it.each([
+    ['null', null],
+    ['string', 'foo'],
+    ['plain object', {}],
+    ['empty array', []],
+    ['array with non-object', ['foo']],
+    ['non-string "data"', [{ data: 1 }]],
+    ['non-string "from"', [{ data: 'data', from: 1 }]],
+    ['non-string "to"', [{ data: 'data', from: 'from', to: 1 }]],
+    [
+      'non-string "value"',
+      [{ data: 'data', from: 'from', to: 'to', value: 1 }],
+    ],
+    [
+      'non-string "chainId"',
+      [{ data: 'data', from: 'from', to: 'to', value: 'value', chainId: 1 }],
+    ],
+    [
+      'non-"0x"-prefixed "chainId"',
+      [{ data: 'data', from: 'from', to: 'to', value: 'value', chainId: '1' }],
+    ],
+  ])(
+    'ignores invalid params: %s',
+    (_: string, invalidParams: JsonRpcParams) => {
+      const middleware = createTxVerificationMiddleware(
+        getMockNetworkController(),
+        mockTrustedSigners,
+      );
+
+      const { req, res, next, end } = getMiddlewareParams(
+        'eth_sendTransaction',
+        invalidParams,
+      );
+      middleware(req, res, next, end);
+
+      expect(next).toHaveBeenCalledTimes(1);
+      expect(end).not.toHaveBeenCalled();
+    },
+  );
+
+  // @ts-expect-error Our test types are broken
+  it.each(Object.keys(FIRST_PARTY_CONTRACT_NAMES['MetaMask Bridge']))(
+    'ignores transactions that are not addressed to the bridge contract for chain %s',
+    (chainId: `0x${string}`) => {
+      const middleware = createTxVerificationMiddleware(
+        getMockNetworkController(),
+        mockTrustedSigners,
+      );
+
+      const { req, res, next, end } = getMiddlewareParams(
+        'eth_sendTransaction',
+        getBridgeTxParams({ chainId, to: '0x1' }),
+      );
+      middleware(req, res, next, end);
+
+      expect(next).toHaveBeenCalledTimes(1);
+      expect(end).not.toHaveBeenCalled();
+    },
+  );
+
+  // @ts-expect-error Our test types are broken
+  it.each(['0x11111', '0x111', '0x222222'])(
+    'ignores transactions that do not have a bridge contract deployed for chain %s',
+    (chainId: `0x${string}`) => {
+      const middleware = createTxVerificationMiddleware(
+        getMockNetworkController(),
+        mockTrustedSigners,
+      );
+
+      const { req, res, next, end } = getMiddlewareParams(
+        'eth_sendTransaction',
+        getBridgeTxParams({ chainId, to: '0x1' }),
+      );
+      middleware(req, res, next, end);
+
+      expect(next).toHaveBeenCalledTimes(1);
+      expect(end).not.toHaveBeenCalled();
+    },
+  );
+
+  it('calls next() if reverse address mapping look up is undefined', () => {
+    const middleware = createTxVerificationMiddleware(
+      getMockNetworkController(),
+      mockTrustedSigners,
+    );
+
+    const { req, res, next, end } = getMiddlewareParams(
+      'eth_sendTransaction',
+      getBridgeTxParams({ ...getFixtures().mapUndefined }),
+    );
+    middleware(req, res, next, end);
+
+    expect(next).toHaveBeenCalledTimes(1);
+    expect(end).not.toHaveBeenCalled();
+  });
+
+  it('calls next() if chainId for `to` address does not match', () => {
+    const middleware = createTxVerificationMiddleware(
+      getMockNetworkController(),
+      mockTrustedSigners,
+    );
+
+    const { req, res, next, end } = getMiddlewareParams(
+      'eth_sendTransaction',
+      getBridgeTxParams({ ...getFixtures().mapIncorrectChain }),
+    );
+    middleware(req, res, next, end);
+
+    expect(next).toHaveBeenCalledTimes(1);
+    expect(end).not.toHaveBeenCalled();
+  });
+
+  it('calls next() if experience type for `to` address is not an experience to verify', () => {
+    const middleware = createTxVerificationMiddleware(
+      getMockNetworkController(),
+      mockTrustedSigners,
+    );
+
+    const { req, res, next, end } = getMiddlewareParams(
+      'eth_sendTransaction',
+      getBridgeTxParams({ ...getFixtures().mapIncorrectExp }),
+    );
+    middleware(req, res, next, end);
+
+    expect(next).toHaveBeenCalledTimes(1);
+    expect(end).not.toHaveBeenCalled();
+  });
+
+  it('passes through a valid bridge transaction', () => {
+    const middleware = createTxVerificationMiddleware(
+      getMockNetworkController(),
+      mockTrustedSigners,
+    );
+
+    const { req, res, next, end } = getMiddlewareParams(
+      'eth_sendTransaction',
+      getBridgeTxParams({ ...getFixtures().valid }),
+    );
+    middleware(req, res, next, end);
+
+    expect(next).toHaveBeenCalledTimes(1);
+    expect(end).not.toHaveBeenCalled();
+  });
+
+  it('rejects modified bridge transactions', () => {
+    const middleware = createTxVerificationMiddleware(
+      getMockNetworkController(),
+      mockTrustedSigners,
+    );
+
+    const { req, res, next, end } = getMiddlewareParams(
+      'eth_sendTransaction',
+      getBridgeTxParams({ ...getFixtures().invalid }),
+    );
+    middleware(req, res, next, end);
+
+    expect(next).not.toHaveBeenCalled();
+    expect(end).toHaveBeenCalledTimes(1);
+  });
+});
+
+/**
+ * Returns bridge transaction validation fixtures.
+ *
+ * @returns The fixtures.
+ */
+function getFixtures() {
+  return {
+    mapIncorrectExp: {
+      data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000f736f636b6574416461707465725632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002800000000000000000000000003a23f943181408eac424116af7b7790c94cb97a50000000000000000000000003a23f943181408eac424116af7b7790c94cb97a5000000000000000000000000000000000000000000000000000000000000a4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000009f295cd5f000000000000000000000000000e6b738da243e8fa2a0ed5915645789add5de515200000000000000000000000000000000000000000000000000000000000001280000019fd025dec0000000000000000000000000e672b534ccf9876a7554a1dd1685a2a5c2cc8e8c000000000000000000000000b8901acb165ed027e32754e0ffe830802919727f000000000000000000000000710bda329b2a6224e4b44833de30f38e7f81d564000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000004614942c423e000000000000000000000000000000000000000000000000000000886c98b760000000000000000000000000000000000000000000000000000000019012a41ba800000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000005dedaf7e04c3f5c842c30ed9a4a19baceb915cdd3e865f0dad99ffca277743a20bac00e0f366e7265f1fcad502791ff49e9c5c98e1841a090df23ce5555051da1c',
+      from: '0xe672b534ccf9876a7554a1dd1685a2a5c2cc8e8c',
+      to: '0xc7bE520a13dC023A1b34C03F4Abdab8A43653F7B',
+      value: '0x470de4df820000',
+    },
+    mapIncorrectChain: {
+      data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000f736f636b6574416461707465725632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002800000000000000000000000003a23f943181408eac424116af7b7790c94cb97a50000000000000000000000003a23f943181408eac424116af7b7790c94cb97a5000000000000000000000000000000000000000000000000000000000000a4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000009f295cd5f000000000000000000000000000e6b738da243e8fa2a0ed5915645789add5de515200000000000000000000000000000000000000000000000000000000000001280000019fd025dec0000000000000000000000000e672b534ccf9876a7554a1dd1685a2a5c2cc8e8c000000000000000000000000b8901acb165ed027e32754e0ffe830802919727f000000000000000000000000710bda329b2a6224e4b44833de30f38e7f81d564000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000004614942c423e000000000000000000000000000000000000000000000000000000886c98b760000000000000000000000000000000000000000000000000000000019012a41ba800000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000005dedaf7e04c3f5c842c30ed9a4a19baceb915cdd3e865f0dad99ffca277743a20bac00e0f366e7265f1fcad502791ff49e9c5c98e1841a090df23ce5555051da1c',
+      from: '0xe672b534ccf9876a7554a1dd1685a2a5c2cc8e8c',
+      to: `0xaEc23140408534b378bf5832defc426dF8604B59`,
+      value: '0x470de4df820000',
+    },
+    mapUndefined: {
+      data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000f736f636b6574416461707465725632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002800000000000000000000000003a23f943181408eac424116af7b7790c94cb97a50000000000000000000000003a23f943181408eac424116af7b7790c94cb97a5000000000000000000000000000000000000000000000000000000000000a4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000009f295cd5f000000000000000000000000000e6b738da243e8fa2a0ed5915645789add5de515200000000000000000000000000000000000000000000000000000000000001280000019fd025dec0000000000000000000000000e672b534ccf9876a7554a1dd1685a2a5c2cc8e8c000000000000000000000000b8901acb165ed027e32754e0ffe830802919727f000000000000000000000000710bda329b2a6224e4b44833de30f38e7f81d564000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000004614942c423e000000000000000000000000000000000000000000000000000000886c98b760000000000000000000000000000000000000000000000000000000019012a41ba800000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000005dedaf7e04c3f5c842c30ed9a4a19baceb915cdd3e865f0dad99ffca277743a20bac00e0f366e7265f1fcad502791ff49e9c5c98e1841a090df23ce5555051da1c',
+      from: '0xe672b534ccf9876a7554a1dd1685a2a5c2cc8e8c',
+      to: '0x0439e60F02a8900a951603950d8D4527f400C3f9',
+      value: '0x470de4df820000',
+    },
+    valid: {
+      data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000f736f636b6574416461707465725632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002800000000000000000000000003a23f943181408eac424116af7b7790c94cb97a50000000000000000000000003a23f943181408eac424116af7b7790c94cb97a5000000000000000000000000000000000000000000000000000000000000a4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000009f295cd5f000000000000000000000000000e6b738da243e8fa2a0ed5915645789add5de515200000000000000000000000000000000000000000000000000000000000001280000019fd025dec0000000000000000000000000e672b534ccf9876a7554a1dd1685a2a5c2cc8e8c000000000000000000000000b8901acb165ed027e32754e0ffe830802919727f000000000000000000000000710bda329b2a6224e4b44833de30f38e7f81d564000000000000000000000000000000000000000000000000000000000000a4b100000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000004614942c423e000000000000000000000000000000000000000000000000000000886c98b760000000000000000000000000000000000000000000000000000000019012a41ba800000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000005dedaf7e04c3f5c842c30ed9a4a19baceb915cdd3e865f0dad99ffca277743a20bac00e0f366e7265f1fcad502791ff49e9c5c98e1841a090df23ce5555051da1c',
+      from: '0xe672b534ccf9876a7554a1dd1685a2a5c2cc8e8c',
+      to: FIRST_PARTY_CONTRACT_NAMES['MetaMask Bridge']['0x1'],
+      value: '0x470de4df820000',
+    },
+    invalid: {
+      data: '0x3ce33bff0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000d6c6966694164617074657256320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000e397c4883ec89ed4fc9d258f00c689708b2799c9000000000000000000000000000000000000000000000000000000000000a4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000466ebb82ac1000000000000000000000000000000000000000000000000000000000000000014000000000000000000000000000000000000000000000000000009f295cd5f000000000000000000000000000c8c0e780960f954c3426a32b6ab453248d632b59000000000000000000000000000000000000000000000000000000000000006c5a39b10a5d458d62482fa1e7e672b534ccf9876a7554a1dd1685a2a5c2cc8e8c0000a4b10002a9de92aa00576661f103ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd00dfeeddeadbeef8932eb23bad9bddb5cf81426f78279a53c6c3b710000000000000000000000000000000000000000',
+      from: '0xe672b534ccf9876a7554a1dd1685a2a5c2cc8e8c',
+      to: FIRST_PARTY_CONTRACT_NAMES['MetaMask Bridge']['0x1'],
+      value: '0x470de4df820000',
+    },
+  } as const;
+}
diff --git a/app/scripts/lib/tx-verification/tx-verification-middleware.ts b/app/scripts/lib/tx-verification/tx-verification-middleware.ts
new file mode 100644
index 000000000000..30782a98721b
--- /dev/null
+++ b/app/scripts/lib/tx-verification/tx-verification-middleware.ts
@@ -0,0 +1,115 @@
+import { hashMessage } from '@ethersproject/hash';
+import { verifyMessage } from '@ethersproject/wallet';
+import type { NetworkController } from '@metamask/network-controller';
+import { rpcErrors } from '@metamask/rpc-errors';
+import {
+  Json,
+  JsonRpcParams,
+  hasProperty,
+  isObject,
+  Hex,
+} from '@metamask/utils';
+import {
+  JsonRpcRequest,
+  JsonRpcResponse,
+  JsonRpcEngineEndCallback,
+  JsonRpcEngineNextCallback,
+} from 'json-rpc-engine';
+import {
+  EXPERIENCES_TO_VERIFY,
+  getExperience,
+  TX_SIG_LEN,
+  TRUSTED_SIGNERS,
+} from '../../../../shared/constants/verification';
+import { MESSAGE_TYPE } from '../../../../shared/constants/app';
+
+export type TxParams = {
+  chainId?: `0x${string}`;
+  data: string;
+  from: string;
+  to: string;
+  value: string;
+};
+
+/**
+ * Creates a middleware function that verifies bridge transactions from the
+ * Portfolio.
+ *
+ * @param networkController - The network controller instance.
+ * @param trustedSigners
+ * @returns The middleware function.
+ */
+export function createTxVerificationMiddleware(
+  networkController: NetworkController,
+  trustedSigners = TRUSTED_SIGNERS,
+) {
+  return function txVerificationMiddleware(
+    req: JsonRpcRequest<JsonRpcParams>,
+    _res: JsonRpcResponse<Json>,
+    next: JsonRpcEngineNextCallback,
+    end: JsonRpcEngineEndCallback,
+  ) {
+    if (
+      req.method !== MESSAGE_TYPE.ETH_SEND_TRANSACTION ||
+      !Array.isArray(req.params) ||
+      !isValidParams(req.params)
+    ) {
+      return next();
+    }
+
+    // the tx object is the first element
+    const params = req.params[0];
+    const chainId =
+      typeof params.chainId === 'string'
+        ? (params.chainId.toLowerCase() as Hex)
+        : networkController.state.providerConfig.chainId;
+
+    const experienceType = getExperience(
+      params.to.toLowerCase() as Hex,
+      chainId,
+    );
+    // if undefined then no address matched - skip OR if experience is not one we want to verify against - skip
+    if (!experienceType || !EXPERIENCES_TO_VERIFY.includes(experienceType)) {
+      return next();
+    }
+
+    const signature = `0x${params.data.slice(-TX_SIG_LEN)}`;
+    const addressToVerify = verifyMessage(hashParams(params), signature);
+    if (addressToVerify !== trustedSigners[experienceType]) {
+      return end(rpcErrors.invalidParams('Invalid transaction signature.'));
+    }
+    return next();
+  };
+}
+
+function hashParams(params: TxParams): string {
+  const paramsToVerify = {
+    to: hashMessage(params.to.toLowerCase()),
+    from: hashMessage(params.from.toLowerCase()),
+    data: hashMessage(
+      params.data.toLowerCase().slice(0, params.data.length - TX_SIG_LEN),
+    ),
+    value: hashMessage(params.value.toLowerCase()),
+  };
+  return hashMessage(JSON.stringify(paramsToVerify));
+}
+
+/**
+ * Checks if the params of a JSON-RPC request are valid `eth_sendTransaction`
+ * params.
+ *
+ * @param params - The params to validate.
+ * @returns Whether the params are valid.
+ */
+function isValidParams(params: Json[]): params is [TxParams] {
+  return (
+    isObject(params[0]) &&
+    typeof params[0].data === 'string' &&
+    typeof params[0].from === 'string' &&
+    typeof params[0].to === 'string' &&
+    typeof params[0].value === 'string' &&
+    (!hasProperty(params[0], 'chainId') ||
+      (typeof params[0].chainId === 'string' &&
+        params[0].chainId.startsWith('0x')))
+  );
+}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e6531ecd897b..f47ae758138b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -223,6 +223,7 @@ import {
   getSmartTransactionsOptInStatus,
   getCurrentChainSupportsSmartTransactions,
 } from '../../shared/modules/selectors';
+import { BaseUrl } from '../../shared/constants/urls';
 import {
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   handleMMITransactionUpdate,
@@ -333,6 +334,7 @@ import AuthenticationController from './controllers/authentication/authenticatio
 import UserStorageController from './controllers/user-storage/user-storage-controller';
 import { PushPlatformNotificationsController } from './controllers/push-platform-notifications/push-platform-notifications';
 import { MetamaskNotificationsController } from './controllers/metamask-notifications/metamask-notifications';
+import { createTxVerificationMiddleware } from './lib/tx-verification/tx-verification-middleware';
 import { updateSecurityAlertResponse } from './lib/ppom/ppom-util';
 
 export const METAMASK_CONTROLLER_EVENTS = {
@@ -5160,6 +5162,10 @@ export default class MetamaskController extends EventEmitter {
     engine.push(createLoggerMiddleware({ origin }));
     engine.push(this.permissionLogController.createMiddleware());
 
+    if (origin === BaseUrl.Portfolio) {
+      engine.push(createTxVerificationMiddleware(this.networkController));
+    }
+
     ///: BEGIN:ONLY_INCLUDE_IF(blockaid)
     engine.push(
       createPPOMMiddleware(
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 4a35b2301dbe..5bab831bbd2d 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -227,12 +227,12 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/keccak256": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/abi>@ethersproject/address": {
@@ -254,18 +254,6 @@
         "@ethersproject/bignumber": true
       }
     },
-    "@ethersproject/abi>@ethersproject/hash": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers>@ethersproject/base64": true
-      }
-    },
     "@ethersproject/abi>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -307,9 +295,36 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+      }
+    },
+    "@ethersproject/hash": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/abstract-signer": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true
       }
     },
     "@ethersproject/hdnode": {
@@ -327,12 +342,6 @@
         "@ethersproject/hdnode>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/hdnode>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
     "@ethersproject/hdnode>@ethersproject/basex": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -376,10 +385,10 @@
     "@ethersproject/hdnode>@ethersproject/wordlists": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/providers": {
@@ -396,39 +405,26 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/base64": true,
         "@ethersproject/hdnode>@ethersproject/basex": true,
         "@ethersproject/hdnode>@ethersproject/sha2": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/providers>@ethersproject/base64": true,
-        "@ethersproject/providers>@ethersproject/random": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
         "@metamask/test-bundler>@ethersproject/networks": true
       }
     },
-    "@ethersproject/providers>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/random": {
       "globals": {
         "crypto.getRandomValues": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@ethersproject/providers>@ethersproject/rlp": {
@@ -448,7 +444,59 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/providers>@ethersproject/base64": true
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/wallet": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets": true,
+        "@ethersproject/wallet>@ethersproject/random": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
+        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -818,7 +866,7 @@
       "packages": {
         "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>@metamask/base-controller": {
@@ -862,7 +910,7 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -1059,7 +1107,7 @@
     },
     "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1074,7 +1122,7 @@
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
@@ -1082,7 +1130,7 @@
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1760,7 +1808,7 @@
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1799,7 +1847,7 @@
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
@@ -1812,7 +1860,7 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1825,7 +1873,7 @@
     },
     "@metamask/network-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1891,7 +1939,7 @@
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2061,17 +2109,11 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/utils": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2086,7 +2128,7 @@
     },
     "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2096,8 +2138,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true
       }
     },
@@ -2109,6 +2151,12 @@
         "immer": true
       }
     },
+    "@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/utils": true,
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2162,7 +2210,7 @@
       },
       "packages": {
         "@metamask/logging-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/signature-controller>@metamask/base-controller": true,
         "@metamask/signature-controller>@metamask/controller-utils": true,
         "@metamask/signature-controller>@metamask/message-manager": true,
@@ -2325,7 +2373,7 @@
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@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,
@@ -2537,7 +2585,7 @@
       "packages": {
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
@@ -2573,7 +2621,7 @@
     },
     "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2593,7 +2641,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
@@ -2678,7 +2726,7 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
@@ -2693,7 +2741,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2731,7 +2779,7 @@
     },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2746,7 +2794,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2776,7 +2824,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
@@ -2808,7 +2856,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/base-controller": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2838,7 +2886,7 @@
     },
     "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2894,14 +2942,6 @@
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true
-      }
-    },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
         "@ethersproject/abi>@ethersproject/logger": true
@@ -2925,7 +2965,7 @@
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
         "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
@@ -2999,7 +3039,7 @@
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
         "@metamask/user-operation-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 5dc9e06d53c0..8a8bac44c7f4 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -227,12 +227,12 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/keccak256": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/abi>@ethersproject/address": {
@@ -254,18 +254,6 @@
         "@ethersproject/bignumber": true
       }
     },
-    "@ethersproject/abi>@ethersproject/hash": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers>@ethersproject/base64": true
-      }
-    },
     "@ethersproject/abi>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -307,9 +295,36 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+      }
+    },
+    "@ethersproject/hash": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/abstract-signer": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true
       }
     },
     "@ethersproject/hdnode": {
@@ -327,12 +342,6 @@
         "@ethersproject/hdnode>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/hdnode>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
     "@ethersproject/hdnode>@ethersproject/basex": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -376,10 +385,10 @@
     "@ethersproject/hdnode>@ethersproject/wordlists": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/providers": {
@@ -396,39 +405,26 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/base64": true,
         "@ethersproject/hdnode>@ethersproject/basex": true,
         "@ethersproject/hdnode>@ethersproject/sha2": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/providers>@ethersproject/base64": true,
-        "@ethersproject/providers>@ethersproject/random": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
         "@metamask/test-bundler>@ethersproject/networks": true
       }
     },
-    "@ethersproject/providers>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/random": {
       "globals": {
         "crypto.getRandomValues": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@ethersproject/providers>@ethersproject/rlp": {
@@ -448,7 +444,59 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/providers>@ethersproject/base64": true
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/wallet": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets": true,
+        "@ethersproject/wallet>@ethersproject/random": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
+        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -818,7 +866,7 @@
       "packages": {
         "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>@metamask/base-controller": {
@@ -862,7 +910,7 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -1204,7 +1252,7 @@
     },
     "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1219,7 +1267,7 @@
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
@@ -1227,7 +1275,7 @@
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1905,7 +1953,7 @@
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1944,7 +1992,7 @@
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
@@ -1957,7 +2005,7 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1970,7 +2018,7 @@
     },
     "@metamask/network-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2036,7 +2084,7 @@
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2154,17 +2202,11 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/utils": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2179,7 +2221,7 @@
     },
     "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2189,8 +2231,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true
       }
     },
@@ -2202,6 +2244,12 @@
         "immer": true
       }
     },
+    "@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/utils": true,
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2255,7 +2303,7 @@
       },
       "packages": {
         "@metamask/logging-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/signature-controller>@metamask/base-controller": true,
         "@metamask/signature-controller>@metamask/controller-utils": true,
         "@metamask/signature-controller>@metamask/message-manager": true,
@@ -2418,7 +2466,7 @@
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@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,
@@ -2630,7 +2678,7 @@
       "packages": {
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
@@ -2666,7 +2714,7 @@
     },
     "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2686,7 +2734,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
@@ -2771,7 +2819,7 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
@@ -2786,7 +2834,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2824,7 +2872,7 @@
     },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2839,7 +2887,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2869,7 +2917,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
@@ -2901,7 +2949,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/base-controller": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2931,7 +2979,7 @@
     },
     "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2987,14 +3035,6 @@
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true
-      }
-    },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
         "@ethersproject/abi>@ethersproject/logger": true
@@ -3018,7 +3058,7 @@
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
         "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
@@ -3092,7 +3132,7 @@
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
         "@metamask/user-operation-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 99decf305b07..794e0b277ac9 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -227,12 +227,12 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/keccak256": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/abi>@ethersproject/address": {
@@ -254,18 +254,6 @@
         "@ethersproject/bignumber": true
       }
     },
-    "@ethersproject/abi>@ethersproject/hash": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers>@ethersproject/base64": true
-      }
-    },
     "@ethersproject/abi>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -307,9 +295,36 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+      }
+    },
+    "@ethersproject/hash": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/abstract-signer": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true
       }
     },
     "@ethersproject/hdnode": {
@@ -327,12 +342,6 @@
         "@ethersproject/hdnode>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/hdnode>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
     "@ethersproject/hdnode>@ethersproject/basex": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -376,10 +385,10 @@
     "@ethersproject/hdnode>@ethersproject/wordlists": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/providers": {
@@ -396,39 +405,26 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/base64": true,
         "@ethersproject/hdnode>@ethersproject/basex": true,
         "@ethersproject/hdnode>@ethersproject/sha2": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/providers>@ethersproject/base64": true,
-        "@ethersproject/providers>@ethersproject/random": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
         "@metamask/test-bundler>@ethersproject/networks": true
       }
     },
-    "@ethersproject/providers>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/random": {
       "globals": {
         "crypto.getRandomValues": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@ethersproject/providers>@ethersproject/rlp": {
@@ -448,7 +444,59 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/providers>@ethersproject/base64": true
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/wallet": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets": true,
+        "@ethersproject/wallet>@ethersproject/random": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
+        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -818,7 +866,7 @@
       "packages": {
         "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>@metamask/base-controller": {
@@ -862,7 +910,7 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -1204,7 +1252,7 @@
     },
     "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1219,7 +1267,7 @@
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
@@ -1227,7 +1275,7 @@
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1905,7 +1953,7 @@
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1944,7 +1992,7 @@
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
@@ -1957,7 +2005,7 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1970,7 +2018,7 @@
     },
     "@metamask/network-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2036,7 +2084,7 @@
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2206,17 +2254,11 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/utils": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2231,7 +2273,7 @@
     },
     "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2241,8 +2283,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true
       }
     },
@@ -2254,6 +2296,12 @@
         "immer": true
       }
     },
+    "@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/utils": true,
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2307,7 +2355,7 @@
       },
       "packages": {
         "@metamask/logging-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/signature-controller>@metamask/base-controller": true,
         "@metamask/signature-controller>@metamask/controller-utils": true,
         "@metamask/signature-controller>@metamask/message-manager": true,
@@ -2470,7 +2518,7 @@
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@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,
@@ -2682,7 +2730,7 @@
       "packages": {
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
@@ -2718,7 +2766,7 @@
     },
     "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2738,7 +2786,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
@@ -2823,7 +2871,7 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
@@ -2838,7 +2886,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2876,7 +2924,7 @@
     },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2891,7 +2939,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2921,7 +2969,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
@@ -2953,7 +3001,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/base-controller": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2983,7 +3031,7 @@
     },
     "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -3039,14 +3087,6 @@
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true
-      }
-    },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
         "@ethersproject/abi>@ethersproject/logger": true
@@ -3070,7 +3110,7 @@
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
         "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
@@ -3144,7 +3184,7 @@
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
         "@metamask/user-operation-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 4a35b2301dbe..5bab831bbd2d 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -227,12 +227,12 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/keccak256": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/abi>@ethersproject/address": {
@@ -254,18 +254,6 @@
         "@ethersproject/bignumber": true
       }
     },
-    "@ethersproject/abi>@ethersproject/hash": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers>@ethersproject/base64": true
-      }
-    },
     "@ethersproject/abi>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -307,9 +295,36 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+      }
+    },
+    "@ethersproject/hash": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/abstract-signer": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true
       }
     },
     "@ethersproject/hdnode": {
@@ -327,12 +342,6 @@
         "@ethersproject/hdnode>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/hdnode>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
     "@ethersproject/hdnode>@ethersproject/basex": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -376,10 +385,10 @@
     "@ethersproject/hdnode>@ethersproject/wordlists": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/providers": {
@@ -396,39 +405,26 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/base64": true,
         "@ethersproject/hdnode>@ethersproject/basex": true,
         "@ethersproject/hdnode>@ethersproject/sha2": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/providers>@ethersproject/base64": true,
-        "@ethersproject/providers>@ethersproject/random": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
         "@metamask/test-bundler>@ethersproject/networks": true
       }
     },
-    "@ethersproject/providers>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/random": {
       "globals": {
         "crypto.getRandomValues": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@ethersproject/providers>@ethersproject/rlp": {
@@ -448,7 +444,59 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/providers>@ethersproject/base64": true
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/wallet": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets": true,
+        "@ethersproject/wallet>@ethersproject/random": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
+        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -818,7 +866,7 @@
       "packages": {
         "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>@metamask/base-controller": {
@@ -862,7 +910,7 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -1059,7 +1107,7 @@
     },
     "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1074,7 +1122,7 @@
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
@@ -1082,7 +1130,7 @@
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1760,7 +1808,7 @@
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1799,7 +1847,7 @@
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
@@ -1812,7 +1860,7 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1825,7 +1873,7 @@
     },
     "@metamask/network-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1891,7 +1939,7 @@
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2061,17 +2109,11 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/utils": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2086,7 +2128,7 @@
     },
     "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2096,8 +2138,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true
       }
     },
@@ -2109,6 +2151,12 @@
         "immer": true
       }
     },
+    "@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/utils": true,
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2162,7 +2210,7 @@
       },
       "packages": {
         "@metamask/logging-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/signature-controller>@metamask/base-controller": true,
         "@metamask/signature-controller>@metamask/controller-utils": true,
         "@metamask/signature-controller>@metamask/message-manager": true,
@@ -2325,7 +2373,7 @@
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@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,
@@ -2537,7 +2585,7 @@
       "packages": {
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
@@ -2573,7 +2621,7 @@
     },
     "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2593,7 +2641,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
@@ -2678,7 +2726,7 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
@@ -2693,7 +2741,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2731,7 +2779,7 @@
     },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2746,7 +2794,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2776,7 +2824,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
@@ -2808,7 +2856,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/base-controller": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2838,7 +2886,7 @@
     },
     "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2894,14 +2942,6 @@
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true
-      }
-    },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
         "@ethersproject/abi>@ethersproject/logger": true
@@ -2925,7 +2965,7 @@
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
         "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
@@ -2999,7 +3039,7 @@
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
         "@metamask/user-operation-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 4fd558e24786..2cf2b367b7d9 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -227,12 +227,12 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/keccak256": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/abi>@ethersproject/address": {
@@ -254,18 +254,6 @@
         "@ethersproject/bignumber": true
       }
     },
-    "@ethersproject/abi>@ethersproject/hash": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/providers>@ethersproject/base64": true
-      }
-    },
     "@ethersproject/abi>@ethersproject/keccak256": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -307,9 +295,36 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+      }
+    },
+    "@ethersproject/hash": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/abstract-signer": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true
+      }
+    },
+    "@ethersproject/hash>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true
       }
     },
     "@ethersproject/hdnode": {
@@ -327,12 +342,6 @@
         "@ethersproject/hdnode>@ethersproject/wordlists": true
       }
     },
-    "@ethersproject/hdnode>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
     "@ethersproject/hdnode>@ethersproject/basex": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
@@ -376,10 +385,10 @@
     "@ethersproject/hdnode>@ethersproject/wordlists": {
       "packages": {
         "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hash": true
       }
     },
     "@ethersproject/providers": {
@@ -396,39 +405,26 @@
         "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/abi>@ethersproject/bytes": true,
         "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/hash": true,
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
-        "@ethersproject/hdnode>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hash>@ethersproject/base64": true,
         "@ethersproject/hdnode>@ethersproject/basex": true,
         "@ethersproject/hdnode>@ethersproject/sha2": true,
         "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/providers>@ethersproject/base64": true,
-        "@ethersproject/providers>@ethersproject/random": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@metamask/test-bundler>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
         "@metamask/test-bundler>@ethersproject/networks": true
       }
     },
-    "@ethersproject/providers>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/random": {
       "globals": {
         "crypto.getRandomValues": true
-      },
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@ethersproject/providers>@ethersproject/rlp": {
@@ -448,7 +444,59 @@
         "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/providers>@ethersproject/base64": true
+        "@ethersproject/hash>@ethersproject/base64": true
+      }
+    },
+    "@ethersproject/wallet": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hash>@ethersproject/abstract-signer": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/signing-key": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets": true,
+        "@ethersproject/wallet>@ethersproject/random": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/bignumber": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/address": true,
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/keccak256": true,
+        "@ethersproject/abi>@ethersproject/logger": true,
+        "@ethersproject/abi>@ethersproject/properties": true,
+        "@ethersproject/abi>@ethersproject/strings": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
+        "@ethersproject/hdnode>@ethersproject/transactions": true,
+        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
+        "@ethersproject/wallet>@ethersproject/random": true,
+        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "@ethersproject/wallet>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/abi>@ethersproject/bytes": true,
+        "@ethersproject/abi>@ethersproject/logger": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -910,7 +958,7 @@
       "packages": {
         "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true
       }
     },
     "@metamask/approval-controller>@metamask/base-controller": {
@@ -954,7 +1002,7 @@
         "@metamask/controller-utils": true,
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "bn.js": true,
         "lodash": true,
@@ -1151,7 +1199,7 @@
     },
     "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1166,7 +1214,7 @@
         "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true,
         "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true,
         "@metamask/eth-sig-util": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "pify": true,
         "sass-loader>klona": true
@@ -1174,7 +1222,7 @@
     },
     "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1852,7 +1900,7 @@
         "@metamask/network-controller>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/json-rpc-engine": true,
         "@metamask/network-controller>@metamask/swappable-obj-proxy": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "browserify>assert": true,
         "uuid": true
@@ -1891,7 +1939,7 @@
       "packages": {
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true,
         "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "node-fetch": true
       }
@@ -1904,7 +1952,7 @@
     },
     "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1917,7 +1965,7 @@
     },
     "@metamask/network-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -1983,7 +2031,7 @@
         "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/permission-controller>nanoid": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
         "immer": true
@@ -2153,17 +2201,11 @@
         "ethereumjs-util>ethereum-cryptography>hash.js": true
       }
     },
-    "@metamask/providers>@metamask/rpc-errors": {
-      "packages": {
-        "@metamask/utils": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
     "@metamask/queued-request-controller": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/queued-request-controller>@metamask/base-controller": true,
         "@metamask/queued-request-controller>@metamask/json-rpc-engine": true,
+        "@metamask/rpc-errors": true,
         "@metamask/selected-network-controller": true,
         "@metamask/utils": true
       }
@@ -2178,7 +2220,7 @@
     },
     "@metamask/queued-request-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2188,8 +2230,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
         "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true
       }
     },
@@ -2201,6 +2243,12 @@
         "immer": true
       }
     },
+    "@metamask/rpc-errors": {
+      "packages": {
+        "@metamask/utils": true,
+        "eth-rpc-errors>fast-safe-stringify": true
+      }
+    },
     "@metamask/rpc-methods-flask>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -2254,7 +2302,7 @@
       },
       "packages": {
         "@metamask/logging-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/signature-controller>@metamask/base-controller": true,
         "@metamask/signature-controller>@metamask/controller-utils": true,
         "@metamask/signature-controller>@metamask/message-manager": true,
@@ -2417,7 +2465,7 @@
         "@metamask/eth-query": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@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,
@@ -2629,7 +2677,7 @@
       "packages": {
         "@metamask/object-multiplex": true,
         "@metamask/post-message-stream": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
@@ -2665,7 +2713,7 @@
     },
     "@metamask/snaps-controllers>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2685,7 +2733,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/phishing-controller>@metamask/controller-utils": true,
@@ -2770,7 +2818,7 @@
     },
     "@metamask/snaps-rpc-methods": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
@@ -2785,7 +2833,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2823,7 +2871,7 @@
     },
     "@metamask/snaps-rpc-methods>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2838,7 +2886,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "superstruct": true
       }
@@ -2868,7 +2916,7 @@
         "fetch": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
         "@metamask/snaps-utils>@metamask/permission-controller": true,
@@ -2900,7 +2948,7 @@
         "console.error": true
       },
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/snaps-utils>@metamask/base-controller": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/controller-utils": true,
         "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": true,
@@ -2930,7 +2978,7 @@
     },
     "@metamask/snaps-utils>@metamask/permission-controller>@metamask/json-rpc-engine": {
       "packages": {
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/safe-event-emitter": true,
         "@metamask/utils": true
       }
@@ -2986,14 +3034,6 @@
         "semver": true
       }
     },
-    "@metamask/test-bundler>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/bytes": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true
-      }
-    },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
         "@ethersproject/abi>@ethersproject/logger": true
@@ -3017,7 +3057,7 @@
         "@metamask/gas-fee-controller": true,
         "@metamask/metamask-eth-abis": true,
         "@metamask/network-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller>@metamask/base-controller": true,
         "@metamask/transaction-controller>@metamask/controller-utils": true,
         "@metamask/transaction-controller>@metamask/nonce-tracker": true,
@@ -3091,7 +3131,7 @@
         "@metamask/assets-controllers>@metamask/polling-controller": true,
         "@metamask/eth-query": true,
         "@metamask/gas-fee-controller": true,
-        "@metamask/providers>@metamask/rpc-errors": true,
+        "@metamask/rpc-errors": true,
         "@metamask/transaction-controller": true,
         "@metamask/user-operation-controller>@metamask/base-controller": true,
         "@metamask/user-operation-controller>@metamask/controller-utils": true,
diff --git a/package.json b/package.json
index 723f3cef2c38..6a269295b465 100644
--- a/package.json
+++ b/package.json
@@ -274,8 +274,10 @@
     "@ethersproject/abi": "^5.6.4",
     "@ethersproject/bignumber": "^5.7.0",
     "@ethersproject/contracts": "^5.7.0",
+    "@ethersproject/hash": "^5.7.0",
     "@ethersproject/hdnode": "^5.6.2",
     "@ethersproject/providers": "^5.7.2",
+    "@ethersproject/wallet": "^5.7.0",
     "@fortawesome/fontawesome-free": "^5.13.0",
     "@keystonehq/bc-ur-registry-eth": "^0.19.1",
     "@keystonehq/metamask-airgapped-keyring": "^0.13.1",
@@ -337,6 +339,7 @@
     "@metamask/providers": "^14.0.2",
     "@metamask/queued-request-controller": "^2.0.0",
     "@metamask/rate-limit-controller": "^5.0.1",
+    "@metamask/rpc-errors": "^6.2.1",
     "@metamask/safe-event-emitter": "^3.1.1",
     "@metamask/scure-bip39": "^2.0.3",
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch",
diff --git a/shared/constants/app.ts b/shared/constants/app.ts
index db176b8bbe93..9aeb58235c5c 100644
--- a/shared/constants/app.ts
+++ b/shared/constants/app.ts
@@ -34,6 +34,8 @@ export const MESSAGE_TYPE = {
   ETH_GET_ENCRYPTION_PUBLIC_KEY: 'eth_getEncryptionPublicKey',
   ETH_GET_BLOCK_BY_NUMBER: 'eth_getBlockByNumber',
   ETH_REQUEST_ACCOUNTS: 'eth_requestAccounts',
+  ETH_SEND_TRANSACTION: 'eth_sendTransaction',
+  ETH_SEND_RAW_TRANSACTION: 'eth_sendRawTransaction',
   ETH_SIGN: 'eth_sign',
   ETH_SIGN_TRANSACTION: 'eth_signTransaction',
   ETH_SIGN_TYPED_DATA: 'eth_signTypedData',
diff --git a/shared/constants/first-party-contracts.ts b/shared/constants/first-party-contracts.ts
index 07c3860a5168..100ef1ec6c7c 100644
--- a/shared/constants/first-party-contracts.ts
+++ b/shared/constants/first-party-contracts.ts
@@ -1,23 +1,35 @@
 import { Hex } from '@metamask/utils';
 import { CHAIN_IDS } from './network';
 
+export enum EXPERIENCES_TYPE {
+  METAMASK_VALIDATOR_STAKING = 'MetaMask Validator Staking',
+  METAMASK_POOLED_STAKING = 'MetaMask Pooled Staking',
+  METAMASK_THIRD_PARTY_STAKING = 'MetaMask Third Party Staking',
+  METAMASK_POOLED_STAKING_V1 = 'MetaMask Pool Staking (v1)',
+  METAMASK_BRIDGE = 'MetaMask Bridge',
+  METAMASK_SWAPS = 'MetaMask Swaps',
+}
+
 /**
  * A map of first-party contract names to their addresses on various chains.
  */
-export const FIRST_PARTY_CONTRACT_NAMES: Record<string, Record<Hex, Hex>> = {
-  'MetaMask Validator Staking': {
+export const FIRST_PARTY_CONTRACT_NAMES: Record<
+  EXPERIENCES_TYPE,
+  Record<Hex, Hex>
+> = {
+  [EXPERIENCES_TYPE.METAMASK_VALIDATOR_STAKING]: {
     [CHAIN_IDS.MAINNET]: '0xDc71aFFC862fceB6aD32BE58E098423A7727bEbd',
   },
-  'MetaMask Pooled Staking': {
+  [EXPERIENCES_TYPE.METAMASK_POOLED_STAKING]: {
     [CHAIN_IDS.MAINNET]: '0x4FEF9D741011476750A243aC70b9789a63dd47Df',
   },
-  'MetaMask Third Party Staking': {
+  [EXPERIENCES_TYPE.METAMASK_THIRD_PARTY_STAKING]: {
     [CHAIN_IDS.MAINNET]: '0x1f6692E78dDE07FF8da75769B6d7c716215bC7D0',
   },
-  'MetaMask Pool Staking (v1)': {
+  [EXPERIENCES_TYPE.METAMASK_POOLED_STAKING_V1]: {
     [CHAIN_IDS.MAINNET]: '0xc7bE520a13dC023A1b34C03F4Abdab8A43653F7B',
   },
-  'MetaMask Bridge': {
+  [EXPERIENCES_TYPE.METAMASK_BRIDGE]: {
     [CHAIN_IDS.MAINNET]: '0x0439e60F02a8900a951603950d8D4527f400C3f1',
     [CHAIN_IDS.OPTIMISM]: '0xB90357f2b86dbfD59c3502215d4060f71DF8ca0e',
     [CHAIN_IDS.BSC]: '0xaEc23140408534b378bf5832defc426dF8604B59',
@@ -28,7 +40,7 @@ export const FIRST_PARTY_CONTRACT_NAMES: Record<string, Record<Hex, Hex>> = {
     [CHAIN_IDS.AVALANCHE]: '0x29106d08382d3c73bF477A94333C61Db1142E1B6',
     [CHAIN_IDS.LINEA_MAINNET]: '0xE3d0d2607182Af5B24f5C3C2E4990A053aDd64e3',
   },
-  'MetaMask Swaps': {
+  [EXPERIENCES_TYPE.METAMASK_SWAPS]: {
     [CHAIN_IDS.MAINNET]: '0x881D40237659C251811CEC9c364ef91dC08D300C',
     [CHAIN_IDS.BSC]: '0x1a1ec25DC08e98e5E93F1104B5e5cdD298707d31',
     [CHAIN_IDS.POLYGON]: '0x1a1ec25DC08e98e5E93F1104B5e5cdD298707d31',
diff --git a/shared/constants/verification.ts b/shared/constants/verification.ts
new file mode 100644
index 000000000000..ce6ddaed9ea9
--- /dev/null
+++ b/shared/constants/verification.ts
@@ -0,0 +1,28 @@
+import { Hex } from '@metamask/utils';
+import {
+  EXPERIENCES_TYPE,
+  FIRST_PARTY_CONTRACT_NAMES,
+} from './first-party-contracts';
+
+export const TX_SIG_LEN = 130;
+export const EXPERIENCES_TO_VERIFY = [EXPERIENCES_TYPE.METAMASK_BRIDGE];
+export const TRUSTED_SIGNERS: Partial<Record<EXPERIENCES_TYPE, Hex>> = {
+  [EXPERIENCES_TYPE.METAMASK_BRIDGE]:
+    '0x533FbF047Ed13C20e263e2576e41c747206d1348',
+};
+
+// look up the corresponding experience provided an address on a chain id
+export const getExperience = (
+  address: Hex,
+  chainId: Hex,
+): EXPERIENCES_TYPE | undefined =>
+  (
+    Object.entries(FIRST_PARTY_CONTRACT_NAMES) as [
+      EXPERIENCES_TYPE,
+      Record<Hex, Hex>,
+    ][]
+  ).find(
+    ([, chainMap]) =>
+      (chainMap[chainId]?.toLowerCase() as Hex) ===
+      (address.toLowerCase() as Hex),
+  )?.[0];
diff --git a/ui/hooks/useFirstPartyContractName.ts b/ui/hooks/useFirstPartyContractName.ts
index 005282886eb8..47468b472955 100644
--- a/ui/hooks/useFirstPartyContractName.ts
+++ b/ui/hooks/useFirstPartyContractName.ts
@@ -1,7 +1,10 @@
 import { NameType } from '@metamask/name-controller';
 import { useSelector } from 'react-redux';
 import { getCurrentChainId } from '../selectors';
-import { FIRST_PARTY_CONTRACT_NAMES } from '../../shared/constants/first-party-contracts';
+import {
+  EXPERIENCES_TYPE,
+  FIRST_PARTY_CONTRACT_NAMES,
+} from '../../shared/constants/first-party-contracts';
 
 export type UseFirstPartyContractNameRequest = {
   value: string;
@@ -25,8 +28,9 @@ export function useFirstPartyContractNames(
     return (
       Object.keys(FIRST_PARTY_CONTRACT_NAMES).find(
         (name) =>
-          FIRST_PARTY_CONTRACT_NAMES[name]?.[chainId]?.toLowerCase() ===
-          normalizedValue,
+          FIRST_PARTY_CONTRACT_NAMES[name as EXPERIENCES_TYPE]?.[
+            chainId
+          ]?.toLowerCase() === normalizedValue,
       ) ?? null
     );
   });
diff --git a/yarn.lock b/yarn.lock
index d3e35606bd6e..2e4d0ce22551 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2826,7 +2826,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethersproject/wallet@npm:5.7.0":
+"@ethersproject/wallet@npm:5.7.0, @ethersproject/wallet@npm:^5.7.0":
   version: 5.7.0
   resolution: "@ethersproject/wallet@npm:5.7.0"
   dependencies:
@@ -24867,8 +24867,10 @@ __metadata:
     "@ethersproject/abi": "npm:^5.6.4"
     "@ethersproject/bignumber": "npm:^5.7.0"
     "@ethersproject/contracts": "npm:^5.7.0"
+    "@ethersproject/hash": "npm:^5.7.0"
     "@ethersproject/hdnode": "npm:^5.6.2"
     "@ethersproject/providers": "npm:^5.7.2"
+    "@ethersproject/wallet": "npm:^5.7.0"
     "@fortawesome/fontawesome-free": "npm:^5.13.0"
     "@keystonehq/bc-ur-registry-eth": "npm:^0.19.1"
     "@keystonehq/metamask-airgapped-keyring": "npm:^0.13.1"
@@ -24944,6 +24946,7 @@ __metadata:
     "@metamask/providers": "npm:^14.0.2"
     "@metamask/queued-request-controller": "npm:^2.0.0"
     "@metamask/rate-limit-controller": "npm:^5.0.1"
+    "@metamask/rpc-errors": "npm:^6.2.1"
     "@metamask/safe-event-emitter": "npm:^3.1.1"
     "@metamask/scure-bip39": "npm:^2.0.3"
     "@metamask/selected-network-controller": "patch:@metamask/selected-network-controller@npm%3A13.0.0#~/.yarn/patches/@metamask-selected-network-controller-npm-13.0.0-b0f6db473a.patch"

From 3f4a54ce02a71c4e0db23cc53cfdf228bfc38024 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Fri, 26 Jul 2024 00:58:49 +0800
Subject: [PATCH 134/236] cherrypick: fix: lock Chrome version to 126 (#26101)
 (#26137)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Chrome version 127 is causing problems on CircleCI. This temporarily
locks the Chrome version to 126.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26101?quickstart=1)

## **Related issues**
## **Manual testing steps**
## **Screenshots/Recordings**
### **Before**
### **After**
## **Pre-merge author checklist**

- [x ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/26137?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Howard Braham <howrad@gmail.com>
---
 test/e2e/webdriver/chrome.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/e2e/webdriver/chrome.js b/test/e2e/webdriver/chrome.js
index fe56f5b77b6f..f3d3eefdafd4 100644
--- a/test/e2e/webdriver/chrome.js
+++ b/test/e2e/webdriver/chrome.js
@@ -61,6 +61,9 @@ class ChromeDriver {
       'download.default_directory': `${process.cwd()}/test-artifacts/downloads`,
     });
 
+    // Temporarily lock to version 126
+    options.setBrowserVersion('126');
+
     // Allow disabling DoT local testing
     if (process.env.SELENIUM_USE_SYSTEM_DN) {
       options.setLocalState({

From 7c7273ccb27fbfb0b8cbdc6a75f08216b37a9c79 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Fri, 26 Jul 2024 20:12:03 +0200
Subject: [PATCH 135/236] 
 V12.0.0/cherry-pick-d6b7829f920e6719ab200b83d15122f6da7747eb (#26118)
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 PR adds a link to the Metametrics page during the onboarding
process to explain to the user how their data will be managed using the
new profile syncing feature.

The user is redirected to this link:

https://support.metamask.io/privacy-and-security/profile-privacy#how-is-the-profile-created

This is the Figma with the requested modification:

https://www.figma.com/design/1otUTgYHYD7A77pgP7wT2v/MetaMetrics-update?node-id=3-275&t=bw8aqpz5nBQ6rTVV-0

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26118?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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 ++
 .../__snapshots__/metametrics.test.js.snap    | 38 ++++++++++---
 .../onboarding-flow/metametrics/index.scss    |  4 --
 .../metametrics/metametrics.js                | 53 +++++++++++++++----
 4 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 6b0db821c516..ace826b2b8dd 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3468,6 +3468,9 @@
     "message": "$1 sell data.  Ever!",
     "description": "$1 represents `onboardingMetametricsNeverEmphasis`"
   },
+  "onboardingMetametricsPrivacyDescription": {
+    "message": "Learn how we protect your privacy while collecting usage data for your profile."
+  },
   "onboardingMetametricsSendAnonymizeLegacy": {
     "message": "Send anonymized click and pageview events"
   },
diff --git a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
index c68e7759e419..0baa19f337f0 100644
--- a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
+++ b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
@@ -16,6 +16,18 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
     >
       We’d like to gather basic usage and diagnostics data to improve MetaMask. Know that we never sell the data you provide here.
     </p>
+    <div
+      class="mm-box mm-box--padding-top-2 mm-box--padding-bottom-2"
+    >
+      <a
+        class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        href="https://support.metamask.io/privacy-and-security/profile-privacy#how-is-the-profile-created"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Learn how we protect your privacy while collecting usage data for your profile.
+      </a>
+    </div>
     <p
       class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-left typography--color-text-default"
     >
@@ -123,20 +135,20 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
       </span>
     </h6>
     <div
-      class="onboarding-metametrics__buttons"
+      class="mm-box onboarding-metametrics__buttons mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full"
     >
-      <button
-        class="button btn--rounded btn-primary btn--large"
-        data-testid="metametrics-i-agree"
-      >
-        I agree
-      </button>
       <button
         class="button btn--rounded btn-secondary btn--large"
         data-testid="metametrics-no-thanks"
       >
         No thanks
       </button>
+      <button
+        class="button btn--rounded btn-primary btn--large"
+        data-testid="metametrics-i-agree"
+      >
+        I agree
+      </button>
     </div>
   </div>
 </div>
@@ -158,6 +170,18 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy
     >
       MetaMask would like to gather usage data to better understand how our users interact with MetaMask. This data will be used to provide the service, which includes improving the service based on your use.
     </p>
+    <div
+      class="mm-box mm-box--padding-top-2 mm-box--padding-bottom-2"
+    >
+      <a
+        class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        href="https://support.metamask.io/privacy-and-security/profile-privacy#how-is-the-profile-created"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Learn how we protect your privacy while collecting usage data for your profile.
+      </a>
+    </div>
     <p
       class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
     >
diff --git a/ui/pages/onboarding-flow/metametrics/index.scss b/ui/pages/onboarding-flow/metametrics/index.scss
index 8860d03ad572..49ee6aa8ab28 100644
--- a/ui/pages/onboarding-flow/metametrics/index.scss
+++ b/ui/pages/onboarding-flow/metametrics/index.scss
@@ -40,10 +40,6 @@
     button {
       margin-bottom: 24px;
       width: 50%;
-
-      @include design-system.screen-sm-min {
-        width: 200px;
-      }
     }
   }
 }
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index 012af2030015..089e8eca1db1 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -6,8 +6,11 @@ import {
   TypographyVariant,
   FONT_WEIGHT,
   TEXT_ALIGN,
+  Display,
+  FlexDirection,
   TextColor,
   IconColor,
+  BlockSize,
 } from '../../../helpers/constants/design-system';
 import Button from '../../../components/ui/button';
 import { useI18nContext } from '../../../hooks/useI18nContext';
@@ -30,10 +33,12 @@ import {
 
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
+  Box as BoxComponent,
   Checkbox,
   Icon,
   IconName,
   IconSize,
+  Text,
 } from '../../../components/component-library';
 import { PRIVACY_POLICY_DATE } from '../../../helpers/constants/privacy-policy';
 
@@ -127,6 +132,17 @@ export default function OnboardingMetametrics() {
         >
           {t('onboardingMetametricsDescriptionLegacy')}
         </Typography>
+        <BoxComponent paddingTop={2} paddingBottom={2}>
+          <Text
+            color={TextColor.primaryDefault}
+            as="a"
+            href="https://support.metamask.io/privacy-and-security/profile-privacy#how-is-the-profile-created"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            {t('onboardingMetametricsPrivacyDescription')}
+          </Text>
+        </BoxComponent>
         <Typography
           className="onboarding-metametrics__desc"
           align={TEXT_ALIGN.CENTER}
@@ -284,6 +300,17 @@ export default function OnboardingMetametrics() {
         >
           {t('onboardingMetametricsDescription')}
         </Typography>
+        <BoxComponent paddingTop={2} paddingBottom={2}>
+          <Text
+            color={TextColor.primaryDefault}
+            as="a"
+            href="https://support.metamask.io/privacy-and-security/profile-privacy#how-is-the-profile-created"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            {t('onboardingMetametricsPrivacyDescription')}
+          </Text>
+        </BoxComponent>
         <Typography
           className="onboarding-metametrics__desc"
           align={TEXT_ALIGN.LEFT}
@@ -377,15 +404,13 @@ export default function OnboardingMetametrics() {
           ])}
         </Typography>
 
-        <div className="onboarding-metametrics__buttons">
-          <Button
-            data-testid="metametrics-i-agree"
-            type="primary"
-            large
-            onClick={onConfirm}
-          >
-            {t('onboardingMetametricsAgree')}
-          </Button>
+        <BoxComponent
+          display={Display.Flex}
+          flexDirection={FlexDirection.Row}
+          width={BlockSize.Full}
+          className="onboarding-metametrics__buttons"
+          gap={4}
+        >
           <Button
             data-testid="metametrics-no-thanks"
             type="secondary"
@@ -394,7 +419,15 @@ export default function OnboardingMetametrics() {
           >
             {t('noThanks')}
           </Button>
-        </div>
+          <Button
+            data-testid="metametrics-i-agree"
+            type="primary"
+            large
+            onClick={onConfirm}
+          >
+            {t('onboardingMetametricsAgree')}
+          </Button>
+        </BoxComponent>
       </div>
     );
   };

From 1aa8963f8453f4fa50cc1d5de8956d6813719ea1 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 26 Jul 2024 15:31:43 -0230
Subject: [PATCH 136/236] Version v11.16.16

---
 CHANGELOG.md | 7 ++++++-
 package.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 895d1e731fd2..656e56abe395 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.16.16]
+### Changed
+- Update Blockaid feature for latest security enhancements ([#26167](https://github.com/MetaMask/metamask-extension/pull/26167))
+
 ## [11.16.15]
 ### Changed
 - Updates MMI packages, support for a custodian has been removed ([#25502](https://github.com/MetaMask/metamask-extension/pull/25502))
@@ -4829,7 +4833,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.15...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.16.16...HEAD
+[11.16.16]: https://github.com/MetaMask/metamask-extension/compare/v11.16.15...v11.16.16
 [11.16.15]: https://github.com/MetaMask/metamask-extension/compare/v11.16.14...v11.16.15
 [11.16.14]: https://github.com/MetaMask/metamask-extension/compare/v11.16.13...v11.16.14
 [11.16.13]: https://github.com/MetaMask/metamask-extension/compare/v11.16.12...v11.16.13
diff --git a/package.json b/package.json
index adf526229c23..2fa1f483d7d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "11.16.15",
+  "version": "11.16.16",
   "private": true,
   "repository": {
     "type": "git",

From 8abc2b27441c2393d1e91962d78ab7b993ec74a2 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Fri, 26 Jul 2024 23:51:35 +0530
Subject: [PATCH 137/236] cherry-pick: PPOM blockaid update (#26167)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Update @blockaid/ppom_release package to version 1.5.1

## **Related issues**

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

## **Manual testing steps**
NA

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 package.json                                         |  2 +-
 .../__snapshots__/blockaid-banner-alert.test.js.snap | 12 ++++++------
 yarn.lock                                            | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 2fa1f483d7d6..87ec9fc96c79 100644
--- a/package.json
+++ b/package.json
@@ -259,7 +259,7 @@
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
-    "@blockaid/ppom_release": "^1.4.8",
+    "@blockaid/ppom_release": "^1.5.1",
     "@contentful/rich-text-html-renderer": "^16.3.5",
     "@ensdomains/content-hash": "^2.5.7",
     "@ethereumjs/tx": "^4.1.1",
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 15e9a2a366cd..acdb5d129516 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
@@ -54,7 +54,7 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
                 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.8%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%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"
                 >
@@ -151,7 +151,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.8%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
                   rel="noopener noreferrer"
                   target="_blank"
                 >
@@ -248,7 +248,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.8%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%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"
                 >
@@ -346,7 +346,7 @@ exports[`Blockaid Banner Alert should render details section even when features
                   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.8%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%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"
                   >
@@ -457,7 +457,7 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
                   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.8%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"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%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"
                   >
@@ -556,7 +556,7 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
                   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.8%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%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"
                   >
diff --git a/yarn.lock b/yarn.lock
index 16e910a709b0..9385de8e4ef5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1729,10 +1729,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@blockaid/ppom_release@npm:^1.4.8":
-  version: 1.4.8
-  resolution: "@blockaid/ppom_release@npm:1.4.8"
-  checksum: a8b7e94e54fdfd4a0fdde096f9302c7bbba18eec7b02e1f1163ec3848d25f12b3a7ff41be3f949ef7b77317c611aaec680d15c50f51b1f03244e3b1c2b9c4aed
+"@blockaid/ppom_release@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "@blockaid/ppom_release@npm:1.5.1"
+  checksum: e2283240e484b60525501772bc5c57e86a30eb153227168eb52584061ac7e10c717bb4a858bfcf0bbdd590033675c193a3a41de2658d066baef210ec48ed7a6e
   languageName: node
   linkType: hard
 
@@ -25301,7 +25301,7 @@ __metadata:
     "@babel/preset-typescript": "npm:^7.23.2"
     "@babel/register": "npm:^7.22.15"
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch"
-    "@blockaid/ppom_release": "npm:^1.4.8"
+    "@blockaid/ppom_release": "npm:^1.5.1"
     "@contentful/rich-text-html-renderer": "npm:^16.3.5"
     "@ensdomains/content-hash": "npm:^2.5.7"
     "@ethereumjs/tx": "npm:^4.1.1"

From 31bbb3c3bfad57fc40a0a4dd7f668cfbce0c78dd Mon Sep 17 00:00:00 2001
From: Ethan Wessel <ejwessel@gmail.com>
Date: Mon, 29 Jul 2024 02:11:56 -0700
Subject: [PATCH 138/236] fix (cherry-pick for v12.0.0):  max insufficient
 funds for gas (#26177)
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**

Cherry Pick 40300a654e0d6c6537e81b385ca7502c6c152c1f into
Version-v12.0.0

<!--
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/26177?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../asset-picker-amount.stories.tsx           |  6 ++
 .../asset-picker-amount.test.tsx              | 83 ++++++++++++++++++-
 .../asset-picker-amount.tsx                   | 10 ++-
 ui/ducks/send/send.js                         |  4 +-
 4 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-amount.stories.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-amount.stories.tsx
index c7e73f377e70..1f22ad544f0d 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-amount.stories.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-amount.stories.tsx
@@ -79,6 +79,12 @@ const store = configureStore({
           error: null,
           type: 'NATIVE',
         },
+        receiveAsset: {
+          balance: '0x1158e460913d00000',
+          details: null,
+          error: null,
+          type: 'NATIVE',
+        },
         fromAccount: null,
         gas: {
           error: null,
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx
index 470ca9543d46..a5215202db1c 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-amount.test.tsx
@@ -56,7 +56,11 @@ describe('AssetPickerAmount', () => {
         return { address: '0xAddress' };
       }
       if (selector === getCurrentDraftTransaction) {
-        return { swapQuotesError: null };
+        return {
+          swapQuotesError: null,
+          sendAsset: { type: AssetType.token },
+          receiveAsset: { type: AssetType.token },
+        };
       }
       if (selector === getIsNativeSendPossible) {
         return true;
@@ -84,13 +88,73 @@ describe('AssetPickerAmount', () => {
     expect(screen.getByText('MaxClearButton')).toBeInTheDocument();
   });
 
+  it('renders AssetPickerAmount does not show max button when srcAsset type is native and destAsset type is ERC20', () => {
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === getSelectedInternalAccount) {
+        return { address: '0xAddress' };
+      }
+      if (selector === getCurrentDraftTransaction) {
+        return {
+          swapQuotesError: null,
+          sendAsset: { type: AssetType.native },
+          receiveAsset: { type: AssetType.token },
+        };
+      }
+      if (selector === getIsNativeSendPossible) {
+        return true;
+      }
+      if (selector === getSendMaxModeState) {
+        return false;
+      }
+      return undefined;
+    });
+    render(<AssetPickerAmount {...defaultProps} />);
+
+    expect(screen.getByText('AssetPicker')).toBeInTheDocument();
+    expect(screen.getByText('SwappableCurrencyInput')).toBeInTheDocument();
+    expect(screen.getByText('AssetBalance')).toBeInTheDocument();
+    expect(screen.queryByText('MaxClearButton')).toBeNull();
+  });
+
+  it('renders AssetPickerAmount does shows max button when srcAsset type is ERC20 and destAsset type is native', () => {
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === getSelectedInternalAccount) {
+        return { address: '0xAddress' };
+      }
+      if (selector === getCurrentDraftTransaction) {
+        return {
+          swapQuotesError: null,
+          sendAsset: { type: AssetType.token },
+          receiveAsset: { type: AssetType.native },
+        };
+      }
+      if (selector === getIsNativeSendPossible) {
+        return true;
+      }
+      if (selector === getSendMaxModeState) {
+        return false;
+      }
+      return undefined;
+    });
+    render(<AssetPickerAmount {...defaultProps} />);
+
+    expect(screen.getByText('AssetPicker')).toBeInTheDocument();
+    expect(screen.getByText('SwappableCurrencyInput')).toBeInTheDocument();
+    expect(screen.getByText('AssetBalance')).toBeInTheDocument();
+    expect(screen.getByText('MaxClearButton')).toBeInTheDocument();
+  });
+
   it('shows swaps error message when there is an error', () => {
     useSelectorMock.mockImplementation((selector) => {
       if (selector === getSelectedInternalAccount) {
         return { address: '0xAddress' };
       }
       if (selector === getCurrentDraftTransaction) {
-        return { swapQuotesError: 'error' };
+        return {
+          swapQuotesError: 'error',
+          sendAsset: { type: AssetType.native },
+          receiveAsset: { type: AssetType.token },
+        };
       }
       if (selector === getIsNativeSendPossible) {
         return true;
@@ -118,7 +182,10 @@ describe('AssetPickerAmount', () => {
         return { address: '0xAddress' };
       }
       if (selector === getCurrentDraftTransaction) {
-        return { swapQuotesError: null };
+        return {
+          sendAsset: { type: AssetType.native },
+          receiveAsset: { type: AssetType.token },
+        };
       }
       if (selector === getIsNativeSendPossible) {
         return false;
@@ -140,6 +207,16 @@ describe('AssetPickerAmount', () => {
       onAmountChange: undefined,
     };
 
+    useSelectorMock.mockImplementation((selector) => {
+      if (selector === getCurrentDraftTransaction) {
+        return {
+          sendAsset: { type: AssetType.native },
+          receiveAsset: { type: AssetType.token },
+        };
+      }
+      return undefined;
+    });
+
     render(<AssetPickerAmount {...propsWithoutOnAmountChange} />);
 
     expect(screen.queryByText('MaxClearButton')).not.toBeInTheDocument();
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
index 80e946fe3934..190da522cad2 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
@@ -62,7 +62,9 @@ export const AssetPickerAmount = ({
   const selectedAccount = useSelector(getSelectedInternalAccount);
   const t = useI18nContext();
 
-  const { swapQuotesError } = useSelector(getCurrentDraftTransaction);
+  const { swapQuotesError, sendAsset, receiveAsset } = useSelector(
+    getCurrentDraftTransaction,
+  );
   const isDisabled = !onAmountChange;
   const isSwapsErrorShown = isDisabled && swapQuotesError;
 
@@ -135,6 +137,10 @@ export const AssetPickerAmount = ({
     borderColor = BorderColor.primaryDefault;
   }
 
+  const isSwapAndSendFromNative =
+    sendAsset.type === AssetType.native &&
+    receiveAsset.type !== AssetType.native;
+
   return (
     <Box className="asset-picker-amount">
       <Box
@@ -171,7 +177,7 @@ export const AssetPickerAmount = ({
           </Text>
         )}
         {/* The fiat value will always leave dust and is often inaccurate anyways */}
-        {onAmountChange && isNativeSendPossible && (
+        {onAmountChange && isNativeSendPossible && !isSwapAndSendFromNative && (
           <MaxClearButton asset={asset} />
         )}
       </Box>
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 08b6aba836ca..9a6a4dd971be 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -1151,7 +1151,9 @@ const slice = createSlice({
       // if amount mode is MAX update amount to max of new asset, otherwise set
       // to zero. This will revalidate the send amount field.
       if (state.amountMode === AMOUNT_MODES.MAX) {
-        slice.caseReducers.updateAmountToMax(state);
+        // set amount mode back to input and change the send amount back to 0
+        state.amountMode = AMOUNT_MODES.INPUT;
+        slice.caseReducers.updateSendAmount(state, { payload: '0x0' });
       } else if (initialAssetSet === false) {
         if (isReceived) {
           draftTransaction.quotes = draftTransactionInitialState.quotes;

From 6180c913dae4324046b7e3c85dcb3941e948bd8d Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Mon, 29 Jul 2024 05:25:27 -0700
Subject: [PATCH 139/236] fix (cherry-pick for v12.0.0): fix network dropdown
 in confirmationpage #25285 (#26175)
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**

Cherry Pick 69ec573731ea154129f34536cbd9291716220909 into
Version-v12.0.0

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26175?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

Signed-off-by: Ethan Wessel <ethan.wessel@consensys.net>
Co-authored-by: George Marshall <george.marshall@consensys.net>
---
 app/_locales/am/messages.json                 |   3 -
 app/_locales/ar/messages.json                 |   3 -
 app/_locales/bg/messages.json                 |   3 -
 app/_locales/bn/messages.json                 |   3 -
 app/_locales/ca/messages.json                 |   3 -
 app/_locales/cs/messages.json                 |   3 -
 app/_locales/da/messages.json                 |   3 -
 app/_locales/de/messages.json                 |   3 -
 app/_locales/el/messages.json                 |   3 -
 app/_locales/en/messages.json                 |   3 -
 app/_locales/es/messages.json                 |   3 -
 app/_locales/es_419/messages.json             |   3 -
 app/_locales/et/messages.json                 |   3 -
 app/_locales/fa/messages.json                 |   3 -
 app/_locales/fi/messages.json                 |   3 -
 app/_locales/fil/messages.json                |   3 -
 app/_locales/fr/messages.json                 |   3 -
 app/_locales/he/messages.json                 |   3 -
 app/_locales/hi/messages.json                 |   3 -
 app/_locales/hn/messages.json                 |   3 -
 app/_locales/hr/messages.json                 |   3 -
 app/_locales/ht/messages.json                 |   3 -
 app/_locales/hu/messages.json                 |   3 -
 app/_locales/id/messages.json                 |   3 -
 app/_locales/it/messages.json                 |   3 -
 app/_locales/ja/messages.json                 |   3 -
 app/_locales/kn/messages.json                 |   3 -
 app/_locales/ko/messages.json                 |   3 -
 app/_locales/lt/messages.json                 |   3 -
 app/_locales/lv/messages.json                 |   3 -
 app/_locales/ms/messages.json                 |   3 -
 app/_locales/nl/messages.json                 |   3 -
 app/_locales/no/messages.json                 |   3 -
 app/_locales/ph/messages.json                 |   3 -
 app/_locales/pl/messages.json                 |   3 -
 app/_locales/pt/messages.json                 |   3 -
 app/_locales/pt_BR/messages.json              |   3 -
 app/_locales/ro/messages.json                 |   3 -
 app/_locales/ru/messages.json                 |   3 -
 app/_locales/sk/messages.json                 |   3 -
 app/_locales/sl/messages.json                 |   3 -
 app/_locales/sr/messages.json                 |   3 -
 app/_locales/sv/messages.json                 |   3 -
 app/_locales/sw/messages.json                 |   3 -
 app/_locales/ta/messages.json                 |   3 -
 app/_locales/th/messages.json                 |   3 -
 app/_locales/tl/messages.json                 |   3 -
 app/_locales/tr/messages.json                 |   3 -
 app/_locales/uk/messages.json                 |   3 -
 app/_locales/vi/messages.json                 |   3 -
 app/_locales/zh_CN/messages.json              |   3 -
 app/_locales/zh_TW/messages.json              |   3 -
 ui/components/app/network-display/index.scss  |  36 +----
 .../app/network-display/network-display.js    | 134 +++---------------
 .../network-display.stories.js                |  99 +------------
 ...ge-container-header.component.test.js.snap |  25 ++--
 ...ture-request-header.component.test.js.snap |  46 +++---
 .../confirm-send-ether.test.js.snap           |  23 ++-
 .../confirmation/confirmation.js              |   6 +-
 .../add-ethereum-chain.test.js.snap           |  25 ++--
 .../switch-ethereum-chain.test.js.snap        |  50 +++----
 61 files changed, 90 insertions(+), 510 deletions(-)

diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index a4a0dc58e868..cb193bc11c36 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -69,9 +69,6 @@
   "asset": {
     "message": "ሐብት"
   },
-  "attemptingConnect": {
-    "message": "ከ blockchain ጋር ለመገናኘት መሞከር።"
-  },
   "attributions": {
     "message": "አይነታ"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index bc33690c7945..e262cebf3537 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -79,9 +79,6 @@
   "asset": {
     "message": "الأصل"
   },
-  "attemptingConnect": {
-    "message": "محاولة الاتصال بسلسلة الكتل."
-  },
   "attributions": {
     "message": "الصفات"
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index cfe0f8de68a3..2169f13ecf9d 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Актив"
   },
-  "attemptingConnect": {
-    "message": "Опит за свързване с blockchain."
-  },
   "attributions": {
     "message": "Функции"
   },
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 592a9a593f28..29e06173be17 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "সম্পদ"
   },
-  "attemptingConnect": {
-    "message": "ব্লকচেনে সংযোগ করার চেষ্টা করছে।"
-  },
   "attributions": {
     "message": "গুণাবলী"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index 93555423be6d..4393ea21f108 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Actius"
   },
-  "attemptingConnect": {
-    "message": "Intentant conectar a blockchain."
-  },
   "attributions": {
     "message": "Atribucions"
   },
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index fc050b199d2d..f67d21b5cb52 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -39,9 +39,6 @@
   "approved": {
     "message": "Schváleno"
   },
-  "attemptingConnect": {
-    "message": "Pokouším se připojit k blockchainu."
-  },
   "attributions": {
     "message": "Zásluhy"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 9d89b573a536..f5d7c9c89c3e 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Aktiv"
   },
-  "attemptingConnect": {
-    "message": "Forsøger at oprette forbindelse til blokkæden."
-  },
   "attributions": {
     "message": "Tilskrivninger"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index addd2939cd81..991981b23bb8 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Versuch, den Swap kostenlos zu stornieren"
   },
-  "attemptingConnect": {
-    "message": "Versuch einer Verbindung zur Blockchain."
-  },
   "attributions": {
     "message": "Zuschreibungen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index ce6f24891c60..94aca613679c 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Προσπάθεια ακύρωσης των ανταλλαγών δωρεάν"
   },
-  "attemptingConnect": {
-    "message": "Προσπάθεια σύνδεσης στο blockchain."
-  },
   "attributions": {
     "message": "Αποδόσεις"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index ace826b2b8dd..8ac184cfd38c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -530,9 +530,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Attempt to cancel swap for free"
   },
-  "attemptingConnect": {
-    "message": "Attempting to connect to blockchain."
-  },
   "attributions": {
     "message": "Attributions"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index e0e7a7ddcd05..e5739a02f0f5 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Intente cancelar el intercambio de forma gratuita"
   },
-  "attemptingConnect": {
-    "message": "Intentando una conexión a la cadena de bloques."
-  },
   "attributions": {
     "message": "Atribuciones"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index b2f763ced384..662a7f3ede27 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -214,9 +214,6 @@
   "assetOptions": {
     "message": "Opciones de activos"
   },
-  "attemptingConnect": {
-    "message": "Intentando una conexión a la cadena de bloques."
-  },
   "attributions": {
     "message": "Atribuciones"
   },
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index cba62eb1d7d9..dbfe1f88fb55 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Vara"
   },
-  "attemptingConnect": {
-    "message": "Plokiahelaga ühenduse loomise katse."
-  },
   "attributions": {
     "message": "Omistamised"
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index 3f2e3a703f01..9f1d89793c1b 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "سرمایه"
   },
-  "attemptingConnect": {
-    "message": "در حال تلاش برای اتصال با زنجیره بلوکی"
-  },
   "attributions": {
     "message": "مواصفات"
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index a907aeedbd9e..4f193797912c 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Omaisuuserä"
   },
-  "attemptingConnect": {
-    "message": "Yritetään yhdistää lohkoketjuun."
-  },
   "attributions": {
     "message": "Attribuutiot"
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 040a687f7633..ab098442e52e 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -66,9 +66,6 @@
   "approved": {
     "message": "Inaprubahan"
   },
-  "attemptingConnect": {
-    "message": "Sinusubukang kumonekta sa blockchain."
-  },
   "attributions": {
     "message": "Mga Attribution"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 2a3a6a80749a..2cc719c01991 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Tentative d’annuler gratuitement le swap"
   },
-  "attemptingConnect": {
-    "message": "Tentative de connexion au réseau"
-  },
   "attributions": {
     "message": "Attributions"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index 22f5ac53511e..e29f44c9f834 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "נכס"
   },
-  "attemptingConnect": {
-    "message": "מנסה להתחבר לבלוקצ'יין."
-  },
   "attributions": {
     "message": "תכונות"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 20ec2edf614a..ee2adaf2087c 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "स्वैप को मुफ्त में कैंसिल करने की कोशिश करें"
   },
-  "attemptingConnect": {
-    "message": "ब्लॉकचेन से कनेक्ट करने की कोशिश कर रहे हैं।"
-  },
   "attributions": {
     "message": "एट्रीब्यूशन्स"
   },
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
index 8dc338db6dc1..03c87498c87f 100644
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@@ -33,9 +33,6 @@
   "approve": {
     "message": "मंजूर"
   },
-  "attemptingConnect": {
-    "message": "ब्लॉकचैन से कनेक्ट करने का प्रयास करना होगा।सब्र करे।"
-  },
   "attributions": {
     "message": "एट्रिब्यूशन"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index 3d259868534a..d7e62da80ba4 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Imovina"
   },
-  "attemptingConnect": {
-    "message": "Pokušaj povezivanja na podatkovni blok."
-  },
   "attributions": {
     "message": "Svojstva"
   },
diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
index 94bad1913fe6..02f06746a58a 100644
--- a/app/_locales/ht/messages.json
+++ b/app/_locales/ht/messages.json
@@ -60,9 +60,6 @@
   "approved": {
     "message": "Apwouve"
   },
-  "attemptingConnect": {
-    "message": "Eseye konekte nan blockchain."
-  },
   "attributions": {
     "message": "Atribisyon"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 21d413aa64a3..456b63710dd6 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Eszköz"
   },
-  "attemptingConnect": {
-    "message": "Próbálunk csatlakozni a blokklánchoz."
-  },
   "attributions": {
     "message": "Attribúciók"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 0f2062fe9765..dadb3eca200d 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Mencoba membatalkan pertukaran secara gratis"
   },
-  "attemptingConnect": {
-    "message": "Mencoba terhubung ke blockchain."
-  },
   "attributions": {
     "message": "Atribusi"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 6a43d90d1624..2ca832f39006 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -297,9 +297,6 @@
   "attemptSendingAssets": {
     "message": "Se si tenta di inviare risorse direttamente da una rete all'altra, ciò potrebbe comportare una perdita permanente della risorca coinvolta. Assicurati di usare un bridge."
   },
-  "attemptingConnect": {
-    "message": "Tentativo di connessione alla blockchain."
-  },
   "attributions": {
     "message": "Attribuzioni"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 120cf43805fb..b3ac5ec3ebd8 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "無料でスワップのキャンセルを試行"
   },
-  "attemptingConnect": {
-    "message": "ブロックチェーンへの接続を試みています。"
-  },
   "attributions": {
     "message": "属性"
   },
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 0e44c06e69ce..0b0479e3dddf 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "ಆಸ್ತಿ"
   },
-  "attemptingConnect": {
-    "message": "ಬ್ಲಾಕ್‌ಚೈನ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ."
-  },
   "attributions": {
     "message": "ಗುಣಲಕ್ಷಣಗಳು"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 15558fc6e1ee..f4250affbac7 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "무료 스왑 취소 시도"
   },
-  "attemptingConnect": {
-    "message": "블록체인에 연결 중입니다."
-  },
   "attributions": {
     "message": "속성"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index 893d0a345fd5..0600ea96f32b 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Turtas"
   },
-  "attemptingConnect": {
-    "message": "Mėginama prisijungti prie „blockchain“."
-  },
   "attributions": {
     "message": "Požymiai"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index bf058e6bb2fe..c0dfc6d573b8 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Aktīvs"
   },
-  "attemptingConnect": {
-    "message": "Mēģina izveidot savienojumu ar bloku ķēdi."
-  },
   "attributions": {
     "message": "Atribūti"
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index 61e4c37cae7a..b8a0cb2ac507 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Aset"
   },
-  "attemptingConnect": {
-    "message": "Sedang cuba menyambungkan kepada rantaian blok."
-  },
   "attributions": {
     "message": "Atribusi"
   },
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index fc847537e00b..f3ae82f80616 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -33,9 +33,6 @@
   "approve": {
     "message": "Goedkeuren"
   },
-  "attemptingConnect": {
-    "message": "Poging om verbinding te maken met blockchain."
-  },
   "attributions": {
     "message": "Bevoegdheden"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index c2825ea5bfe7..56c05ffd958c 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Ressurs"
   },
-  "attemptingConnect": {
-    "message": "Prøver å opprette forbindelse med blokkjede"
-  },
   "attributions": {
     "message": "Henvisninger"
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 3d3b2428bac3..fbace0f2117f 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -134,9 +134,6 @@
   "assetOptions": {
     "message": "Mga opsyon sa asset"
   },
-  "attemptingConnect": {
-    "message": "Sinusubukang kumonekta sa blockchain."
-  },
   "attributions": {
     "message": "Mga Attribution"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index a49b7bd23b16..dbc986a194e4 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Składnik aktywów"
   },
-  "attemptingConnect": {
-    "message": "Próba połączenia z blockchainem."
-  },
   "attributions": {
     "message": "Atrybuty"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index b48d5c4e8c48..8a88bdcf5dbf 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Tentar cancelar a troca sem custo"
   },
-  "attemptingConnect": {
-    "message": "Tentando conexão com a blockchain."
-  },
   "attributions": {
     "message": "Atribuições"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index cc4c97e70ff6..688f5758ac26 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -214,9 +214,6 @@
   "assetOptions": {
     "message": "Opções do ativo"
   },
-  "attemptingConnect": {
-    "message": "Tentando conexão com o blockchain."
-  },
   "attributions": {
     "message": "Atribuições"
   },
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index fa02911ca8f3..a7f916825e57 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Activ"
   },
-  "attemptingConnect": {
-    "message": "Se încearcă conectarea la blockchain."
-  },
   "attributions": {
     "message": "Atribuții"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index c9cdd53e9f23..fb2446c6b16c 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Бесплатная попытка отменить своп"
   },
-  "attemptingConnect": {
-    "message": "Попытка подключения к блокчейну..."
-  },
   "attributions": {
     "message": "Атрибуции"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index a136cc940f79..79a185cf896c 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -72,9 +72,6 @@
   "approved": {
     "message": "Schváleno"
   },
-  "attemptingConnect": {
-    "message": "Pokouším se připojit k blockchainu."
-  },
   "attributions": {
     "message": "Zásluhy"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index bfc2a7d8b1d1..64e7c5662c3c 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Sredstva"
   },
-  "attemptingConnect": {
-    "message": "Povezovanje z verigo blokov ..."
-  },
   "attributions": {
     "message": "Dodelitve"
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index eaf957f685d7..1741b7567833 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Sredstva"
   },
-  "attemptingConnect": {
-    "message": "Pokušava da se poveže na lanac blokova"
-  },
   "attributions": {
     "message": "Atribucije"
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index 2f130ff20383..df3766108437 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Tillgång"
   },
-  "attemptingConnect": {
-    "message": "Försöker ansluta till blockkedja."
-  },
   "attributions": {
     "message": "Tillskrivningar"
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index 652a45bdcf27..7eb535bee573 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Rasilimali"
   },
-  "attemptingConnect": {
-    "message": "Inajaribu kuunganisha kwenye blockchain."
-  },
   "attributions": {
     "message": "Sifa"
   },
diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json
index d1277cdb0e52..f9c7274ac55c 100644
--- a/app/_locales/ta/messages.json
+++ b/app/_locales/ta/messages.json
@@ -45,9 +45,6 @@
   "approved": {
     "message": "அங்கீகரிக்கப்பட்ட"
   },
-  "attemptingConnect": {
-    "message": "இணைக்க முயற்சி செய்க ப்ளாக்சைன்"
-  },
   "attributions": {
     "message": "பண்புகளும்"
   },
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index 05f4970d383a..0b2dbb8664aa 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -39,9 +39,6 @@
   "approve": {
     "message": "อนุมัติ"
   },
-  "attemptingConnect": {
-    "message": "กำลังเชื่อมต่อกับบล็อกเชน"
-  },
   "attributions": {
     "message": "อ้างถึง"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 75eadda97e75..4fe457aad146 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Subukang kanselahin ang swap nang libre"
   },
-  "attemptingConnect": {
-    "message": "Sinusubukang kumonekta sa blockchain."
-  },
   "attributions": {
     "message": "Mga Attribution"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 12e3455ba82c..8b58e9ac8218 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Swap işlemini ücretsiz iptal etme girişimi"
   },
-  "attemptingConnect": {
-    "message": "Blockzincirine bağlanmaya çalışılıyor."
-  },
   "attributions": {
     "message": "Özellikler"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index cadac70b7102..59bb0b477008 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -75,9 +75,6 @@
   "asset": {
     "message": "Актив"
   },
-  "attemptingConnect": {
-    "message": "Спроба підключення до розподіленої бази даних."
-  },
   "attributions": {
     "message": "Авторство"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index d7c95b1c3292..0961e6746022 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "Cố gắng hủy hoán đổi miễn phí"
   },
-  "attemptingConnect": {
-    "message": "Đang cố gắng kết nối với chuỗi khối."
-  },
   "attributions": {
     "message": "Ghi nhận đóng góp"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index bb92bffe2c5d..35107849d647 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -524,9 +524,6 @@
   "attemptToCancelSwapForFree": {
     "message": "尝试免费取消兑换"
   },
-  "attemptingConnect": {
-    "message": "正在尝试连接到区块链。"
-  },
   "attributions": {
     "message": "参与者"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 26f086433a96..d91d749ccffa 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -130,9 +130,6 @@
   "assetOptions": {
     "message": "資產選項"
   },
-  "attemptingConnect": {
-    "message": "正在嘗試連結區塊鏈。"
-  },
   "attributions": {
     "message": "來源"
   },
diff --git a/ui/components/app/network-display/index.scss b/ui/components/app/network-display/index.scss
index 9d6fa922819e..1c4e3dd568cb 100644
--- a/ui/components/app/network-display/index.scss
+++ b/ui/components/app/network-display/index.scss
@@ -1,37 +1,5 @@
 .network-display {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  padding: 0 10px;
-  border-radius: 4px;
-  min-height: 25px;
-  user-select: none;
-
-  &--disabled {
-    cursor: not-allowed;
-  }
-
-  &.chip {
-    margin: 0;
-    max-width: 100%;
-  }
-
-  & .chip__label {
-    padding-left: 2px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  & .chip__left-icon {
-    padding-left: 8px;
-  }
-
-  & .chip__right-icon {
-    margin-right: 4px;
-  }
-
-  &--clickable {
-    cursor: pointer;
+  &:not([disabled]):active {
+    background-color: transparent;
   }
 }
diff --git a/ui/components/app/network-display/network-display.js b/ui/components/app/network-display/network-display.js
index d4b81ec38d0a..11c56a60fcb7 100644
--- a/ui/components/app/network-display/network-display.js
+++ b/ui/components/app/network-display/network-display.js
@@ -1,129 +1,27 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
 import { useSelector } from 'react-redux';
-import {
-  NETWORK_TYPES,
-  BUILT_IN_NETWORKS,
-} from '../../../../shared/constants/network';
 
-import LoadingIndicator from '../../ui/loading-indicator';
-import ColorIndicator from '../../ui/color-indicator';
 import {
   BorderColor,
-  IconColor,
-  Size,
-  TypographyVariant,
+  BackgroundColor,
 } from '../../../helpers/constants/design-system';
-import Chip from '../../ui/chip/chip';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import { isNetworkLoading } from '../../../selectors';
-import { Icon, IconName, IconSize } from '../../component-library';
-import { getProviderConfig } from '../../../ducks/metamask/metamask';
-import { getNetworkLabelKey } from '../../../helpers/utils/i18n-helper';
-
-/**
- * @deprecated The `<NetworkDisplay />` component has been deprecated in favor of the new `<PickerNetwork>` component from the component-library.
- * Please update your code to use the new `<PickerNetwork>` component instead, which can be found at ui/components/component-library/picker-network/picker-network.tsx.
- * You can find documentation for the new `PickerNetwork` component in the MetaMask Storybook:
- * {@link https://metamask.github.io/metamask-storybook/?path=/docs/components-componentlibrary-pickernetwork--docs}
- * If you would like to help with the replacement of the old `NetworkDisplay` component, please submit a pull request against this GitHub issue:
- * {@link https://github.com/MetaMask/metamask-extension/issues/20485}
- */
-
-export default function NetworkDisplay({
-  indicatorSize,
-  disabled,
-  labelProps,
-  targetNetwork,
-  onClick,
-}) {
-  const networkIsLoading = useSelector(isNetworkLoading);
-  const providerConfig = useSelector(getProviderConfig);
-  const t = useI18nContext();
-
-  const { nickname, type: networkType } = targetNetwork ?? providerConfig;
+import { getCurrentNetwork } from '../../../selectors';
+import { PickerNetwork, AvatarNetworkSize } from '../../component-library';
 
+export default function NetworkDisplay() {
+  const currentNetwork = useSelector(getCurrentNetwork);
   return (
-    <Chip
-      dataTestId="network-display"
-      borderColor={
-        onClick ? BorderColor.borderDefault : BorderColor.borderMuted
-      }
-      onClick={onClick}
-      leftIcon={
-        <LoadingIndicator
-          alt={t('attemptingConnect')}
-          title={t('attemptingConnect')}
-          isLoading={networkIsLoading}
-        >
-          <ColorIndicator
-            color={
-              networkType === NETWORK_TYPES.RPC
-                ? IconColor.iconMuted
-                : networkType
-            }
-            size={indicatorSize}
-            type={ColorIndicator.TYPES.FILLED}
-            iconClassName={
-              networkType === NETWORK_TYPES.RPC && indicatorSize !== Size.XS
-                ? 'fa fa-question'
-                : undefined
-            }
-          />
-        </LoadingIndicator>
-      }
-      rightIcon={
-        onClick ? <Icon name={IconName.ArrowDown} size={IconSize.Xs} /> : null
-      }
-      label={
-        networkType === NETWORK_TYPES.RPC
-          ? nickname ?? t('privateNetwork')
-          : t(getNetworkLabelKey(networkType))
-      }
-      className={classnames('network-display', {
-        'network-display--disabled': disabled,
-        'network-display--clickable': typeof onClick === 'function',
-      })}
-      labelProps={{
-        variant: TypographyVariant.H7,
-        ...labelProps,
-      }}
+    <PickerNetwork
+      className="network-display"
+      label={currentNetwork?.nickname}
+      labelProps={{ 'data-testid': 'network-display' }}
+      src={currentNetwork?.rpcPrefs?.imageUrl}
+      iconProps={{ display: 'none' }} // do not show the dropdown icon
+      avatarNetworkProps={{ size: AvatarNetworkSize.Xs }}
+      as="div" // do not render as a button
+      backgroundColor={BackgroundColor.transparent}
+      borderWidth={0}
+      borderColor={BorderColor.borderMuted}
     />
   );
 }
-NetworkDisplay.propTypes = {
-  /**
-   * The size of the indicator
-   */
-  indicatorSize: PropTypes.oneOf(Object.values(Size)),
-  /**
-   * The label props of the label can use most of the Typography props
-   */
-  labelProps: Chip.propTypes.labelProps,
-  /**
-   * The target network
-   */
-  targetNetwork: PropTypes.shape({
-    type: PropTypes.oneOf([
-      ...Object.keys(BUILT_IN_NETWORKS),
-      NETWORK_TYPES.RPC,
-    ]),
-    nickname: PropTypes.string,
-  }),
-  /**
-   * Whether the NetworkDisplay is disabled
-   */
-  disabled: PropTypes.bool,
-  /**
-   * The onClick event handler of the NetworkDisplay
-   * if it is not passed it is assumed that the NetworkDisplay
-   * should not be interactive and removes the caret and changes the border color
-   * of the NetworkDisplay
-   */
-  onClick: PropTypes.func,
-};
-
-NetworkDisplay.defaultProps = {
-  indicatorSize: Size.LG,
-};
diff --git a/ui/components/app/network-display/network-display.stories.js b/ui/components/app/network-display/network-display.stories.js
index 5a67dc676ae4..2392a107b6e9 100644
--- a/ui/components/app/network-display/network-display.stories.js
+++ b/ui/components/app/network-display/network-display.stories.js
@@ -1,107 +1,10 @@
 import React from 'react';
-
-import {
-  BUILT_IN_NETWORKS,
-  NETWORK_TYPES,
-} from '../../../../shared/constants/network';
-import { Severity, Size } from '../../../helpers/constants/design-system';
-
-import { BannerAlert } from '../../component-library/banner-alert';
 import NetworkDisplay from '.';
 
 export default {
   title: 'Components/App/NetworkDisplay',
-
-  argTypes: {
-    indicatorSize: {
-      control: 'select',
-      options: Object.values(Size),
-    },
-    labelProps: {
-      control: 'object',
-    },
-    targetNetwork: {
-      control: 'select',
-      options: [...Object.keys(BUILT_IN_NETWORKS), NETWORK_TYPES.RPC],
-    },
-    disabled: {
-      control: 'boolean',
-    },
-    onClick: {
-      action: 'onClick',
-      description:
-        'The onClick event handler of the NetworkDisplay. If it is not passed it is assumed that the NetworkDisplay SHOULD NOT be interactive and removes the caret and changes the border color of the NetworkDisplay to border-muted',
-    },
-  },
-  args: {
-    targetNetwork: 'goerli',
-  },
 };
 
-export const DefaultStory = (args) => (
-  <>
-    <BannerAlert
-      severity={Severity.Warning}
-      title="Deprecated"
-      description="The <NetworkDisplay> component has been deprecated in favor of the new <PickerNetwork> component from the component-library.
-        Please update your code to use the new <PickerNetwork> component instead, which can be found at ui/components/component-library/picker-network/picker-network.tsx."
-      actionButtonLabel="See details"
-      actionButtonProps={{
-        href: 'https://github.com/MetaMask/metamask-extension/issues/20485',
-      }}
-      marginBottom={4}
-    />
-    <NetworkDisplay
-      {...args}
-      targetNetwork={{
-        type: args.targetNetwork,
-        nickname: args.targetNetwork,
-      }}
-    />
-  </>
-);
+export const DefaultStory = () => <NetworkDisplay />;
 
 DefaultStory.storyName = 'Default';
-
-export const TargetNetwork = (args) => {
-  const targetNetworkArr = [
-    ...Object.keys(BUILT_IN_NETWORKS),
-    NETWORK_TYPES.RPC,
-  ];
-  return (
-    <>
-      {Object.values(targetNetworkArr).map((variant) => (
-        <NetworkDisplay
-          {...args}
-          key={variant}
-          targetNetwork={{
-            type: variant,
-            nickname: variant,
-          }}
-        />
-      ))}
-    </>
-  );
-};
-
-export const DisplayOnly = (args) => {
-  const targetNetworkArr = [
-    ...Object.keys(BUILT_IN_NETWORKS),
-    NETWORK_TYPES.RPC,
-  ];
-  return (
-    <>
-      {Object.values(targetNetworkArr).map((variant) => (
-        <NetworkDisplay
-          {...args}
-          key={variant}
-          targetNetwork={{
-            type: variant,
-            nickname: variant,
-          }}
-          onClick={undefined}
-        />
-      ))}
-    </>
-  );
-};
diff --git a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
index 6bcd678b78c5..ba0839bfd123 100644
--- a/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
+++ b/ui/pages/confirmations/components/confirm-page-container/confirm-page-container-header/__snapshots__/confirm-page-container-header.component.test.js.snap
@@ -25,26 +25,21 @@ exports[`Confirm Detail Row Component should match snapshot 1`] = `
         </span>
       </div>
       <div
-        class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
-        data-testid="network-display"
+        class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
       >
         <div
-          class="chip__left-icon"
+          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"
         >
-          <div
-            class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-lg"
-            data-testid="color-icon-icon-muted"
-          >
-            <i
-              class="color-indicator__icon fa fa-question"
-            />
-          </div>
+          ?
         </div>
         <span
-          class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-alternative"
-        >
-          Private network
-        </span>
+          class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+          data-testid="network-display"
+        />
+        <span
+          class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
+          style="mask-image: url('./images/icons/arrow-down.svg');"
+        />
       </div>
     </div>
   </div>
diff --git a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
index 332fa46e439b..eb3f057a76a7 100644
--- a/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request/signature-request-header/__snapshots__/signature-request-header.component.test.js.snap
@@ -71,26 +71,23 @@ exports[`SignatureRequestHeader renders correctly with fromAccount 1`] = `
       class="signature-request-header--network"
     >
       <div
-        class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
-        data-testid="network-display"
+        class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
       >
         <div
-          class="chip__left-icon"
+          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"
         >
-          <div
-            class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-lg"
-            data-testid="color-icon-icon-muted"
-          >
-            <i
-              class="color-indicator__icon fa fa-question"
-            />
-          </div>
+          C
         </div>
         <span
-          class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-alternative"
+          class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+          data-testid="network-display"
         >
-          goerli
+          Chain 5
         </span>
+        <span
+          class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
+          style="mask-image: url('./images/icons/arrow-down.svg');"
+        />
       </div>
     </div>
   </div>
@@ -109,26 +106,23 @@ exports[`SignatureRequestHeader renders correctly without fromAccount 1`] = `
       class="signature-request-header--network"
     >
       <div
-        class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
-        data-testid="network-display"
+        class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
       >
         <div
-          class="chip__left-icon"
+          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"
         >
-          <div
-            class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-lg"
-            data-testid="color-icon-icon-muted"
-          >
-            <i
-              class="color-indicator__icon fa fa-question"
-            />
-          </div>
+          C
         </div>
         <span
-          class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-alternative"
+          class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+          data-testid="network-display"
         >
-          goerli
+          Chain 5
         </span>
+        <span
+          class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
+          style="mask-image: url('./images/icons/arrow-down.svg');"
+        />
       </div>
     </div>
   </div>
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 d577a079e735..0e472aad11db 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
@@ -80,26 +80,23 @@ exports[`ConfirmSendEther should render correct information for for confirm send
         class="confirm-page-container-header__row"
       >
         <div
-          class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
-          data-testid="network-display"
+          class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
         >
           <div
-            class="chip__left-icon"
+            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"
           >
-            <div
-              class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-lg"
-              data-testid="color-icon-icon-muted"
-            >
-              <i
-                class="color-indicator__icon fa fa-question"
-              />
-            </div>
+            C
           </div>
           <span
-            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-alternative"
+            class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+            data-testid="network-display"
           >
-            goerli
+            Chain 5
           </span>
+          <span
+            class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
+            style="mask-image: url('./images/icons/arrow-down.svg');"
+          />
         </div>
       </div>
       <div
diff --git a/ui/pages/confirmations/confirmation/confirmation.js b/ui/pages/confirmations/confirmation/confirmation.js
index c7cbe4ee3ae5..1d6519ef2019 100644
--- a/ui/pages/confirmations/confirmation/confirmation.js
+++ b/ui/pages/confirmations/confirmation/confirmation.js
@@ -24,7 +24,6 @@ import {
 import MetaMaskTemplateRenderer from '../../../components/app/metamask-template-renderer';
 import ConfirmationWarningModal from '../components/confirmation-warning-modal';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
-import { Size, TextColor } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import {
@@ -529,10 +528,7 @@ export default function ConfirmationPage({
       <div className="confirmation-page__content">
         {templatedValues.networkDisplay ? (
           <Box justifyContent="center" marginTop={2}>
-            <NetworkDisplay
-              indicatorSize={Size.XS}
-              labelProps={{ color: TextColor.textDefault }}
-            />
+            <NetworkDisplay />
           </Box>
         ) : null}
         {
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
index a07d4d8bc62a..47294c6b5f80 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
@@ -12,26 +12,21 @@ exports[`add-ethereum-chain confirmation should match snapshot 1`] = `
         class="box box--margin-top-2 box--flex-direction-row box--justify-content-center box--display-flex"
       >
         <div
-          class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
-          data-testid="network-display"
+          class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
         >
           <div
-            class="chip__left-icon"
+            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"
           >
-            <div
-              class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-xs"
-              data-testid="color-icon-icon-muted"
-            >
-              <span
-                class="color-indicator__inner-circle"
-              />
-            </div>
+            ?
           </div>
           <span
-            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-default"
-          >
-            Test initial state
-          </span>
+            class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+            data-testid="network-display"
+          />
+          <span
+            class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
+            style="mask-image: url('./images/icons/arrow-down.svg');"
+          />
         </div>
       </div>
       <h3
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
index bdd900cdc72f..4671e67ab89c 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
@@ -12,26 +12,21 @@ exports[`switch-ethereum-chain confirmation should match snapshot 1`] = `
         class="box box--margin-top-2 box--flex-direction-row box--justify-content-center box--display-flex"
       >
         <div
-          class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
-          data-testid="network-display"
+          class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
         >
           <div
-            class="chip__left-icon"
+            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"
           >
-            <div
-              class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-xs"
-              data-testid="color-icon-icon-muted"
-            >
-              <span
-                class="color-indicator__inner-circle"
-              />
-            </div>
+            ?
           </div>
           <span
-            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-default"
-          >
-            Test initial state
-          </span>
+            class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+            data-testid="network-display"
+          />
+          <span
+            class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
+            style="mask-image: url('./images/icons/arrow-down.svg');"
+          />
         </div>
       </div>
       <h3
@@ -131,26 +126,21 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi
         class="box box--margin-top-2 box--flex-direction-row box--justify-content-center box--display-flex"
       >
         <div
-          class="network-display chip chip--with-left-icon chip--border-color-border-muted chip--background-color-undefined chip--max-content"
-          data-testid="network-display"
+          class="mm-box mm-picker-network network-display mm-box--padding-right-4 mm-box--padding-left-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center mm-box--background-color-transparent mm-box--rounded-pill mm-box--border-color-border-muted mm-box--border-width-0 box--border-style-solid box--border-width-1"
         >
           <div
-            class="chip__left-icon"
+            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"
           >
-            <div
-              class="color-indicator color-indicator--filled color-indicator--color-icon-muted color-indicator--size-xs"
-              data-testid="color-icon-icon-muted"
-            >
-              <span
-                class="color-indicator__inner-circle"
-              />
-            </div>
+            ?
           </div>
           <span
-            class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography chip__label typography--h7 typography--weight-normal typography--style-normal typography--color-text-default"
-          >
-            Test initial state
-          </span>
+            class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
+            data-testid="network-display"
+          />
+          <span
+            class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
+            style="mask-image: url('./images/icons/arrow-down.svg');"
+          />
         </div>
       </div>
       <h3

From 3da911ec281656cb2b5b0db0da96f7a464b97d42 Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Tue, 30 Jul 2024 09:49:46 +0100
Subject: [PATCH 140/236] fix (cherry-pick for v12.0.0): add unlock checks for
 notification related controllers (#26194)
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 is a cherry pick for
https://github.com/MetaMask/metamask-extension/pull/26189
(https://github.com/MetaMask/metamask-extension/commit/2197d295ec646f4637b8ea0fd766da08b5e7c17e)

Ensures that we correctly call the preinstalled snap when the wallet is
unlocked. Also prevents unlock confirmations being created due to snap
calls when wallet is locked

<!--
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/26194?quickstart=1)

## **Related issues**

[Ticket](https://consensyssoftware.atlassian.net/browse/NOTIFY-865)

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

## **Manual testing steps**

1. Install the extension > go through onboarding > enable notifications
2. Restart browser or refresh the chrome extension
3. You should not see the unlock window pop up immediately and also
stops the confirmation counter on the badge from continuously increasing
due to preinstalled snap invokations.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../authentication-controller.test.ts         | 106 +++++++++++++++++-
 .../authentication-controller.ts              |  49 +++++++-
 .../metamask-notifications.test.ts            |  11 ++
 .../metamask-notifications.ts                 |  54 +++++++--
 .../user-storage-controller.test.ts           |  50 ++++++++-
 .../user-storage/user-storage-controller.ts   |  42 ++++++-
 app/scripts/metamask-controller.js            |   7 ++
 7 files changed, 299 insertions(+), 20 deletions(-)

diff --git a/app/scripts/controllers/authentication/authentication-controller.test.ts b/app/scripts/controllers/authentication/authentication-controller.test.ts
index b9b272c51a62..1cd01dfb74fc 100644
--- a/app/scripts/controllers/authentication/authentication-controller.test.ts
+++ b/app/scripts/controllers/authentication/authentication-controller.test.ts
@@ -1,6 +1,7 @@
 import { ControllerMessenger } from '@metamask/base-controller';
 import AuthenticationController, {
   AllowedActions,
+  AllowedEvents,
   AuthenticationControllerState,
 } from './authentication-controller';
 import {
@@ -26,7 +27,7 @@ describe('authentication/authentication-controller - constructor() tests', () =>
   test('should initialize with default state', () => {
     const metametrics = createMockAuthMetaMetrics();
     const controller = new AuthenticationController({
-      messenger: createAuthenticationMessenger(),
+      messenger: createMockAuthenticationMessenger().messenger,
       metametrics,
     });
 
@@ -37,7 +38,7 @@ describe('authentication/authentication-controller - constructor() tests', () =>
   test('should initialize with override state', () => {
     const metametrics = createMockAuthMetaMetrics();
     const controller = new AuthenticationController({
-      messenger: createAuthenticationMessenger(),
+      messenger: createMockAuthenticationMessenger().messenger,
       state: mockSignedInState(),
       metametrics,
     });
@@ -81,6 +82,20 @@ describe('authentication/authentication-controller - performSignIn() tests', ()
     await testAndAssertFailingEndpoints('token');
   });
 
+  // When the wallet is locked, we are unable to call the snap
+  test('Should error when wallet is locked', async () => {
+    const { messenger, mockKeyringControllerGetState } =
+      createMockAuthenticationMessenger();
+    const metametrics = createMockAuthMetaMetrics();
+
+    // Mock wallet is locked
+    mockKeyringControllerGetState.mockReturnValue({ isUnlocked: false });
+
+    const controller = new AuthenticationController({ messenger, metametrics });
+
+    await expect(controller.performSignIn()).rejects.toThrow();
+  });
+
   async function testAndAssertFailingEndpoints(
     endpointFail: 'nonce' | 'login' | 'token',
   ) {
@@ -173,6 +188,8 @@ describe('authentication/authentication-controller - getBearerToken() tests', ()
     const metametrics = createMockAuthMetaMetrics();
     const { messenger } = createMockAuthenticationMessenger();
     mockAuthenticationFlowEndpoints();
+
+    // Invalid/old state
     const originalState = mockSignedInState();
     if (originalState.sessionData) {
       originalState.sessionData.accessToken = 'ACCESS_TOKEN_1';
@@ -192,6 +209,36 @@ describe('authentication/authentication-controller - getBearerToken() tests', ()
     expect(result).toBeDefined();
     expect(result).toBe(MOCK_ACCESS_TOKEN);
   });
+
+  // If the state is invalid, we need to re-login.
+  // But as wallet is locked, we will not be able to call the snap
+  test('Should throw error if wallet is locked', async () => {
+    const metametrics = createMockAuthMetaMetrics();
+    const { messenger, mockKeyringControllerGetState } =
+      createMockAuthenticationMessenger();
+    mockAuthenticationFlowEndpoints();
+
+    // Invalid/old state
+    const originalState = mockSignedInState();
+    if (originalState.sessionData) {
+      originalState.sessionData.accessToken = 'ACCESS_TOKEN_1';
+
+      const d = new Date();
+      d.setMinutes(d.getMinutes() - 31); // expires at 30 mins
+      originalState.sessionData.expiresIn = d.toString();
+    }
+
+    // Mock wallet is locked
+    mockKeyringControllerGetState.mockReturnValue({ isUnlocked: false });
+
+    const controller = new AuthenticationController({
+      messenger,
+      state: originalState,
+      metametrics,
+    });
+
+    await expect(controller.getBearerToken()).rejects.toThrow();
+  });
 });
 
 describe('authentication/authentication-controller - getSessionProfile() tests', () => {
@@ -226,6 +273,8 @@ describe('authentication/authentication-controller - getSessionProfile() tests',
     const metametrics = createMockAuthMetaMetrics();
     const { messenger } = createMockAuthenticationMessenger();
     mockAuthenticationFlowEndpoints();
+
+    // Invalid/old state
     const originalState = mockSignedInState();
     if (originalState.sessionData) {
       originalState.sessionData.profile.identifierId = 'ID_1';
@@ -246,13 +295,47 @@ describe('authentication/authentication-controller - getSessionProfile() tests',
     expect(result.identifierId).toBe(MOCK_LOGIN_RESPONSE.profile.identifier_id);
     expect(result.profileId).toBe(MOCK_LOGIN_RESPONSE.profile.profile_id);
   });
+
+  // If the state is invalid, we need to re-login.
+  // But as wallet is locked, we will not be able to call the snap
+  test('Should throw error if wallet is locked', async () => {
+    const metametrics = createMockAuthMetaMetrics();
+    const { messenger, mockKeyringControllerGetState } =
+      createMockAuthenticationMessenger();
+    mockAuthenticationFlowEndpoints();
+
+    // Invalid/old state
+    const originalState = mockSignedInState();
+    if (originalState.sessionData) {
+      originalState.sessionData.profile.identifierId = 'ID_1';
+
+      const d = new Date();
+      d.setMinutes(d.getMinutes() - 31); // expires at 30 mins
+      originalState.sessionData.expiresIn = d.toString();
+    }
+
+    // Mock wallet is locked
+    mockKeyringControllerGetState.mockReturnValue({ isUnlocked: false });
+
+    const controller = new AuthenticationController({
+      messenger,
+      state: originalState,
+      metametrics,
+    });
+
+    await expect(controller.getSessionProfile()).rejects.toThrow();
+  });
 });
 
 function createAuthenticationMessenger() {
-  const messenger = new ControllerMessenger<AllowedActions, never>();
+  const messenger = new ControllerMessenger<AllowedActions, AllowedEvents>();
   return messenger.getRestricted({
     name: 'AuthenticationController',
-    allowedActions: [`SnapController:handleRequest`],
+    allowedActions: [
+      `SnapController:handleRequest`,
+      'KeyringController:getState',
+    ],
+    allowedEvents: ['KeyringController:lock', 'KeyringController:unlock'],
   });
 }
 
@@ -264,6 +347,10 @@ function createMockAuthenticationMessenger() {
     .fn()
     .mockResolvedValue('MOCK_SIGNED_MESSAGE');
 
+  const mockKeyringControllerGetState = jest
+    .fn()
+    .mockReturnValue({ isUnlocked: true });
+
   mockCall.mockImplementation((...args) => {
     const [actionType, params] = args;
     if (actionType === 'SnapController:handleRequest') {
@@ -280,10 +367,19 @@ function createMockAuthenticationMessenger() {
       );
     }
 
+    if (actionType === 'KeyringController:getState') {
+      return mockKeyringControllerGetState();
+    }
+
     throw new Error(`MOCK_FAIL - unsupported messenger call: ${actionType}`);
   });
 
-  return { messenger, mockSnapGetPublicKey, mockSnapSignMessage };
+  return {
+    messenger,
+    mockSnapGetPublicKey,
+    mockSnapSignMessage,
+    mockKeyringControllerGetState,
+  };
 }
 
 function mockAuthenticationFlowEndpoints(params?: {
diff --git a/app/scripts/controllers/authentication/authentication-controller.ts b/app/scripts/controllers/authentication/authentication-controller.ts
index d3586e05419b..4bcb1528c323 100644
--- a/app/scripts/controllers/authentication/authentication-controller.ts
+++ b/app/scripts/controllers/authentication/authentication-controller.ts
@@ -3,6 +3,11 @@ import {
   RestrictedControllerMessenger,
   StateMetadata,
 } from '@metamask/base-controller';
+import type {
+  KeyringControllerGetStateAction,
+  KeyringControllerLockEvent,
+  KeyringControllerUnlockEvent,
+} from '@metamask/keyring-controller';
 import { HandleSnapRequest } from '@metamask/snaps-controllers';
 import {
   createSnapPublicKeyRequest,
@@ -83,15 +88,21 @@ export type AuthenticationControllerGetSessionProfile =
 export type AuthenticationControllerIsSignedIn = ActionsObj['isSignedIn'];
 
 // Allowed Actions
-export type AllowedActions = HandleSnapRequest;
+export type AllowedActions =
+  | HandleSnapRequest
+  | KeyringControllerGetStateAction;
+
+export type AllowedEvents =
+  | KeyringControllerLockEvent
+  | KeyringControllerUnlockEvent;
 
 // Messenger
 export type AuthenticationControllerMessenger = RestrictedControllerMessenger<
   typeof controllerName,
   Actions | AllowedActions,
-  never,
+  AllowedEvents,
   AllowedActions['type'],
-  never
+  AllowedEvents['type']
 >;
 
 /**
@@ -105,6 +116,25 @@ export default class AuthenticationController extends BaseController<
 > {
   #metametrics: MetaMetricsAuth;
 
+  #isUnlocked = false;
+
+  #keyringController = {
+    setupLockedStateSubscriptions: () => {
+      const { isUnlocked } = this.messagingSystem.call(
+        'KeyringController:getState',
+      );
+      this.#isUnlocked = isUnlocked;
+
+      this.messagingSystem.subscribe('KeyringController:unlock', () => {
+        this.#isUnlocked = true;
+      });
+
+      this.messagingSystem.subscribe('KeyringController:lock', () => {
+        this.#isUnlocked = false;
+      });
+    },
+  };
+
   constructor({
     messenger,
     state,
@@ -127,6 +157,7 @@ export default class AuthenticationController extends BaseController<
 
     this.#metametrics = metametrics;
 
+    this.#keyringController.setupLockedStateSubscriptions();
     this.#registerMessageHandlers();
   }
 
@@ -306,6 +337,12 @@ export default class AuthenticationController extends BaseController<
       return this.#_snapPublicKeyCache;
     }
 
+    if (!this.#isUnlocked) {
+      throw new Error(
+        '#snapGetPublicKey - unable to call snap, wallet is locked',
+      );
+    }
+
     const result = (await this.messagingSystem.call(
       'SnapController:handleRequest',
       createSnapPublicKeyRequest(),
@@ -329,6 +366,12 @@ export default class AuthenticationController extends BaseController<
       return this.#_snapSignMessageCache[message];
     }
 
+    if (!this.#isUnlocked) {
+      throw new Error(
+        '#snapSignMessage - unable to call snap, wallet is locked',
+      );
+    }
+
     const result = (await this.messagingSystem.call(
       'SnapController:handleRequest',
       createSnapSignMessageRequest(message),
diff --git a/app/scripts/controllers/metamask-notifications/metamask-notifications.test.ts b/app/scripts/controllers/metamask-notifications/metamask-notifications.test.ts
index d93d48536c13..c96ccfe2e989 100644
--- a/app/scripts/controllers/metamask-notifications/metamask-notifications.test.ts
+++ b/app/scripts/controllers/metamask-notifications/metamask-notifications.test.ts
@@ -50,6 +50,10 @@ import * as OnChainNotifications from './services/onchain-notifications';
 import { UserStorage } from './types/user-storage/user-storage';
 import * as MetamaskNotificationsUtils from './utils/utils';
 
+// Mock type used for testing purposes
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type MockVar = any;
+
 describe('metamask-notifications - constructor()', () => {
   test('initializes state & override state', () => {
     const controller1 = new MetamaskNotificationsController({
@@ -627,6 +631,7 @@ function mockNotificationMessenger() {
     name: 'MetamaskNotificationsController',
     allowedActions: [
       'KeyringController:getAccounts',
+      'KeyringController:getState',
       'AuthenticationController:getBearerToken',
       'AuthenticationController:isSignedIn',
       'PushPlatformNotificationsController:disablePushNotifications',
@@ -639,6 +644,8 @@ function mockNotificationMessenger() {
     ],
     allowedEvents: [
       'KeyringController:stateChange',
+      'KeyringController:lock',
+      'KeyringController:unlock',
       'PushPlatformNotificationsController:onNewNotifications',
     ],
   });
@@ -735,6 +742,10 @@ function mockNotificationMessenger() {
       return mockPerformSetStorage(params[0], params[1]);
     }
 
+    if (actionType === 'KeyringController:getState') {
+      return { isUnlocked: true } as MockVar;
+    }
+
     function exhaustedMessengerMocks(action: never) {
       return new Error(`MOCK_FAIL - unsupported messenger call: ${action}`);
     }
diff --git a/app/scripts/controllers/metamask-notifications/metamask-notifications.ts b/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
index 4af08474769c..0278cf9655ff 100644
--- a/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
+++ b/app/scripts/controllers/metamask-notifications/metamask-notifications.ts
@@ -2,7 +2,6 @@ import {
   BaseController,
   RestrictedControllerMessenger,
   ControllerGetStateAction,
-  ControllerStateChangeEvent,
   StateMetadata,
 } from '@metamask/base-controller';
 import log from 'loglevel';
@@ -10,6 +9,9 @@ import { toChecksumHexAddress } from '@metamask/controller-utils';
 import {
   KeyringControllerGetAccountsAction,
   KeyringControllerStateChangeEvent,
+  KeyringControllerGetStateAction,
+  KeyringControllerLockEvent,
+  KeyringControllerUnlockEvent,
 } from '@metamask/keyring-controller';
 import {
   AuthenticationControllerGetBearerToken,
@@ -186,6 +188,7 @@ export type Actions =
 export type AllowedActions =
   // Keyring Controller Requests
   | KeyringControllerGetAccountsAction
+  | KeyringControllerGetStateAction
   // Auth Controller Requests
   | AuthenticationControllerGetBearerToken
   | AuthenticationControllerIsSignedIn
@@ -199,16 +202,13 @@ export type AllowedActions =
   | PushPlatformNotificationsControllerDisablePushNotifications
   | PushPlatformNotificationsControllerUpdateTriggerPushNotifications;
 
-// Events
-export type MetamaskNotificationsControllerMessengerEvents =
-  ControllerStateChangeEvent<
-    typeof controllerName,
-    MetamaskNotificationsControllerState
-  >;
-
 // Allowed Events
 export type AllowedEvents =
+  // Keyring Events
   | KeyringControllerStateChangeEvent
+  | KeyringControllerLockEvent
+  | KeyringControllerUnlockEvent
+  // Push Notification Events
   | PushPlatformNotificationsControllerOnNewNotificationEvent;
 
 // Type for the messenger of MetamaskNotificationsController
@@ -229,6 +229,34 @@ export class MetamaskNotificationsController extends BaseController<
   MetamaskNotificationsControllerState,
   MetamaskNotificationsControllerMessenger
 > {
+  // Flag to check is notifications have been setup when the browser/extension is initialized.
+  // We want to re-initialize push notifications when the browser/extension is refreshed
+  // To ensure we subscribe to the most up-to-date notifications
+  #isPushNotificationsSetup = false;
+
+  #isUnlocked = false;
+
+  #keyringController = {
+    setupLockedStateSubscriptions: (onUnlock: () => Promise<void>) => {
+      const { isUnlocked } = this.messagingSystem.call(
+        'KeyringController:getState',
+      );
+      this.#isUnlocked = isUnlocked;
+
+      this.messagingSystem.subscribe('KeyringController:unlock', () => {
+        this.#isUnlocked = true;
+        // messaging system cannot await promises
+        // we don't need to wait for a result on this.
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        onUnlock();
+      });
+
+      this.messagingSystem.subscribe('KeyringController:lock', () => {
+        this.#isUnlocked = false;
+      });
+    },
+  };
+
   #auth = {
     getBearerToken: async () => {
       return await this.messagingSystem.call(
@@ -307,6 +335,12 @@ export class MetamaskNotificationsController extends BaseController<
       if (!this.state.isMetamaskNotificationsEnabled) {
         return;
       }
+      if (this.#isPushNotificationsSetup) {
+        return;
+      }
+      if (!this.#isUnlocked) {
+        return;
+      }
 
       const storage = await this.#getUserStorage();
       if (!storage) {
@@ -315,6 +349,7 @@ export class MetamaskNotificationsController extends BaseController<
 
       const uuids = MetamaskNotificationsUtils.getAllUUIDs(storage);
       await this.#pushNotifications.enablePushNotifications(uuids);
+      this.#isPushNotificationsSetup = true;
     },
   };
 
@@ -422,6 +457,9 @@ export class MetamaskNotificationsController extends BaseController<
 
     this.#registerMessageHandlers();
     this.#clearLoadingStates();
+    this.#keyringController.setupLockedStateSubscriptions(
+      this.#pushNotifications.initializePushNotifications,
+    );
     this.#accounts.initialize();
     this.#pushNotifications.initializePushNotifications();
     this.#accounts.subscribe();
diff --git a/app/scripts/controllers/user-storage/user-storage-controller.test.ts b/app/scripts/controllers/user-storage/user-storage-controller.test.ts
index 471f82cbbd58..8d3f61d6ab21 100644
--- a/app/scripts/controllers/user-storage/user-storage-controller.test.ts
+++ b/app/scripts/controllers/user-storage/user-storage-controller.test.ts
@@ -17,6 +17,7 @@ import {
 } from './mocks/mockStorage';
 import UserStorageController, {
   AllowedActions,
+  AllowedEvents,
 } from './user-storage-controller';
 import {
   mockEndpointGetUserStorage,
@@ -73,6 +74,24 @@ describe('user-storage/user-storage-controller - performGetStorage() tests', ()
     ).rejects.toThrow();
   });
 
+  test('rejects if wallet is locked', async () => {
+    const { messengerMocks } = arrangeMocks();
+
+    // Mock wallet is locked
+    messengerMocks.mockKeyringControllerGetState.mockReturnValue({
+      isUnlocked: false,
+    });
+
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+      getMetaMetricsState: () => true,
+    });
+
+    await expect(
+      controller.performGetStorage('notification_settings'),
+    ).rejects.toThrow();
+  });
+
   // @ts-expect-error This is missing from the Mocha type definitions
   test.each([
     [
@@ -146,6 +165,24 @@ describe('user-storage/user-storage-controller - performSetStorage() tests', ()
     ).rejects.toThrow();
   });
 
+  test('rejects if wallet is locked', async () => {
+    const { messengerMocks } = arrangeMocks();
+
+    // Mock wallet is locked
+    messengerMocks.mockKeyringControllerGetState.mockReturnValue({
+      isUnlocked: false,
+    });
+
+    const controller = new UserStorageController({
+      messenger: messengerMocks.messenger,
+      getMetaMetricsState: () => true,
+    });
+
+    await expect(
+      controller.performSetStorage('notification_settings', 'new data'),
+    ).rejects.toThrow();
+  });
+
   // @ts-expect-error This is missing from the Mocha type definitions
   test.each([
     [
@@ -288,10 +325,11 @@ describe('user-storage/user-storage-controller - enableProfileSyncing() tests',
 function mockUserStorageMessenger() {
   const messenger = new ControllerMessenger<
     AllowedActions,
-    never
+    AllowedEvents
   >().getRestricted({
     name: 'UserStorageController',
     allowedActions: [
+      'KeyringController:getState',
       'SnapController:handleRequest',
       'AuthenticationController:getBearerToken',
       'AuthenticationController:getSessionProfile',
@@ -301,6 +339,7 @@ function mockUserStorageMessenger() {
       'MetamaskNotificationsController:disableMetamaskNotifications',
       'MetamaskNotificationsController:selectIsMetamaskNotificationsEnabled',
     ],
+    allowedEvents: ['KeyringController:lock', 'KeyringController:unlock'],
   });
 
   const mockSnapGetPublicKey = jest.fn().mockResolvedValue('MOCK_PUBLIC_KEY');
@@ -345,6 +384,10 @@ function mockUserStorageMessenger() {
       MetamaskNotificationsControllerDisableMetamaskNotifications['handler']
     >().mockResolvedValue();
 
+  const mockKeyringControllerGetState = typedMockFn<
+    () => { isUnlocked: boolean }
+  >().mockReturnValue({ isUnlocked: true });
+
   jest.spyOn(messenger, 'call').mockImplementation((...args) => {
     const [actionType, params] = args;
     if (actionType === 'SnapController:handleRequest') {
@@ -395,6 +438,10 @@ function mockUserStorageMessenger() {
       return mockAuthPerformSignOut();
     }
 
+    if (actionType === 'KeyringController:getState') {
+      return mockKeyringControllerGetState();
+    }
+
     function exhaustedMessengerMocks(action: never) {
       throw new Error(`MOCK_FAIL - unsupported messenger call: ${action}`);
     }
@@ -413,5 +460,6 @@ function mockUserStorageMessenger() {
     mockMetamaskNotificationsIsMetamaskNotificationsEnabled,
     mockMetamaskNotificationsDisableNotifications,
     mockAuthPerformSignOut,
+    mockKeyringControllerGetState,
   };
 }
diff --git a/app/scripts/controllers/user-storage/user-storage-controller.ts b/app/scripts/controllers/user-storage/user-storage-controller.ts
index 57f4930d1d2f..9a286f801330 100644
--- a/app/scripts/controllers/user-storage/user-storage-controller.ts
+++ b/app/scripts/controllers/user-storage/user-storage-controller.ts
@@ -3,6 +3,11 @@ import {
   RestrictedControllerMessenger,
   StateMetadata,
 } from '@metamask/base-controller';
+import type {
+  KeyringControllerGetStateAction,
+  KeyringControllerLockEvent,
+  KeyringControllerUnlockEvent,
+} from '@metamask/keyring-controller';
 import { HandleSnapRequest } from '@metamask/snaps-controllers';
 import {
   AuthenticationControllerGetBearerToken,
@@ -75,8 +80,9 @@ export type UserStorageControllerEnableProfileSyncing =
 export type UserStorageControllerDisableProfileSyncing =
   ActionsObj['disableProfileSyncing'];
 
-// Allowed Actions
 export type AllowedActions =
+  // Keyring Requests
+  | KeyringControllerGetStateAction
   // Snap Requests
   | HandleSnapRequest
   // Auth Requests
@@ -89,13 +95,17 @@ export type AllowedActions =
   | MetamaskNotificationsControllerDisableMetamaskNotifications
   | MetamaskNotificationsControllerSelectIsMetamaskNotificationsEnabled;
 
+export type AllowedEvents =
+  | KeyringControllerLockEvent
+  | KeyringControllerUnlockEvent;
+
 // Messenger
 export type UserStorageControllerMessenger = RestrictedControllerMessenger<
   typeof controllerName,
   Actions | AllowedActions,
-  never,
+  AllowedEvents,
   AllowedActions['type'],
-  never
+  AllowedEvents['type']
 >;
 
 /**
@@ -151,6 +161,25 @@ export default class UserStorageController extends BaseController<
     },
   };
 
+  #isUnlocked = false;
+
+  #keyringController = {
+    setupLockedStateSubscriptions: () => {
+      const { isUnlocked } = this.messagingSystem.call(
+        'KeyringController:getState',
+      );
+      this.#isUnlocked = isUnlocked;
+
+      this.messagingSystem.subscribe('KeyringController:unlock', () => {
+        this.#isUnlocked = true;
+      });
+
+      this.messagingSystem.subscribe('KeyringController:lock', () => {
+        this.#isUnlocked = false;
+      });
+    },
+  };
+
   getMetaMetricsState: () => boolean;
 
   constructor(params: {
@@ -166,6 +195,7 @@ export default class UserStorageController extends BaseController<
     });
 
     this.getMetaMetricsState = params.getMetaMetricsState;
+    this.#keyringController.setupLockedStateSubscriptions();
     this.#registerMessageHandlers();
   }
 
@@ -378,6 +408,12 @@ export default class UserStorageController extends BaseController<
       return this.#_snapSignMessageCache[message];
     }
 
+    if (!this.#isUnlocked) {
+      throw new Error(
+        '#snapSignMessage - unable to call snap, wallet is locked',
+      );
+    }
+
     const result = (await this.messagingSystem.call(
       'SnapController:handleRequest',
       createSnapSignMessageRequest(message),
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index f47ae758138b..70ff03c60d15 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1438,9 +1438,11 @@ export default class MetamaskController extends EventEmitter {
       messenger: this.controllerMessenger.getRestricted({
         name: 'AuthenticationController',
         allowedActions: [
+          'KeyringController:getState',
           'SnapController:handleRequest',
           'UserStorageController:disableProfileSyncing',
         ],
+        allowedEvents: ['KeyringController:lock', 'KeyringController:unlock'],
       }),
       metametrics: {
         getMetaMetricsId: () => this.metaMetricsController.getMetaMetricsId(),
@@ -1454,6 +1456,7 @@ export default class MetamaskController extends EventEmitter {
       messenger: this.controllerMessenger.getRestricted({
         name: 'UserStorageController',
         allowedActions: [
+          'KeyringController:getState',
           'SnapController:handleRequest',
           'AuthenticationController:getBearerToken',
           'AuthenticationController:getSessionProfile',
@@ -1463,6 +1466,7 @@ export default class MetamaskController extends EventEmitter {
           'MetamaskNotificationsController:disableMetamaskNotifications',
           'MetamaskNotificationsController:selectIsMetamaskNotificationsEnabled',
         ],
+        allowedEvents: ['KeyringController:lock', 'KeyringController:unlock'],
       }),
     });
 
@@ -1508,6 +1512,7 @@ export default class MetamaskController extends EventEmitter {
         name: 'MetamaskNotificationsController',
         allowedActions: [
           'KeyringController:getAccounts',
+          'KeyringController:getState',
           'AuthenticationController:getBearerToken',
           'AuthenticationController:isSignedIn',
           'UserStorageController:enableProfileSyncing',
@@ -1520,6 +1525,8 @@ export default class MetamaskController extends EventEmitter {
         ],
         allowedEvents: [
           'KeyringController:stateChange',
+          'KeyringController:lock',
+          'KeyringController:unlock',
           'PushPlatformNotificationsController:onNewNotifications',
         ],
       }),

From 78c564eb9f56a1b126e3235828307540e00d8952 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 30 Jul 2024 06:23:39 -0230
Subject: [PATCH 141/236] fix(cherry-pick-v12): bump fast-xml-parser from 4.3.4
 to 4.4.1 (#26218)

Cherry pick f53dc06
(https://github.com/MetaMask/metamask-extension/pull/26202) to v12

Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 2e4d0ce22551..2380b4dc7579 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18328,13 +18328,13 @@ __metadata:
   linkType: hard
 
 "fast-xml-parser@npm:^4.3.4":
-  version: 4.3.4
-  resolution: "fast-xml-parser@npm:4.3.4"
+  version: 4.4.1
+  resolution: "fast-xml-parser@npm:4.4.1"
   dependencies:
     strnum: "npm:^1.0.5"
   bin:
     fxparser: src/cli/cli.js
-  checksum: 10/ef859101980cdd02b111fce09e25949a80e373654a6c424091355930f0d364abec144d8bb722d250a0c070416566518e621e198204a6b976db68f20c16d9300b
+  checksum: 10/0c05ab8703630d8c857fafadbd78d0020d3a8e54310c3842179cd4a0d9d97e96d209ce885e91241f4aa9dd8dfc2fd924a682741a423d65153cad34da2032ec44
   languageName: node
   linkType: hard
 

From ec223c501f4bab327fac1153d5ec9873476e1a5f Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 30 Jul 2024 07:05:19 -0230
Subject: [PATCH 142/236] fix (cherry-pick-v12): setupControllerConnection
 outstream end event listener (#26141) (#26193)

Cherry pick 8f6c83e
(https://github.com/MetaMask/metamask-extension/pull/26141)

Co-authored-by: legobt <6wbvkn0j@anonaddy.me>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Danica Shen <zhaodanica@gmail.com>
---
 app/scripts/metamask-controller.js            |  43 ++-
 app/scripts/metamask-controller.test.js       | 280 ++++++++++++++++++
 .../account-tracker-api-usage.spec.ts         | 209 +++++++++++++
 3 files changed, 523 insertions(+), 9 deletions(-)
 create mode 100644 test/e2e/tests/api-usage/account-tracker-api-usage.spec.ts

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 70ff03c60d15..f05a9c79ede2 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1,5 +1,5 @@
 import EventEmitter from 'events';
-import { pipeline } from 'readable-stream';
+import { finished, pipeline } from 'readable-stream';
 import {
   AssetsContractController,
   CurrencyRateController,
@@ -5010,14 +5010,39 @@ export default class MetamaskController extends EventEmitter {
       this.once('startUISync', startUISync);
     }
 
-    outStream.on('end', () => {
-      this.activeControllerConnections -= 1;
-      this.emit(
-        'controllerConnectionChanged',
-        this.activeControllerConnections,
-      );
-      this.removeListener('update', handleUpdate);
-    });
+    const outstreamEndHandler = () => {
+      if (!outStream.mmFinished) {
+        this.activeControllerConnections -= 1;
+        this.emit(
+          'controllerConnectionChanged',
+          this.activeControllerConnections,
+        );
+        outStream.mmFinished = true;
+        this.removeListener('update', handleUpdate);
+      }
+    };
+
+    // The presence of both of the below handlers may be redundant.
+    // After upgrading metamask/object-multiples to v2.0.0, which included
+    // an upgrade of readable-streams from v2 to v3, we saw that the
+    // `outStream.on('end'` handler was almost never being called. This seems to
+    // related to how v3 handles errors vs how v2 handles errors; there
+    // are "premature close" errors in both cases, although in the case
+    // of v2 they don't prevent `outStream.on('end'` from being called.
+    // At the time that this comment was committed, it was known that we
+    // need to investigate and resolve the underlying error, however,
+    // for expediency, we are not addressing them at this time. Instead, we
+    // can observe that `readableStream.finished` preserves the same
+    // functionality as we had when we relied on readable-stream v2. Meanwhile,
+    // the `outStream.on('end')` handler was observed to have been called at least once.
+    // In an abundance of caution to prevent against unexpected future behavioral changes in
+    // streams implementations, we redundantly use multiple paths to attach the same event handler.
+    // The outstreamEndHandler therefore needs to be idempotent, which introduces the `mmFinished` property.
+
+    outStream.mmFinished = false;
+    finished(outStream, outstreamEndHandler);
+    outStream.once('close', outstreamEndHandler);
+    outStream.once('end', outstreamEndHandler);
   }
 
   /**
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 4c66e3bf8fac..141bf801dfef 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -20,6 +20,7 @@ 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 ObjectMultiplex from '@metamask/object-multiplex';
 import { NETWORK_TYPES } from '../../shared/constants/network';
 import { createTestProviderTools } from '../../test/stub/provider';
 import { HardwareDeviceNames } from '../../shared/constants/hardware-wallets';
@@ -1303,9 +1304,288 @@ describe('MetaMaskController', () => {
         });
 
         metamaskController.setupTrustedCommunication(streamTest, messageSender);
+
         await promise;
         streamTest.end();
       });
+
+      it('uses a new multiplex to set up a connection', () => {
+        jest.spyOn(metamaskController, 'setupControllerConnection');
+
+        const streamTest = createThoughStream((chunk, _, cb) => {
+          cb(chunk);
+        });
+
+        metamaskController.setupTrustedCommunication(streamTest, {});
+
+        expect(metamaskController.setupControllerConnection).toHaveBeenCalled();
+        expect(
+          metamaskController.setupControllerConnection,
+        ).toHaveBeenCalledWith(
+          expect.objectContaining({
+            _name: 'controller',
+            _parent: expect.any(ObjectMultiplex),
+          }),
+        );
+      });
+
+      const createTestStream = () => {
+        const {
+          promise: onFinishedCallbackPromise,
+          resolve: onFinishedCallbackResolve,
+        } = deferredPromise();
+        const { promise: onStreamEndPromise, resolve: onStreamEndResolve } =
+          deferredPromise();
+        const testStream = createThoughStream((chunk, _, cb) => {
+          expect(chunk.name).toStrictEqual('controller');
+          onStreamEndResolve();
+          cb();
+        });
+
+        return {
+          onFinishedCallbackPromise,
+          onStreamEndPromise,
+          onFinishedCallbackResolve,
+          testStream,
+        };
+      };
+
+      it('sets up a controller connection which emits a controllerConnectionChanged event when the controller connection is created and ended, and activeControllerConnections are updated accordingly', async () => {
+        const mockControllerConnectionChangedHandler = jest.fn();
+
+        const {
+          onStreamEndPromise,
+          onFinishedCallbackPromise,
+          onFinishedCallbackResolve,
+          testStream,
+        } = createTestStream();
+
+        metamaskController.on(
+          'controllerConnectionChanged',
+          (activeControllerConnections) => {
+            mockControllerConnectionChangedHandler(activeControllerConnections);
+            if (
+              mockControllerConnectionChangedHandler.mock.calls.length === 2
+            ) {
+              onFinishedCallbackResolve();
+            }
+          },
+        );
+
+        expect(metamaskController.activeControllerConnections).toBe(0);
+
+        metamaskController.setupTrustedCommunication(testStream, {});
+
+        expect(mockControllerConnectionChangedHandler).toHaveBeenCalledTimes(1);
+        expect(mockControllerConnectionChangedHandler).toHaveBeenLastCalledWith(
+          1,
+        );
+
+        expect(metamaskController.activeControllerConnections).toBe(1);
+
+        await onStreamEndPromise;
+        testStream.end();
+
+        await onFinishedCallbackPromise;
+
+        expect(metamaskController.activeControllerConnections).toBe(0);
+        expect(mockControllerConnectionChangedHandler).toHaveBeenCalledTimes(2);
+        expect(mockControllerConnectionChangedHandler).toHaveBeenLastCalledWith(
+          0,
+        );
+      });
+
+      it('can be called multiple times to set up multiple controller connections, which can be ended independently', async () => {
+        const mockControllerConnectionChangedHandler = jest.fn();
+
+        const testStreams = [
+          createTestStream(),
+          createTestStream(),
+          createTestStream(),
+          createTestStream(),
+          createTestStream(),
+        ];
+        metamaskController.on(
+          'controllerConnectionChanged',
+          (activeControllerConnections) => {
+            const initialChangeHandlerCallCount =
+              mockControllerConnectionChangedHandler.mock.calls.length;
+            mockControllerConnectionChangedHandler(activeControllerConnections);
+
+            if (
+              initialChangeHandlerCallCount === 5 &&
+              activeControllerConnections === 4
+            ) {
+              testStreams[1].onFinishedCallbackResolve();
+            }
+            if (
+              initialChangeHandlerCallCount === 7 &&
+              activeControllerConnections === 2
+            ) {
+              testStreams[3].onFinishedCallbackResolve();
+              testStreams[4].onFinishedCallbackResolve();
+            }
+            if (
+              initialChangeHandlerCallCount === 9 &&
+              activeControllerConnections === 0
+            ) {
+              testStreams[2].onFinishedCallbackResolve();
+              testStreams[0].onFinishedCallbackResolve();
+            }
+          },
+        );
+
+        metamaskController.setupTrustedCommunication(
+          testStreams[0].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[1].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[2].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[3].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[4].testStream,
+          {},
+        );
+
+        expect(metamaskController.activeControllerConnections).toBe(5);
+
+        await testStreams[1].promise;
+        testStreams[1].testStream.end();
+
+        await testStreams[1].onFinishedCallbackPromise;
+
+        expect(metamaskController.activeControllerConnections).toBe(4);
+
+        await testStreams[3].promise;
+        testStreams[3].testStream.end();
+
+        await testStreams[4].promise;
+        testStreams[4].testStream.end();
+
+        await testStreams[3].onFinishedCallbackPromise;
+        await testStreams[4].onFinishedCallbackPromise;
+
+        expect(metamaskController.activeControllerConnections).toBe(2);
+
+        await testStreams[2].promise;
+        testStreams[2].testStream.end();
+
+        await testStreams[0].promise;
+        testStreams[0].testStream.end();
+
+        await testStreams[2].onFinishedCallbackPromise;
+        await testStreams[0].onFinishedCallbackPromise;
+
+        expect(metamaskController.activeControllerConnections).toBe(0);
+      });
+
+      // this test could be improved by testing for actual behavior of handlers,
+      // without touching rawListeners from test
+      it('attaches listeners for trusted communication streams and removes them as streams close', async () => {
+        jest
+          .spyOn(metamaskController, 'triggerNetworkrequests')
+          .mockImplementation();
+        jest
+          .spyOn(metamaskController.onboardingController.store, 'getState')
+          .mockReturnValue({ completedOnboarding: true });
+        const mockControllerConnectionChangedHandler = jest.fn();
+
+        const testStreams = [
+          createTestStream(),
+          createTestStream(2),
+          createTestStream(3),
+          createTestStream(4),
+          createTestStream(5),
+        ];
+        const baseUpdateListenerCount =
+          metamaskController.rawListeners('update').length;
+
+        metamaskController.on(
+          'controllerConnectionChanged',
+          (activeControllerConnections) => {
+            const initialChangeHandlerCallCount =
+              mockControllerConnectionChangedHandler.mock.calls.length;
+            mockControllerConnectionChangedHandler(activeControllerConnections);
+            if (
+              initialChangeHandlerCallCount === 8 &&
+              activeControllerConnections === 1
+            ) {
+              testStreams[1].onFinishedCallbackResolve();
+              testStreams[3].onFinishedCallbackResolve();
+              testStreams[4].onFinishedCallbackResolve();
+              testStreams[2].onFinishedCallbackResolve();
+            }
+            if (
+              initialChangeHandlerCallCount === 9 &&
+              activeControllerConnections === 0
+            ) {
+              testStreams[0].onFinishedCallbackResolve();
+            }
+          },
+        );
+
+        metamaskController.setupTrustedCommunication(
+          testStreams[0].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[1].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[2].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[3].testStream,
+          {},
+        );
+        metamaskController.setupTrustedCommunication(
+          testStreams[4].testStream,
+          {},
+        );
+
+        await testStreams[1].promise;
+
+        expect(metamaskController.rawListeners('update')).toHaveLength(
+          baseUpdateListenerCount + 5,
+        );
+
+        testStreams[1].testStream.end();
+        await testStreams[3].promise;
+        testStreams[3].testStream.end();
+        testStreams[3].testStream.end();
+
+        await testStreams[4].promise;
+        testStreams[4].testStream.end();
+        await testStreams[2].promise;
+        testStreams[2].testStream.end();
+        await testStreams[1].onFinishedCallbackPromise;
+        await testStreams[3].onFinishedCallbackPromise;
+        await testStreams[4].onFinishedCallbackPromise;
+        await testStreams[2].onFinishedCallbackPromise;
+        expect(metamaskController.rawListeners('update')).toHaveLength(
+          baseUpdateListenerCount + 1,
+        );
+
+        await testStreams[0].promise;
+        testStreams[0].testStream.end();
+
+        await testStreams[0].onFinishedCallbackPromise;
+
+        expect(metamaskController.rawListeners('update')).toHaveLength(
+          baseUpdateListenerCount,
+        );
+      });
     });
 
     describe('#markPasswordForgotten', () => {
diff --git a/test/e2e/tests/api-usage/account-tracker-api-usage.spec.ts b/test/e2e/tests/api-usage/account-tracker-api-usage.spec.ts
new file mode 100644
index 000000000000..5ab35138ce7b
--- /dev/null
+++ b/test/e2e/tests/api-usage/account-tracker-api-usage.spec.ts
@@ -0,0 +1,209 @@
+import { strict as assert } from 'assert';
+import { MockedEndpoint } from 'mockttp';
+import { JsonRpcRequest } from '@metamask/utils';
+import {
+  withFixtures,
+  defaultGanacheOptions,
+  unlockWallet,
+  veryLargeDelayMs,
+} from '../../helpers';
+import FixtureBuilder from '../../fixture-builder';
+import { Driver } from '../../webdriver/driver';
+import { Mockttp } from '../../mock-e2e';
+
+async function mockInfura(mockServer: Mockttp): Promise<MockedEndpoint[]> {
+  const blockNumber = { value: 0 };
+
+  return [
+    await mockServer
+      .forPost(/infura/u)
+      .withJsonBodyIncluding({ method: 'eth_blockNumber' })
+      .times(50)
+      .thenCallback(() => {
+        // We need to ensure the mocked block number keeps increasing,
+        // as this results in block tracker listeners firing, which is
+        // needed for the potential account tracker network requests being
+        // tested against here.
+        blockNumber.value += 1;
+
+        return {
+          statusCode: 200,
+          json: {
+            jsonrpc: '2.0',
+            id: '1111111111111111',
+            result: blockNumber.value.toString(16),
+          },
+        };
+      }),
+    await mockServer.forPost(/infura/u).thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          jsonrpc: '2.0',
+          id: '1111111111111111',
+          result: '0x1',
+        },
+      };
+    }),
+    await mockServer.forGet(/infura/u).thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          jsonrpc: '2.0',
+          id: '1111111111111111',
+          result: '0x0',
+        },
+      };
+    }),
+  ];
+}
+
+async function getAllInfuraJsonRpcRequests(
+  mockedEndpoint: MockedEndpoint[],
+): Promise<JsonRpcRequest[]> {
+  const allInfuraJsonRpcRequests: JsonRpcRequest[] = [];
+  let seenRequests;
+  let seenProviderRequests;
+
+  for (const m of mockedEndpoint) {
+    seenRequests = await m.getSeenRequests();
+    seenProviderRequests = seenRequests.filter((request) =>
+      request.url.match('infura'),
+    );
+
+    for (const r of seenProviderRequests) {
+      const json = await r.body.getJson();
+      if (json !== undefined) {
+        allInfuraJsonRpcRequests.push(json);
+      }
+    }
+  }
+
+  return allInfuraJsonRpcRequests;
+}
+
+function getSpecifiedJsonRpcRequests(
+  jsonRpcRequestArray: JsonRpcRequest[],
+  methodsToGet: string[],
+) {
+  return jsonRpcRequestArray.filter(({ method }) =>
+    methodsToGet.includes(method),
+  );
+}
+
+describe('Account Tracker API Usage', function () {
+  it('should not make eth_call or eth_getBalance requests before the UI is opened and should make those requests after the UI is opened', async function () {
+    // Note: we are not testing that eth_getBlockByNumber is not called before the UI
+    // is opened because there is a known bug that results in it being called if the
+    // user is already onboarded: https://github.com/MetaMask/MetaMask-planning/issues/2151
+    // Once that issue is resolved, we can add eth_getBlockByNumber to the below array.
+    const RPC_METHODS_TO_TEST = ['eth_call', 'eth_getBalance'];
+
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().withNetworkControllerOnMainnet().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockInfura,
+      },
+      async ({
+        driver,
+        mockedEndpoint,
+      }: {
+        driver: Driver;
+        mockedEndpoint: MockedEndpoint[];
+      }) => {
+        await driver.delay(veryLargeDelayMs);
+        let allInfuraJsonRpcRequests = await getAllInfuraJsonRpcRequests(
+          mockedEndpoint,
+        );
+        let rpcMethodsToTestRequests = getSpecifiedJsonRpcRequests(
+          allInfuraJsonRpcRequests,
+          RPC_METHODS_TO_TEST,
+        );
+
+        assert.ok(
+          rpcMethodsToTestRequests.length === 0,
+          `An ${RPC_METHODS_TO_TEST.join(
+            ' or ',
+          )} request has been made to infura before opening the UI`,
+        );
+
+        await unlockWallet(driver);
+        await driver.delay(veryLargeDelayMs);
+
+        allInfuraJsonRpcRequests = await getAllInfuraJsonRpcRequests(
+          mockedEndpoint,
+        );
+        rpcMethodsToTestRequests = getSpecifiedJsonRpcRequests(
+          allInfuraJsonRpcRequests,
+          RPC_METHODS_TO_TEST,
+        );
+
+        assert.ok(
+          rpcMethodsToTestRequests.length > 0,
+          `No ${RPC_METHODS_TO_TEST.join(
+            ' or ',
+          )} request has been made to infura since opening the UI`,
+        );
+      },
+    );
+  });
+
+  it('should not make eth_call or eth_getBalance or eth_getBlockByNumber requests after the UI is closed', async function () {
+    const RPC_METHODS_TO_TEST = [
+      'eth_getBlockByNumber',
+      'eth_call',
+      'eth_getBalance',
+    ];
+
+    await withFixtures(
+      {
+        fixtures: new FixtureBuilder().withNetworkControllerOnMainnet().build(),
+        ganacheOptions: defaultGanacheOptions,
+        title: this.test?.fullTitle(),
+        testSpecificMock: mockInfura,
+      },
+      async ({
+        driver,
+        mockedEndpoint,
+      }: {
+        driver: Driver;
+        mockedEndpoint: MockedEndpoint[];
+      }) => {
+        await unlockWallet(driver);
+        await driver.delay(veryLargeDelayMs);
+        const initialInfuraJsonRpcRequests = await getAllInfuraJsonRpcRequests(
+          mockedEndpoint,
+        );
+
+        await driver.openNewURL('about:blank');
+        // The delay is intentionally 20000, to ensure we cover at least 1 polling
+        // loop of time for the block tracker.
+        await driver.delay(20000);
+
+        const currentInfuraJsonRpcRequests = await getAllInfuraJsonRpcRequests(
+          mockedEndpoint,
+        );
+
+        const initialRpcMethodsToTestRequests = getSpecifiedJsonRpcRequests(
+          initialInfuraJsonRpcRequests,
+          RPC_METHODS_TO_TEST,
+        );
+
+        const currentRpcMethodsToTestRequests = getSpecifiedJsonRpcRequests(
+          currentInfuraJsonRpcRequests,
+          RPC_METHODS_TO_TEST,
+        );
+
+        assert.ok(
+          initialRpcMethodsToTestRequests.length ===
+            currentRpcMethodsToTestRequests.length,
+          `An ${RPC_METHODS_TO_TEST.join(
+            ' or ',
+          )} request has been made to infura after closing the UI`,
+        );
+      },
+    );
+  });
+});

From 02bbe457ef31cdd36d704524d34dd503783b35d0 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 30 Jul 2024 07:05:54 -0230
Subject: [PATCH 143/236] chore (cherry-pick-v12): Add en_GB locale (#26196)
 (#26211)

chore (cherry-pick-v12): Add en_GB locale (#26196
---
 app/_locales/en_GB/messages.json | 6598 ++++++++++++++++++++++++++++++
 1 file changed, 6598 insertions(+)
 create mode 100644 app/_locales/en_GB/messages.json

diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
new file mode 100644
index 000000000000..551aec93bca3
--- /dev/null
+++ b/app/_locales/en_GB/messages.json
@@ -0,0 +1,6598 @@
+{
+  "QRHardwareInvalidTransactionTitle": {
+    "message": "Error"
+  },
+  "QRHardwareMismatchedSignId": {
+    "message": "Incongruent transaction data. Please check the transaction details."
+  },
+  "QRHardwarePubkeyAccountOutOfRange": {
+    "message": "No more accounts. If you would like to access another account unlisted below, please reconnect your hardware wallet and select it."
+  },
+  "QRHardwareScanInstructions": {
+    "message": "Place the QR code in front of your camera. The screen is blurred, but it will not affect the reading."
+  },
+  "QRHardwareSignRequestCancel": {
+    "message": "Reject"
+  },
+  "QRHardwareSignRequestDescription": {
+    "message": "After you’ve signed with your wallet, click on 'Get Signature' to receive the signature"
+  },
+  "QRHardwareSignRequestGetSignature": {
+    "message": "Get signature"
+  },
+  "QRHardwareSignRequestSubtitle": {
+    "message": "Scan the QR code with your wallet"
+  },
+  "QRHardwareSignRequestTitle": {
+    "message": "Request signature"
+  },
+  "QRHardwareUnknownQRCodeTitle": {
+    "message": "Error"
+  },
+  "QRHardwareUnknownWalletQRCode": {
+    "message": "Invalid QR code. Please scan the sync QR code of the hardware wallet."
+  },
+  "QRHardwareWalletImporterTitle": {
+    "message": "Scan QR code"
+  },
+  "QRHardwareWalletSteps1Description": {
+    "message": "You can choose from a list of official QR-code supporting partners below."
+  },
+  "QRHardwareWalletSteps1Title": {
+    "message": "Connect your QR hardware wallet"
+  },
+  "QRHardwareWalletSteps2Description": {
+    "message": "Ngrave (coming soon)"
+  },
+  "SIWEAddressInvalid": {
+    "message": "The address in the sign-in request does not match the address of the account you are using to sign in."
+  },
+  "SIWEDomainInvalidText": {
+    "message": "The site you're attempting to sign into doesn't match the domain in the request. Proceed with caution."
+  },
+  "SIWEDomainInvalidTitle": {
+    "message": "Deceptive site request."
+  },
+  "SIWEDomainWarningBody": {
+    "message": "The website ($1) is asking you to sign in to the wrong domain. This may be a phishing attack.",
+    "description": "$1 represents the website domain"
+  },
+  "SIWEDomainWarningLabel": {
+    "message": "Unsafe"
+  },
+  "SIWELabelChainID": {
+    "message": "Chain ID:"
+  },
+  "SIWELabelExpirationTime": {
+    "message": "Expires At:"
+  },
+  "SIWELabelIssuedAt": {
+    "message": "Issued At:"
+  },
+  "SIWELabelMessage": {
+    "message": "Message:"
+  },
+  "SIWELabelNonce": {
+    "message": "Nonce:"
+  },
+  "SIWELabelNotBefore": {
+    "message": "Not Before:"
+  },
+  "SIWELabelRequestID": {
+    "message": "Request ID:"
+  },
+  "SIWELabelResources": {
+    "message": "Resources: $1",
+    "description": "$1 represents the number of resources"
+  },
+  "SIWELabelURI": {
+    "message": "URI:"
+  },
+  "SIWELabelVersion": {
+    "message": "Version:"
+  },
+  "SIWESiteRequestSubtitle": {
+    "message": "This site is requesting to sign in with"
+  },
+  "SIWESiteRequestTitle": {
+    "message": "Sign-in request"
+  },
+  "SIWEWarningSubtitle": {
+    "message": "To confirm you understand, check:"
+  },
+  "SIWEWarningTitle": {
+    "message": "Are you sure?"
+  },
+  "about": {
+    "message": "About"
+  },
+  "accept": {
+    "message": "Accept"
+  },
+  "acceptTermsOfUse": {
+    "message": "I have read and agree to the $1",
+    "description": "$1 is the `terms` message"
+  },
+  "accessAndSpendNoticeNFT": {
+    "message": "$1 may access and spend this asset",
+    "description": "$1 is the url of the site requesting ability to spend"
+  },
+  "accessYourWalletWithSRP": {
+    "message": "Access your wallet with your Secret Recovery Phrase"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask cannot recover your password. We will use your Secret Recovery Phrase to validate your ownership, restore your wallet and set up a new password. First, enter the Secret Recovery Phrase that you were given when you created your wallet. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
+  "accessingYourCamera": {
+    "message": "Accessing your camera..."
+  },
+  "account": {
+    "message": "Account"
+  },
+  "accountActivity": {
+    "message": "Account activity"
+  },
+  "accountActivityText": {
+    "message": "Select the accounts you want to be notified about:"
+  },
+  "accountDetails": {
+    "message": "Account details"
+  },
+  "accountIdenticon": {
+    "message": "Account identicon"
+  },
+  "accountIsntConnectedToastText": {
+    "message": "$1 isn't connected to $2"
+  },
+  "accountName": {
+    "message": "Account name"
+  },
+  "accountNameDuplicate": {
+    "message": "This account name already exists",
+    "description": "This is an error message shown when the user enters a new account name that matches an existing account name"
+  },
+  "accountNameReserved": {
+    "message": "This account name is reserved",
+    "description": "This is an error message shown when the user enters a new account name that is reserved for future use"
+  },
+  "accountOptions": {
+    "message": "Account options"
+  },
+  "accountSelectionRequired": {
+    "message": "You need to select an account!"
+  },
+  "accountTypeNotSupported": {
+    "message": "Account type not supported"
+  },
+  "accounts": {
+    "message": "Accounts"
+  },
+  "accountsConnected": {
+    "message": "Accounts connected"
+  },
+  "active": {
+    "message": "Active"
+  },
+  "activity": {
+    "message": "Activity"
+  },
+  "activityLog": {
+    "message": "Activity log"
+  },
+  "add": {
+    "message": "Add"
+  },
+  "addANetwork": {
+    "message": "Add a network"
+  },
+  "addANetworkManually": {
+    "message": "Add a network manually"
+  },
+  "addANickname": {
+    "message": "Add a nickname"
+  },
+  "addAccount": {
+    "message": "Add account"
+  },
+  "addAccountToMetaMask": {
+    "message": "Add account to MetaMask"
+  },
+  "addAcquiredTokens": {
+    "message": "Add the tokens you've acquired using MetaMask"
+  },
+  "addAlias": {
+    "message": "Add alias"
+  },
+  "addBlockExplorer": {
+    "message": "Add a block explorer"
+  },
+  "addContact": {
+    "message": "Add contact"
+  },
+  "addCustomNetwork": {
+    "message": "Add custom network"
+  },
+  "addEthereumChainConfirmationDescription": {
+    "message": "This will allow this network to be used within MetaMask."
+  },
+  "addEthereumChainConfirmationRisks": {
+    "message": "MetaMask does not verify custom networks."
+  },
+  "addEthereumChainConfirmationRisksLearnMore": {
+    "message": "Learn about $1.",
+    "description": "$1 is a link with text that is provided by the 'addEthereumChainConfirmationRisksLearnMoreLink' key"
+  },
+  "addEthereumChainConfirmationRisksLearnMoreLink": {
+    "message": "scams and network security risks",
+    "description": "Link text for the 'addEthereumChainConfirmationRisksLearnMore' translation key"
+  },
+  "addEthereumChainConfirmationTitle": {
+    "message": "Allow this site to add a network?"
+  },
+  "addEthereumChainWarningModalHeader": {
+    "message": "Only add this RPC provider if you’re sure you can trust it. $1",
+    "description": "$1 is addEthereumChainWarningModalHeaderPartTwo passed separately so that it can be bolded"
+  },
+  "addEthereumChainWarningModalHeaderPartTwo": {
+    "message": "Malicious providers may lie about the state of the blockchain and record your network activity."
+  },
+  "addEthereumChainWarningModalListHeader": {
+    "message": "It's important that your provider is reliable, as it has the power to:"
+  },
+  "addEthereumChainWarningModalListPointOne": {
+    "message": "See your accounts and IP address, and associate them together"
+  },
+  "addEthereumChainWarningModalListPointThree": {
+    "message": "Show account balances and other on-chain states"
+  },
+  "addEthereumChainWarningModalListPointTwo": {
+    "message": "Broadcast your transactions"
+  },
+  "addEthereumChainWarningModalTitle": {
+    "message": "You are adding a new RPC provider for Ethereum Mainnet"
+  },
+  "addFriendsAndAddresses": {
+    "message": "Add friends and addresses you trust"
+  },
+  "addFromAListOfPopularNetworks": {
+    "message": "Add from a list of popular networks or add a network manually. Only interact with the entities you trust."
+  },
+  "addHardwareWallet": {
+    "message": "Add hardware wallet"
+  },
+  "addIPFSGateway": {
+    "message": "Add your preferred IPFS gateway"
+  },
+  "addImportAccount": {
+    "message": "Add account or hardware wallet"
+  },
+  "addMemo": {
+    "message": "Add memo"
+  },
+  "addMoreNetworks": {
+    "message": "add more networks manually"
+  },
+  "addNetwork": {
+    "message": "Add network"
+  },
+  "addNetworkTooltipWarning": {
+    "message": "This network connection relies on third parties. This connection may be less reliable or enable third-parties to track activity. $1",
+    "description": "$1 is Learn more link"
+  },
+  "addNewAccount": {
+    "message": "Add a new Ethereum account"
+  },
+  "addNewBitcoinAccount": {
+    "message": "Add a new Bitcoin account (Beta)"
+  },
+  "addNewBitcoinTestnetAccount": {
+    "message": "Add a new Bitcoin account (Testnet)"
+  },
+  "addNewToken": {
+    "message": "Add new token"
+  },
+  "addNft": {
+    "message": "Add NFT"
+  },
+  "addNfts": {
+    "message": "Add NFTs"
+  },
+  "addRpcUrl": {
+    "message": "Add RPC URL"
+  },
+  "addSnapAccountToggle": {
+    "message": "Enable \"Add account Snap (Beta)\""
+  },
+  "addSnapAccountsDescription": {
+    "message": "Turning on this feature will give you the option to add the new Beta account Snaps right from your account list. If you install an account Snap, remember that it is a third-party service."
+  },
+  "addSuggestedNFTs": {
+    "message": "Add suggested NFTs"
+  },
+  "addSuggestedTokens": {
+    "message": "Add suggested tokens"
+  },
+  "addToken": {
+    "message": "Add token"
+  },
+  "addTokenByContractAddress": {
+    "message": "Can’t find a token? You can manually add any token by pasting its address. Token contract addresses can be found on $1",
+    "description": "$1 is a blockchain explorer for a specific network, e.g. Etherscan for Ethereum"
+  },
+  "addUrl": {
+    "message": "Add URL"
+  },
+  "addingAccount": {
+    "message": "Adding account"
+  },
+  "addingCustomNetwork": {
+    "message": "Adding Network"
+  },
+  "addingTokens": {
+    "message": "Adding tokens"
+  },
+  "additionalNetworks": {
+    "message": "Additional networks"
+  },
+  "additionalRpcUrl": {
+    "message": "Additional RPC URL"
+  },
+  "address": {
+    "message": "Address"
+  },
+  "addressCopied": {
+    "message": "Address copied!"
+  },
+  "advanced": {
+    "message": "Advanced"
+  },
+  "advancedBaseGasFeeToolTip": {
+    "message": "When your transaction gets included in the block, any difference between your max base fee and the actual base fee will be refunded. Total amount is calculated as max base fee (in GWEI) * gas limit."
+  },
+  "advancedConfiguration": {
+    "message": "Advanced configuration"
+  },
+  "advancedDetailsDataDesc": {
+    "message": "Data"
+  },
+  "advancedDetailsHexDesc": {
+    "message": "Hex"
+  },
+  "advancedDetailsNonceDesc": {
+    "message": "Nonce"
+  },
+  "advancedDetailsNonceTooltip": {
+    "message": "This is the transaction number of an account. Nonce for the first transaction is 0 and it increases in sequential order."
+  },
+  "advancedGasFeeDefaultOptIn": {
+    "message": "Save these values as my default for the $1 network.",
+    "description": "$1 is the current network name."
+  },
+  "advancedGasFeeModalTitle": {
+    "message": "Advanced gas fee"
+  },
+  "advancedGasPriceTitle": {
+    "message": "Gas price"
+  },
+  "advancedPriorityFeeToolTip": {
+    "message": "Priority fee (aka “miner tip”) goes directly to miners and incentivizes them to prioritize your transaction."
+  },
+  "agreeTermsOfUse": {
+    "message": "I agree to MetaMask's $1",
+    "description": "$1 is the `terms` link"
+  },
+  "airgapVault": {
+    "message": "AirGap Vault"
+  },
+  "alert": {
+    "message": "Alert"
+  },
+  "alertActionBuy": {
+    "message": "Buy ETH"
+  },
+  "alertActionUpdateGas": {
+    "message": "Update gas limit"
+  },
+  "alertActionUpdateGasFee": {
+    "message": "Update fee"
+  },
+  "alertActionUpdateGasFeeLevel": {
+    "message": "Update gas options"
+  },
+  "alertBannerMultipleAlertsDescription": {
+    "message": "If you approve this request, a third party known for scams might take all your assets."
+  },
+  "alertBannerMultipleAlertsTitle": {
+    "message": "Multiple alerts!"
+  },
+  "alertDisableTooltip": {
+    "message": "This can be changed in \"Settings > Alerts\""
+  },
+  "alertMessageGasEstimateFailed": {
+    "message": "We’re unable to provide an accurate fee and this estimate might be high. We suggest you to input a custom gas limit, but there’s a risk the transaction will still fail."
+  },
+  "alertMessageGasFeeLow": {
+    "message": "When choosing a low fee, expect slower transactions and longer wait times. For faster transactions, choose Market or Aggressive fee options."
+  },
+  "alertMessageGasTooLow": {
+    "message": "To continue with this transaction, you’ll need to increase the gas limit to 21000 or higher."
+  },
+  "alertMessageInsufficientBalance": {
+    "message": "You do not have enough ETH in your account to pay for transaction fees."
+  },
+  "alertMessageNetworkBusy": {
+    "message": "Gas prices are high and estimates are less accurate."
+  },
+  "alertMessageNoGasPrice": {
+    "message": "We can’t move forward with this transaction until you manually update the fee."
+  },
+  "alertMessagePendingTransactions": {
+    "message": "This transaction won’t go through until a previous transaction is complete. Learn how to cancel or speed up a transaction."
+  },
+  "alertMessageSignInDomainMismatch": {
+    "message": "The site making the request is not the site you’re signing into. This could be an attempt to steal your login credentials."
+  },
+  "alertMessageSignInWrongAccount": {
+    "message": "This site is asking you to sign in using the wrong account."
+  },
+  "alertMessageSigningOrSubmitting": {
+    "message": "This transaction will only go through once your previous transaction is complete."
+  },
+  "alertModalAcknowledge": {
+    "message": "I have acknowledged the risk and still want to proceed"
+  },
+  "alertModalDetails": {
+    "message": "Alert Details"
+  },
+  "alertModalReviewAllAlerts": {
+    "message": "Review all alerts"
+  },
+  "alertReasonGasEstimateFailed": {
+    "message": "Inaccurate fee"
+  },
+  "alertReasonGasFeeLow": {
+    "message": "Slow speed"
+  },
+  "alertReasonGasTooLow": {
+    "message": "Low gas limit"
+  },
+  "alertReasonInsufficientBalance": {
+    "message": "Insufficient funds"
+  },
+  "alertReasonNetworkBusy": {
+    "message": "Network is busy"
+  },
+  "alertReasonNoGasPrice": {
+    "message": "Fee estimate unavailable"
+  },
+  "alertReasonPendingTransactions": {
+    "message": "Pending transaction"
+  },
+  "alertReasonSignIn": {
+    "message": "Suspicious sign-in request"
+  },
+  "alertReasonWrongAccount": {
+    "message": "Wrong account"
+  },
+  "alertSettingsUnconnectedAccount": {
+    "message": "Browsing a website with an unconnected account selected"
+  },
+  "alertSettingsUnconnectedAccountDescription": {
+    "message": "This alert is shown in the popup when you are browsing a connected web3 site, but the currently selected account is not connected."
+  },
+  "alertSettingsWeb3ShimUsage": {
+    "message": "When a website tries to use the removed window.web3 API"
+  },
+  "alertSettingsWeb3ShimUsageDescription": {
+    "message": "This alert is shown in the popup when you are browsing a site that tries to use the removed window.web3 API, and may be broken as a result."
+  },
+  "alerts": {
+    "message": "Alerts"
+  },
+  "all": {
+    "message": "All"
+  },
+  "allCustodianAccountsConnectedSubtitle": {
+    "message": "You have either already connected all your custodian accounts or don’t have any account to connect to MetaMask Institutional."
+  },
+  "allCustodianAccountsConnectedTitle": {
+    "message": "No accounts available to connect"
+  },
+  "allOfYour": {
+    "message": "All of your $1",
+    "description": "$1 is the symbol or name of the token that the user is approving spending"
+  },
+  "allPermissions": {
+    "message": "All Permissions"
+  },
+  "allTimeHigh": {
+    "message": "All time high"
+  },
+  "allTimeLow": {
+    "message": "All time low"
+  },
+  "allYourNFTsOf": {
+    "message": "All of your NFTs from $1",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
+  "allow": {
+    "message": "Allow"
+  },
+  "allowMetaMaskToDetectNFTs": {
+    "message": "Allow MetaMask to detect and display your NFTs with autodetection. You’ll be able to:"
+  },
+  "allowMetaMaskToDetectTokens": {
+    "message": "Allow MetaMask to detect and display your tokens with autodetection. You’ll be able to:"
+  },
+  "allowMmiToConnectToCustodian": {
+    "message": "This will allow MMI to connect to $1 to import your accounts."
+  },
+  "allowNotifications": {
+    "message": "Allow notifications"
+  },
+  "allowSpendToken": {
+    "message": "Give permission to access your $1?",
+    "description": "$1 is the symbol of the token that are requesting to spend"
+  },
+  "allowWithdrawAndSpend": {
+    "message": "Allow $1 to withdraw and spend up to the following amount:",
+    "description": "The url of the site that requested permission to 'withdraw and spend'"
+  },
+  "amount": {
+    "message": "Amount"
+  },
+  "amountReceived": {
+    "message": "Amount Received"
+  },
+  "amountSent": {
+    "message": "Amount Sent"
+  },
+  "andForListItems": {
+    "message": "$1, and $2",
+    "description": "$1 is the first item, $2 is the last item in a list of items. Used in Snap Install Warning modal."
+  },
+  "andForTwoItems": {
+    "message": "$1 and $2",
+    "description": "$1 is the first item, $2 is the second item. Used in Snap Install Warning modal."
+  },
+  "announcements": {
+    "message": "Announcements"
+  },
+  "appDescription": {
+    "message": "An Ethereum Wallet in your Browser",
+    "description": "The description of the application"
+  },
+  "appName": {
+    "message": "MetaMask",
+    "description": "The name of the application"
+  },
+  "appNameBeta": {
+    "message": "MetaMask Beta",
+    "description": "The name of the application (Beta)"
+  },
+  "appNameFlask": {
+    "message": "MetaMask Flask",
+    "description": "The name of the application (Flask)"
+  },
+  "appNameMmi": {
+    "message": "MetaMask Institutional",
+    "description": "The name of the application (MMI)"
+  },
+  "approve": {
+    "message": "Approve spend limit"
+  },
+  "approveAllTokensTitle": {
+    "message": "Allow access to and transfer of all your $1?",
+    "description": "$1 is the symbol of the token for which the user is granting approval"
+  },
+  "approveAllTokensTitleWithoutSymbol": {
+    "message": "Allow access to and transfer all of your NFTs from $1?",
+    "description": "$1 a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
+  "approveButtonText": {
+    "message": "Approve"
+  },
+  "approveIncreaseAllowance": {
+    "message": "Increase $1 spending cap",
+    "description": "The token symbol that is being approved"
+  },
+  "approveSpendingCap": {
+    "message": "Approve $1 spending cap",
+    "description": "The token symbol that is being approved"
+  },
+  "approveTokenDescription": {
+    "message": "This allows a third party to access and transfer the following NFTs without further notice until you revoke its access."
+  },
+  "approveTokenDescriptionWithoutSymbol": {
+    "message": "This allows a third party to access and transfer all of your NFTs from $1 without further notice until you revoke its access.",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
+  "approveTokenTitle": {
+    "message": "Allow access to and transfer of your $1?",
+    "description": "$1 is the symbol of the token for which the user is granting approval"
+  },
+  "approved": {
+    "message": "Approved"
+  },
+  "approvedAsset": {
+    "message": "Approved asset"
+  },
+  "approvedOn": {
+    "message": "Approved on $1",
+    "description": "$1 is the approval date for a permission"
+  },
+  "approvedOnForAccounts": {
+    "message": "Approved on $1 for $2",
+    "description": "$1 is the approval date for a permission. $2 is the AvatarGroup component displaying account images."
+  },
+  "areYouSure": {
+    "message": "Are you sure?"
+  },
+  "asset": {
+    "message": "Asset"
+  },
+  "assetOptions": {
+    "message": "Asset options"
+  },
+  "attemptSendingAssets": {
+    "message": "You may lose your assets if you try to send them from another network. Transfer funds safely between networks by using a bridge."
+  },
+  "attemptSendingAssetsWithPortfolio": {
+    "message": "You may lose your assets if you try to send them from another network. Transfer funds safely between networks by using a bridge, like $1"
+  },
+  "attemptToCancelSwapForFree": {
+    "message": "Attempt to cancel swap for free"
+  },
+  "attributes": {
+    "message": "Attributes"
+  },
+  "attributions": {
+    "message": "Attributions"
+  },
+  "auroraRpcDeprecationMessage": {
+    "message": "The Infura RPC URL is no longer supporting Aurora."
+  },
+  "authorizedPermissions": {
+    "message": "You have authorized the following permissions"
+  },
+  "autoDetectTokens": {
+    "message": "Autodetect tokens"
+  },
+  "autoDetectTokensDescription": {
+    "message": "We use third-party APIs to detect and display new tokens sent to your wallet. Turn off if you don’t want the app to automatically pull data from those services. $1",
+    "description": "$1 is a link to a support article"
+  },
+  "autoLockTimeLimit": {
+    "message": "Auto-lock timer (minutes)"
+  },
+  "autoLockTimeLimitDescription": {
+    "message": "Set the idle time in minutes before MetaMask will become locked."
+  },
+  "average": {
+    "message": "Average"
+  },
+  "awaitingApproval": {
+    "message": "Awaiting approval..."
+  },
+  "back": {
+    "message": "Back"
+  },
+  "backup": {
+    "message": "Back up"
+  },
+  "backupApprovalInfo": {
+    "message": "This secret code is required to recover your wallet in case you lose your device, forget your password, have to re-install MetaMask, or want to access your wallet on another device."
+  },
+  "backupApprovalNotice": {
+    "message": "Back up your Secret Recovery Phrase to keep your wallet and funds secure."
+  },
+  "backupKeyringSnapReminder": {
+    "message": "Be sure you can access any accounts created by this Snap on your own before removing it"
+  },
+  "backupNow": {
+    "message": "Back up now"
+  },
+  "backupUserData": {
+    "message": "Back up your data"
+  },
+  "backupUserDataDescription": {
+    "message": "You can back up data like your contacts and preferences."
+  },
+  "balance": {
+    "message": "Balance"
+  },
+  "balanceOutdated": {
+    "message": "Balance may be outdated"
+  },
+  "baseFee": {
+    "message": "Base fee"
+  },
+  "basic": {
+    "message": "Basic"
+  },
+  "basicConfigurationBannerCTA": {
+    "message": "Turn on basic functionality"
+  },
+  "basicConfigurationBannerTitle": {
+    "message": "Basic functionality is off"
+  },
+  "basicConfigurationDescription": {
+    "message": "MetaMask offers basic features like token details and gas settings through internet services. When you use internet services, your IP address is shared, in this case with MetaMask. This is just like when you visit any website. MetaMask uses this data temporarily and never sells your data. You can use a VPN or turn off these services, but it may affect your MetaMask experience. To learn more read our $1.",
+    "description": "$1 is to be replaced by the message for privacyMsg, and will link to https://consensys.io/privacy-policy"
+  },
+  "basicConfigurationLabel": {
+    "message": "Basic functionality"
+  },
+  "basicConfigurationModalCheckbox": {
+    "message": "I understand and want to continue"
+  },
+  "basicConfigurationModalDisclaimerOff": {
+    "message": "This means you won't fully optimize your time on MetaMask. Basic features (like token details, optimal gas settings, and others) won't be available to you."
+  },
+  "basicConfigurationModalDisclaimerOn": {
+    "message": "To optimize your time on MetaMask, you’ll need to turn on this feature. Basic functions (like token details, optimal gas settings, and others) are important to the web3 experience."
+  },
+  "basicConfigurationModalHeadingOff": {
+    "message": "Turn off basic functionality"
+  },
+  "basicConfigurationModalHeadingOn": {
+    "message": "Turn on basic functionality"
+  },
+  "beCareful": {
+    "message": "Be careful"
+  },
+  "beta": {
+    "message": "Beta"
+  },
+  "betaHeaderText": {
+    "message": "This is a beta version. Please report bugs $1",
+    "description": "$1 represents the word 'here' in a hyperlink"
+  },
+  "betaMetamaskInstitutionalVersion": {
+    "message": "MetaMask Institutional Beta Version"
+  },
+  "betaMetamaskVersion": {
+    "message": "MetaMask Beta Version"
+  },
+  "betaTerms": {
+    "message": "Beta Terms of use"
+  },
+  "betaWalletCreationSuccessReminder1": {
+    "message": "MetaMask Beta can’t recover your Secret Recovery Phrase."
+  },
+  "betaWalletCreationSuccessReminder2": {
+    "message": "MetaMask Beta will never ask you for your Secret Recovery Phrase."
+  },
+  "billionAbbreviation": {
+    "message": "B",
+    "description": "Shortened form of 'billion'"
+  },
+  "bitcoinActivityNotSupported": {
+    "message": "Bitcoin activity is not supported"
+  },
+  "bitcoinSupportSectionTitle": {
+    "message": "Bitcoin"
+  },
+  "bitcoinSupportToggleDescription": {
+    "message": "Turning on this feature will give you the option to add a Bitcoin Account to your MetaMask Extension derived from your existing Secret Recovery Phrase. This is an experimental Beta feature, so you should use it at your own risk. To give us feedback on this new Bitcoin experience, please fill out this $1.",
+    "description": "$1 is the link to a product feedback form"
+  },
+  "bitcoinSupportToggleTitle": {
+    "message": "Enable \"Add a new Bitcoin account (Beta)\""
+  },
+  "bitcoinTestnetSupportToggleDescription": {
+    "message": "Turning on this feature will give you the option to add a Bitcoin Account for the test network."
+  },
+  "bitcoinTestnetSupportToggleTitle": {
+    "message": "Enable \"Add a new Bitcoin account (Testnet)\""
+  },
+  "blockExplorerAccountAction": {
+    "message": "Account",
+    "description": "This is used with viewOnEtherscan and viewInExplorer e.g View Account in Explorer"
+  },
+  "blockExplorerAssetAction": {
+    "message": "Asset",
+    "description": "This is used with viewOnEtherscan and viewInExplorer e.g View Asset in Explorer"
+  },
+  "blockExplorerSwapAction": {
+    "message": "Swap",
+    "description": "This is used with viewOnEtherscan e.g View Swap on Etherscan"
+  },
+  "blockExplorerUrl": {
+    "message": "Block explorer URL"
+  },
+  "blockExplorerUrlDefinition": {
+    "message": "The URL used as the block explorer for this network."
+  },
+  "blockExplorerView": {
+    "message": "View account at $1",
+    "description": "$1 replaced by URL for custom block explorer"
+  },
+  "blockaid": {
+    "message": "Blockaid"
+  },
+  "blockaidAlertInfo": {
+    "message": "We don't recommend proceeding with this request."
+  },
+  "blockaidDescriptionApproveFarming": {
+    "message": "If you approve this request, a third party known for scams might take all your assets."
+  },
+  "blockaidDescriptionBlurFarming": {
+    "message": "If you approve this request, someone can steal your assets listed on Blur."
+  },
+  "blockaidDescriptionErrored": {
+    "message": "Because of an error, we couldn't check for security alerts. Only continue if you trust every address involved."
+  },
+  "blockaidDescriptionMaliciousDomain": {
+    "message": "You're interacting with a malicious domain. If you approve this request, you might lose your assets."
+  },
+  "blockaidDescriptionMightLoseAssets": {
+    "message": "If you approve this request, you might lose your assets."
+  },
+  "blockaidDescriptionSeaportFarming": {
+    "message": "If you approve this request, someone can steal your assets listed on OpenSea."
+  },
+  "blockaidDescriptionTransferFarming": {
+    "message": "If you approve this request, a third party known for scams will take all your assets."
+  },
+  "blockaidDescriptionWarning": {
+    "message": "This could be a deceptive request. Only continue if you trust every address involved."
+  },
+  "blockaidMessage": {
+    "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"
+  },
+  "blockaidTitleMayNotBeSafe": {
+    "message": "Be careful"
+  },
+  "blockaidTitleSuspicious": {
+    "message": "This is a suspicious request"
+  },
+  "blockies": {
+    "message": "Blockies"
+  },
+  "boughtFor": {
+    "message": "Bought for"
+  },
+  "bridge": {
+    "message": "Bridge"
+  },
+  "bridgeDontSend": {
+    "message": "Bridge, don't send"
+  },
+  "browserNotSupported": {
+    "message": "Your browser is not supported..."
+  },
+  "buildContactList": {
+    "message": "Build your contact list"
+  },
+  "builtAroundTheWorld": {
+    "message": "MetaMask is designed and built around the world."
+  },
+  "busy": {
+    "message": "Busy"
+  },
+  "buyAndSell": {
+    "message": "Buy & Sell"
+  },
+  "buyAsset": {
+    "message": "Buy $1",
+    "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
+  },
+  "buyMoreAsset": {
+    "message": "Buy more $1",
+    "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
+  },
+  "buyNow": {
+    "message": "Buy Now"
+  },
+  "buyToken": {
+    "message": "Buy $1",
+    "description": "$1 is the token symbol"
+  },
+  "bytes": {
+    "message": "Bytes"
+  },
+  "canToggleInSettings": {
+    "message": "You can re-enable this notification in Settings > Alerts."
+  },
+  "cancel": {
+    "message": "Cancel"
+  },
+  "cancelPopoverTitle": {
+    "message": "Cancel transaction"
+  },
+  "cancelSpeedUp": {
+    "message": "cancel or speed up a transaction."
+  },
+  "cancelSpeedUpLabel": {
+    "message": "This gas fee will $1 the original.",
+    "description": "$1 is text 'replace' in bold"
+  },
+  "cancelSpeedUpTransactionTooltip": {
+    "message": "To $1 a transaction the gas fee must be increased by at least 10% for it to be recognized by the network.",
+    "description": "$1 is string 'cancel' or 'speed up'"
+  },
+  "cancelled": {
+    "message": "Cancelled"
+  },
+  "chainId": {
+    "message": "Chain ID"
+  },
+  "chainIdDefinition": {
+    "message": "The chain ID used to sign transactions for this network."
+  },
+  "chainIdExistsErrorMsg": {
+    "message": "This Chain ID is currently used by the $1 network."
+  },
+  "chainListReturnedDifferentTickerSymbol": {
+    "message": "This token symbol doesn't match the network name or chain ID entered. Many popular tokens use similar symbols, which scammers can use to trick you into sending them a more valuable token in return. Verify everything before you continue."
+  },
+  "chooseYourNetwork": {
+    "message": "Choose your network"
+  },
+  "chooseYourNetworkDescription": {
+    "message": "We use Infura as our remote procedure call (RPC) provider to offer the most reliable and private access to Ethereum data we can. You can choose your own RPC, but remember that any RPC will receive your IP address and Ethereum wallet to make transactions. Read our $1 to learn more about how Infura handles data.",
+    "description": "$1 is a link to the privacy policy"
+  },
+  "chromeRequiredForHardwareWallets": {
+    "message": "You need to use MetaMask on Google Chrome in order to connect to your Hardware Wallet."
+  },
+  "circulatingSupply": {
+    "message": "Circulating supply"
+  },
+  "clear": {
+    "message": "Clear"
+  },
+  "clearActivity": {
+    "message": "Clear activity and nonce data"
+  },
+  "clearActivityButton": {
+    "message": "Clear activity tab data"
+  },
+  "clearActivityDescription": {
+    "message": "This resets the account's nonce and erases data from the activity tab in your wallet. Only the current account and network will be affected. Your balances and incoming transactions won't change."
+  },
+  "click": {
+    "message": "Click"
+  },
+  "clickToConnectLedgerViaWebHID": {
+    "message": "Click here to connect your Ledger via WebHID",
+    "description": "Text that can be clicked to open a browser popup for connecting the ledger device via webhid"
+  },
+  "clickToManuallyAdd": {
+    "message": "You can always add tokens manually."
+  },
+  "close": {
+    "message": "Close"
+  },
+  "closeExtension": {
+    "message": "Close extension"
+  },
+  "closeWindowAnytime": {
+    "message": "You may close this window anytime."
+  },
+  "coingecko": {
+    "message": "CoinGecko"
+  },
+  "collectionName": {
+    "message": "Collection name"
+  },
+  "comboNoOptions": {
+    "message": "No options found",
+    "description": "Default text shown in the combo field dropdown if no options."
+  },
+  "configureSnapPopupDescription": {
+    "message": "You're now leaving MetaMask to configure this snap."
+  },
+  "configureSnapPopupInstallDescription": {
+    "message": "You're now leaving MetaMask to install this snap."
+  },
+  "configureSnapPopupInstallTitle": {
+    "message": "Install snap"
+  },
+  "configureSnapPopupLink": {
+    "message": "Click this link to continue:"
+  },
+  "configureSnapPopupTitle": {
+    "message": "Configure snap"
+  },
+  "confirm": {
+    "message": "Confirm"
+  },
+  "confirmAlertModalAcknowledgeMultiple": {
+    "message": "I have acknowledged the alerts and still want to proceed"
+  },
+  "confirmAlertModalAcknowledgeSingle": {
+    "message": "I have acknowledged the alert and still want to proceed"
+  },
+  "confirmAlertModalDetails": {
+    "message": "If you sign in, a third party known for scams might take all your assets. Please review the alerts before you proceed."
+  },
+  "confirmAlertModalTitle": {
+    "message": "Your assets may be at risk"
+  },
+  "confirmConnectCustodianRedirect": {
+    "message": "We will redirect you to $1 upon clicking continue."
+  },
+  "confirmConnectCustodianText": {
+    "message": "To connect your accounts log into your $1 account and click on the 'connect to MMI' button."
+  },
+  "confirmConnectionTitle": {
+    "message": "Confirm connection to $1"
+  },
+  "confirmDeletion": {
+    "message": "Confirm deletion"
+  },
+  "confirmFieldPaymaster": {
+    "message": "Fee paid by"
+  },
+  "confirmFieldTooltipPaymaster": {
+    "message": "The fee for this transaction will be paid by the paymaster smart contract."
+  },
+  "confirmPassword": {
+    "message": "Confirm password"
+  },
+  "confirmRecoveryPhrase": {
+    "message": "Confirm Secret Recovery Phrase"
+  },
+  "confirmRpcUrlDeletionMessage": {
+    "message": "Are you sure you want to delete the RPC URL? Your information will not be saved for this network."
+  },
+  "confirmTitleDescContractInteractionTransaction": {
+    "message": "Only confirm this transaction if you fully understand the content and trust the requesting site."
+  },
+  "confirmTitleDescPermitSignature": {
+    "message": "This site wants permission to spend your tokens."
+  },
+  "confirmTitleDescSIWESignature": {
+    "message": "A site wants you to sign in to prove you own this account."
+  },
+  "confirmTitleDescSignature": {
+    "message": "Only confirm this message if you approve the content and trust the requesting site."
+  },
+  "confirmTitlePermitSignature": {
+    "message": "Spending cap request"
+  },
+  "confirmTitleSIWESignature": {
+    "message": "Sign-in request"
+  },
+  "confirmTitleSignature": {
+    "message": "Signature request"
+  },
+  "confirmTitleTransaction": {
+    "message": "Transaction request"
+  },
+  "confirmed": {
+    "message": "Confirmed"
+  },
+  "confusableUnicode": {
+    "message": "'$1' is similar to '$2'."
+  },
+  "confusableZeroWidthUnicode": {
+    "message": "Zero-width character found."
+  },
+  "confusingEnsDomain": {
+    "message": "We have detected a confusable character in the ENS name. Check the ENS name to avoid a potential scam."
+  },
+  "connect": {
+    "message": "Connect"
+  },
+  "connectAccount": {
+    "message": "Connect account"
+  },
+  "connectAccountOrCreate": {
+    "message": "Connect account or create new"
+  },
+  "connectAccounts": {
+    "message": "Connect accounts"
+  },
+  "connectCustodialAccountMenu": {
+    "message": "Connect Custodial Account"
+  },
+  "connectCustodialAccountMsg": {
+    "message": "Please choose the custodian you want to connect in order to add or refresh a token."
+  },
+  "connectCustodialAccountTitle": {
+    "message": "Custodial Accounts"
+  },
+  "connectCustodianAccounts": {
+    "message": "Connect $1 accounts"
+  },
+  "connectManually": {
+    "message": "Manually connect to current site"
+  },
+  "connectMoreAccounts": {
+    "message": "Connect more accounts"
+  },
+  "connectSnap": {
+    "message": "Connect $1",
+    "description": "$1 is the snap for which a connection is being requested."
+  },
+  "connectWithMetaMask": {
+    "message": "Connect with MetaMask"
+  },
+  "connectedAccounts": {
+    "message": "Connected accounts"
+  },
+  "connectedAccountsDescriptionPlural": {
+    "message": "You have $1 accounts connected to this site.",
+    "description": "$1 is the number of accounts"
+  },
+  "connectedAccountsDescriptionSingular": {
+    "message": "You have 1 account connected to this site."
+  },
+  "connectedAccountsEmptyDescription": {
+    "message": "MetaMask is not connected to this site. To connect to a web3 site, find and click the connect button."
+  },
+  "connectedAccountsListTooltip": {
+    "message": "$1 can see the account balance, address, activity, and suggest transactions to approve for connected accounts.",
+    "description": "$1 is the origin name"
+  },
+  "connectedAccountsToast": {
+    "message": "Connected accounts updated"
+  },
+  "connectedSites": {
+    "message": "Connected sites"
+  },
+  "connectedSitesDescription": {
+    "message": "$1 is connected to these sites. They can view your account address.",
+    "description": "$1 is the account name"
+  },
+  "connectedSitesEmptyDescription": {
+    "message": "$1 is not connected to any sites.",
+    "description": "$1 is the account name"
+  },
+  "connectedSnapAndNoAccountDescription": {
+    "message": "MetaMask is connected to this site, but no accounts are connected yet"
+  },
+  "connectedWith": {
+    "message": "Connected with"
+  },
+  "connecting": {
+    "message": "Connecting"
+  },
+  "connectingTo": {
+    "message": "Connecting to $1"
+  },
+  "connectingToDeprecatedNetwork": {
+    "message": "'$1' is being phased out and may not work. Try another network."
+  },
+  "connectingToGoerli": {
+    "message": "Connecting to Goerli test network"
+  },
+  "connectingToLineaGoerli": {
+    "message": "Connecting to Linea Goerli test network"
+  },
+  "connectingToLineaMainnet": {
+    "message": "Connecting to Linea Mainnet"
+  },
+  "connectingToLineaSepolia": {
+    "message": "Connecting to Linea Sepolia test network"
+  },
+  "connectingToMainnet": {
+    "message": "Connecting to Ethereum Mainnet"
+  },
+  "connectingToSepolia": {
+    "message": "Connecting to Sepolia test network"
+  },
+  "connectionFailed": {
+    "message": "Connection failed"
+  },
+  "connectionFailedDescription": {
+    "message": "Fetching of $1 failed, check your network and try again.",
+    "description": "$1 is the name of the snap being fetched."
+  },
+  "connectionRequest": {
+    "message": "Connection request"
+  },
+  "contactUs": {
+    "message": "Contact us"
+  },
+  "contacts": {
+    "message": "Contacts"
+  },
+  "contentFromSnap": {
+    "message": "Content from $1",
+    "description": "$1 represents the name of the snap"
+  },
+  "continue": {
+    "message": "Continue"
+  },
+  "continueMmiOnboarding": {
+    "message": "Continue MetaMask Institutional onboarding"
+  },
+  "continueToWallet": {
+    "message": "Continue to wallet"
+  },
+  "contract": {
+    "message": "Contract"
+  },
+  "contractAddress": {
+    "message": "Contract address"
+  },
+  "contractAddressError": {
+    "message": "You are sending tokens to the token's contract address. This may result in the loss of these tokens."
+  },
+  "contractDeployment": {
+    "message": "Contract deployment"
+  },
+  "contractDescription": {
+    "message": "To protect yourself against scammers, take a moment to verify third-party details."
+  },
+  "contractInteraction": {
+    "message": "Contract interaction"
+  },
+  "contractNFT": {
+    "message": "NFT contract"
+  },
+  "contractRequestingAccess": {
+    "message": "Third party requesting access"
+  },
+  "contractRequestingSignature": {
+    "message": "Third party requesting signature"
+  },
+  "contractRequestingSpendingCap": {
+    "message": "Third party requesting spending cap"
+  },
+  "contractTitle": {
+    "message": "Third-party details"
+  },
+  "contractToken": {
+    "message": "Token contract"
+  },
+  "convertTokenToNFTDescription": {
+    "message": "We've detected that this asset is an NFT. MetaMask now has full native support for NFTs. Would you like to remove it from your token list and add it as an NFT?"
+  },
+  "convertTokenToNFTExistDescription": {
+    "message": "We’ve detected that this asset has been added as an NFT. Would you like to remove it from your token list?"
+  },
+  "coolWallet": {
+    "message": "CoolWallet"
+  },
+  "copiedExclamation": {
+    "message": "Copied."
+  },
+  "copyAddress": {
+    "message": "Copy address to clipboard"
+  },
+  "copyPrivateKey": {
+    "message": "Copy private key"
+  },
+  "copyRawTransactionData": {
+    "message": "Copy raw transaction data"
+  },
+  "copyToClipboard": {
+    "message": "Copy to clipboard"
+  },
+  "copyTransactionId": {
+    "message": "Copy transaction ID"
+  },
+  "create": {
+    "message": "Create"
+  },
+  "createNewWallet": {
+    "message": "Create a new wallet"
+  },
+  "createPassword": {
+    "message": "Create password"
+  },
+  "createSnapAccountDescription": {
+    "message": "$1 wants to add a new account to MetaMask."
+  },
+  "createSnapAccountTitle": {
+    "message": "Create account"
+  },
+  "creatorAddress": {
+    "message": "Creator address"
+  },
+  "crossChainSwapsLink": {
+    "message": "Swap across networks with MetaMask Portfolio"
+  },
+  "cryptoCompare": {
+    "message": "CryptoCompare"
+  },
+  "currencyConversion": {
+    "message": "Currency conversion"
+  },
+  "currencyRateCheckToggle": {
+    "message": "Show balance and token price checker"
+  },
+  "currencyRateCheckToggleDescription": {
+    "message": "We use $1 and $2 APIs to display your balance and token price. $3",
+    "description": "$1 represents Coingecko, $2 represents CryptoCompare and $3 represents Privacy Policy"
+  },
+  "currencySymbol": {
+    "message": "Currency symbol"
+  },
+  "currencySymbolDefinition": {
+    "message": "The ticker symbol displayed for this network’s currency."
+  },
+  "currentAccountNotConnected": {
+    "message": "Your current account is not connected"
+  },
+  "currentExtension": {
+    "message": "Current extension page"
+  },
+  "currentLanguage": {
+    "message": "Current language"
+  },
+  "currentRpcUrlDeprecated": {
+    "message": "The current rpc url for this network has been deprecated."
+  },
+  "currentTitle": {
+    "message": "Current:"
+  },
+  "currentlyUnavailable": {
+    "message": "Unavailable on this network"
+  },
+  "curveHighGasEstimate": {
+    "message": "Aggressive gas estimate graph"
+  },
+  "curveLowGasEstimate": {
+    "message": "Low gas estimate graph"
+  },
+  "curveMediumGasEstimate": {
+    "message": "Market gas estimate graph"
+  },
+  "custodian": {
+    "message": "Custodian"
+  },
+  "custodianAccountAddedDesc": {
+    "message": "You can now use your accounts in MetaMask Institutional."
+  },
+  "custodianAccountAddedTitle": {
+    "message": "Selected $1 accounts have been added."
+  },
+  "custodianQRCodeScan": {
+    "message": "Scan QR code with your $1 mobile app"
+  },
+  "custodianQRCodeScanDescription": {
+    "message": "Or log into your $1 account and click on the 'Connect to MMI' button"
+  },
+  "custodianReplaceRefreshTokenChangedFailed": {
+    "message": "Please go to $1 and click the 'Connect to MMI' button within their user interface to connect your accounts to MMI again."
+  },
+  "custodianReplaceRefreshTokenChangedSubtitle": {
+    "message": "You can now use your custodian accounts in MetaMask Institutional."
+  },
+  "custodianReplaceRefreshTokenChangedTitle": {
+    "message": "Your custodian token has been refreshed"
+  },
+  "custodianReplaceRefreshTokenSubtitle": {
+    "message": "This is will replace the custodian token for the following address:"
+  },
+  "custodianReplaceRefreshTokenTitle": {
+    "message": "Replace custodian token"
+  },
+  "custodyDeeplinkDescription": {
+    "message": "Approve the transaction in the $1 app. Once all required custody approvals have been performed the transaction will complete. Check your $1 app for status."
+  },
+  "custodyRefreshTokenModalDescription": {
+    "message": "Please go to $1 and click the 'Connect to MMI' button within their user interface to connect your accounts to MMI again."
+  },
+  "custodyRefreshTokenModalDescription1": {
+    "message": "Your custodian issues a token that authenticates the MetaMask Institutional extension, allowing you to connect your accounts."
+  },
+  "custodyRefreshTokenModalDescription2": {
+    "message": "This token expires after a certain period for security reasons. This requires you to reconnect to MMI."
+  },
+  "custodyRefreshTokenModalSubtitle": {
+    "message": "Why am I seeing this?"
+  },
+  "custodyRefreshTokenModalTitle": {
+    "message": "Your custodian session has expired"
+  },
+  "custodySessionExpired": {
+    "message": "Custodian session expired."
+  },
+  "custodyWrongChain": {
+    "message": "This account is not set up for use with $1"
+  },
+  "custom": {
+    "message": "Advanced"
+  },
+  "customContentSearch": {
+    "message": "Search for a previously added network"
+  },
+  "customGasSettingToolTipMessage": {
+    "message": "Use $1 to customize the gas price. This can be confusing if you aren’t familiar. Interact at your own risk.",
+    "description": "$1 is key 'advanced' (text: 'Advanced') separated here so that it can be passed in with bold font-weight"
+  },
+  "customSpendLimit": {
+    "message": "Custom spend limit"
+  },
+  "customSpendingCap": {
+    "message": "Custom spending cap"
+  },
+  "customToken": {
+    "message": "Custom token"
+  },
+  "customTokenWarningInNonTokenDetectionNetwork": {
+    "message": "Token detection is not available on this network yet. Please import token manually and make sure you trust it. Learn about $1"
+  },
+  "customTokenWarningInTokenDetectionNetwork": {
+    "message": "Anyone can create a token, including creating fake versions of existing tokens. Learn about $1"
+  },
+  "customTokenWarningInTokenDetectionNetworkWithTDOFF": {
+    "message": "Make sure you trust a token before you import it. Learn how to avoid $1. You can also enable token detection $2."
+  },
+  "customerSupport": {
+    "message": "customer support"
+  },
+  "customizeYourNotifications": {
+    "message": "Customize your notifications"
+  },
+  "customizeYourNotificationsText": {
+    "message": "Turn on the types of notifications you want to receive:"
+  },
+  "dappRequestedSpendingCap": {
+    "message": "Site requested spending cap"
+  },
+  "dappSuggested": {
+    "message": "Site suggested"
+  },
+  "dappSuggestedGasSettingToolTipMessage": {
+    "message": "$1 has suggested this price.",
+    "description": "$1 is url for the dapp that has suggested gas settings"
+  },
+  "dappSuggestedHigh": {
+    "message": "Site suggested"
+  },
+  "dappSuggestedHighShortLabel": {
+    "message": "Site (high)"
+  },
+  "dappSuggestedShortLabel": {
+    "message": "Site"
+  },
+  "dappSuggestedTooltip": {
+    "message": "$1 has recommended this price.",
+    "description": "$1 represents the Dapp's origin"
+  },
+  "darkTheme": {
+    "message": "Dark"
+  },
+  "data": {
+    "message": "Data"
+  },
+  "dataBackupSeemsCorrupt": {
+    "message": "Can not restore your data. The file appears to be corrupt."
+  },
+  "dataCollectionForMarketing": {
+    "message": "Data collection for marketing"
+  },
+  "dataCollectionForMarketingDescription": {
+    "message": "We'll use MetaMetrics to learn how you interact with our marketing communications. We may share relevant news (like product features and other materials)."
+  },
+  "dataCollectionWarningPopoverButton": {
+    "message": "Okay"
+  },
+  "dataCollectionWarningPopoverDescription": {
+    "message": "You turned off data collection for our marketing purposes. This only applies to this device. If you use MetaMask on other devices, make sure to opt out there as well."
+  },
+  "dataHex": {
+    "message": "Hex"
+  },
+  "dataUnavailable": {
+    "message": "data unavailable"
+  },
+  "dateCreated": {
+    "message": "Date created"
+  },
+  "dcent": {
+    "message": "D'Cent"
+  },
+  "decimal": {
+    "message": "Token decimal"
+  },
+  "decimalsMustZerotoTen": {
+    "message": "Decimals must be at least 0, and not over 36."
+  },
+  "decrypt": {
+    "message": "Decrypt"
+  },
+  "decryptCopy": {
+    "message": "Copy encrypted message"
+  },
+  "decryptInlineError": {
+    "message": "This message cannot be decrypted due to error: $1",
+    "description": "$1 is error message"
+  },
+  "decryptMessageNotice": {
+    "message": "$1 would like to read this message to complete your action",
+    "description": "$1 is the web3 site name"
+  },
+  "decryptMetamask": {
+    "message": "Decrypt message"
+  },
+  "decryptRequest": {
+    "message": "Decrypt request"
+  },
+  "defaultRpcUrl": {
+    "message": "Default RPC URL"
+  },
+  "delete": {
+    "message": "Delete"
+  },
+  "deleteContact": {
+    "message": "Delete contact"
+  },
+  "deleteNetwork": {
+    "message": "Delete network?"
+  },
+  "deleteNetworkIntro": {
+    "message": "If you delete this network, you will need to add it again to view your assets in this network"
+  },
+  "deleteNetworkTitle": {
+    "message": "Delete $1 network?",
+    "description": "$1 represents the name of the network"
+  },
+  "deleteRpcUrl": {
+    "message": "Delete RPC URL"
+  },
+  "deposit": {
+    "message": "Deposit"
+  },
+  "deprecatedGoerliNtwrkMsg": {
+    "message": "Because of updates to the Ethereum system, the Goerli test network will be phased out soon."
+  },
+  "deprecatedNetwork": {
+    "message": "This network is deprecated"
+  },
+  "deprecatedNetworkButtonMsg": {
+    "message": "Got it"
+  },
+  "deprecatedNetworkDescription": {
+    "message": "The network you're trying to connect to is no longer supported by Metamask. $1"
+  },
+  "description": {
+    "message": "Description"
+  },
+  "descriptionFromSnap": {
+    "message": "Description from $1",
+    "description": "$1 represents the name of the snap"
+  },
+  "details": {
+    "message": "Details"
+  },
+  "developerOptions": {
+    "message": "Developer Options"
+  },
+  "developerOptionsEnableConfirmationsRedesignDescription": {
+    "message": "Enables or disables the confirmations redesign feature currently in development"
+  },
+  "developerOptionsEnableConfirmationsRedesignTitle": {
+    "message": "Confirmations Redesign"
+  },
+  "developerOptionsNetworkMenuRedesignDescription": {
+    "message": "Toggles the new design of the Networks menu"
+  },
+  "developerOptionsNetworkMenuRedesignTitle": {
+    "message": "Network Menu Redesign"
+  },
+  "developerOptionsResetStatesAnnouncementsDescription": {
+    "message": "Resets isShown boolean to false for all announcements. Announcements are the notifications shown in the What's New popup modal."
+  },
+  "developerOptionsResetStatesOnboarding": {
+    "message": "Resets various states related to onboarding and redirects to the \"Secure Your Wallet\" onboarding page."
+  },
+  "developerOptionsServiceWorkerKeepAlive": {
+    "message": "Results in a timestamp being continuously saved to session.storage"
+  },
+  "disabledGasOptionToolTipMessage": {
+    "message": "“$1” is disabled because it does not meet the minimum of a 10% increase from the original gas fee.",
+    "description": "$1 is gas estimate type which can be market or aggressive"
+  },
+  "disconnect": {
+    "message": "Disconnect"
+  },
+  "disconnectAllAccounts": {
+    "message": "Disconnect all accounts"
+  },
+  "disconnectAllAccountsConfirmationDescription": {
+    "message": "Are you sure you want to disconnect? You may lose site functionality."
+  },
+  "disconnectAllAccountsText": {
+    "message": "accounts"
+  },
+  "disconnectAllSnapsText": {
+    "message": "Snaps"
+  },
+  "disconnectAllText": {
+    "message": "If you disconnect your $1 from $2, you'll need to reconnect to use them again.",
+    "description": "$1 will map to `disconnectAllAccountsText` or `disconnectAllSnapsText`, $2 represents the website hostname"
+  },
+  "disconnectAllTitle": {
+    "message": "Disconnect all $1",
+    "description": "$1 will map to `disconnectAllAccountsText` or `disconnectAllSnapsText`"
+  },
+  "disconnectPrompt": {
+    "message": "Disconnect $1"
+  },
+  "disconnectThisAccount": {
+    "message": "Disconnect this account"
+  },
+  "disconnectedAllAccountsToast": {
+    "message": "All accounts disconnected from $1",
+    "description": "$1 is name of the dapp`"
+  },
+  "disconnectedSingleAccountToast": {
+    "message": "$1 disconnected from $2",
+    "description": "$1 is name of the name and $2 represents the dapp name`"
+  },
+  "discoverSnaps": {
+    "message": "Discover Snaps",
+    "description": "Text that links to the Snaps website. Displayed in a banner on Snaps list page in settings."
+  },
+  "dismiss": {
+    "message": "Dismiss"
+  },
+  "dismissReminderDescriptionField": {
+    "message": "Turn this on to dismiss the Secret Recovery Phrase backup reminder message. We highly recommend that you back up your Secret Recovery Phrase to avoid loss of funds"
+  },
+  "dismissReminderField": {
+    "message": "Dismiss Secret Recovery Phrase backup reminder"
+  },
+  "displayNftMedia": {
+    "message": "Display NFT media"
+  },
+  "displayNftMediaDescription": {
+    "message": "Displaying NFT media and data exposes your IP address to OpenSea or other third parties. This can allow attackers to associate your IP address with your Ethereum address. NFT autodetection relies on this setting, and won't be available when this is turned off."
+  },
+  "diveStraightIntoUsingYourNFTs": {
+    "message": "Dive straight into using your NFTs"
+  },
+  "diveStraightIntoUsingYourTokens": {
+    "message": "Dive straight into using your tokens"
+  },
+  "doNotShare": {
+    "message": "Do not share this with anyone"
+  },
+  "domain": {
+    "message": "Domain"
+  },
+  "domainNotSupportedOnNetwork": {
+    "message": "Network does not support domain lookup"
+  },
+  "done": {
+    "message": "Done"
+  },
+  "dontShowThisAgain": {
+    "message": "Don't show this again"
+  },
+  "downArrow": {
+    "message": "down arrow"
+  },
+  "downloadGoogleChrome": {
+    "message": "Download Google Chrome"
+  },
+  "downloadNow": {
+    "message": "Download Now"
+  },
+  "downloadStateLogs": {
+    "message": "Download state logs"
+  },
+  "dragAndDropBanner": {
+    "message": "You can drag networks to reorder them. "
+  },
+  "dropped": {
+    "message": "Dropped"
+  },
+  "edit": {
+    "message": "Edit"
+  },
+  "editANickname": {
+    "message": "Edit nickname"
+  },
+  "editAddressNickname": {
+    "message": "Edit address nickname"
+  },
+  "editCancellationGasFeeModalTitle": {
+    "message": "Edit cancellation gas fee"
+  },
+  "editContact": {
+    "message": "Edit contact"
+  },
+  "editGasFeeModalTitle": {
+    "message": "Edit gas fee"
+  },
+  "editGasLimitOutOfBounds": {
+    "message": "Gas limit must be at least $1"
+  },
+  "editGasLimitOutOfBoundsV2": {
+    "message": "Gas limit must be greater than $1 and less than $2",
+    "description": "$1 is the minimum limit for gas and $2 is the maximum limit"
+  },
+  "editGasLimitTooltip": {
+    "message": "Gas limit is the maximum units of gas you are willing to use. Units of gas are a multiplier to “Max priority fee” and “Max fee”."
+  },
+  "editGasMaxBaseFeeGWEIImbalance": {
+    "message": "Max base fee cannot be lower than priority fee"
+  },
+  "editGasMaxBaseFeeHigh": {
+    "message": "Max base fee is higher than necessary"
+  },
+  "editGasMaxBaseFeeLow": {
+    "message": "Max base fee is low for current network conditions"
+  },
+  "editGasMaxFeeHigh": {
+    "message": "Max fee is higher than necessary"
+  },
+  "editGasMaxFeeLow": {
+    "message": "Max fee too low for network conditions"
+  },
+  "editGasMaxFeePriorityImbalance": {
+    "message": "Max fee cannot be lower than max priority fee"
+  },
+  "editGasMaxPriorityFeeBelowMinimum": {
+    "message": "Max priority fee must be greater than 0 GWEI"
+  },
+  "editGasMaxPriorityFeeBelowMinimumV2": {
+    "message": "Priority fee must be greater than 0."
+  },
+  "editGasMaxPriorityFeeHigh": {
+    "message": "Max priority fee is higher than necessary. You may pay more than needed."
+  },
+  "editGasMaxPriorityFeeHighV2": {
+    "message": "Priority fee is higher than necessary. You may pay more than needed"
+  },
+  "editGasMaxPriorityFeeLow": {
+    "message": "Max priority fee is low for current network conditions"
+  },
+  "editGasMaxPriorityFeeLowV2": {
+    "message": "Priority fee is low for current network conditions"
+  },
+  "editGasPriceTooLow": {
+    "message": "Gas price must be greater than 0"
+  },
+  "editGasPriceTooltip": {
+    "message": "This network requires a “Gas price” field when submitting a transaction. Gas price is the amount you will pay pay per unit of gas."
+  },
+  "editGasSubTextAmountLabel": {
+    "message": "Max amount:",
+    "description": "This is meant to be used as the $1 substitution editGasSubTextAmount"
+  },
+  "editGasSubTextFeeLabel": {
+    "message": "Max fee:"
+  },
+  "editGasTitle": {
+    "message": "Edit priority"
+  },
+  "editGasTooLow": {
+    "message": "Unknown processing time"
+  },
+  "editNetworkLink": {
+    "message": "edit the original network"
+  },
+  "editNonceField": {
+    "message": "Edit nonce"
+  },
+  "editNonceMessage": {
+    "message": "This is an advanced feature, use cautiously."
+  },
+  "editPermission": {
+    "message": "Edit permission"
+  },
+  "editSpeedUpEditGasFeeModalTitle": {
+    "message": "Edit speed up gas fee"
+  },
+  "effortlesslyNavigateYourDigitalAssets": {
+    "message": "Effortlessly navigate your digital assets"
+  },
+  "enable": {
+    "message": "Enable"
+  },
+  "enableAutoDetect": {
+    "message": " Enable autodetect"
+  },
+  "enableFromSettings": {
+    "message": " Enable it from Settings."
+  },
+  "enableNftAutoDetection": {
+    "message": "Enable NFT autodetection"
+  },
+  "enableSnap": {
+    "message": "Enable"
+  },
+  "enableToken": {
+    "message": "enable $1",
+    "description": "$1 is a token symbol, e.g. ETH"
+  },
+  "enableTokenAutoDetection": {
+    "message": "Enable token autodetection"
+  },
+  "enable_auto_detection_toggle_automatically": {
+    "message": "Users with the Basic Functionality toggle on will have this automatically turned on in the Metamask Extension v12.3.0"
+  },
+  "enabled": {
+    "message": "Enabled"
+  },
+  "enabledNetworks": {
+    "message": "Enabled networks"
+  },
+  "encryptionPublicKeyNotice": {
+    "message": "$1 would like your public encryption key. By consenting, this site will be able to compose encrypted messages to you.",
+    "description": "$1 is the web3 site name"
+  },
+  "encryptionPublicKeyRequest": {
+    "message": "Request encryption public key"
+  },
+  "endpointReturnedDifferentChainId": {
+    "message": "The RPC URL you have entered returned a different chain ID ($1). Please update the Chain ID to match the RPC URL of the network you are trying to add.",
+    "description": "$1 is the return value of eth_chainId from an RPC endpoint"
+  },
+  "enhancedTokenDetectionAlertMessage": {
+    "message": "Enhanced token detection is currently available on $1. $2"
+  },
+  "ensDomainsSettingDescriptionIntroduction": {
+    "message": "MetaMask lets you see ENS domains right in your browser's address bar. Here's how it works:"
+  },
+  "ensDomainsSettingDescriptionOutroduction": {
+    "message": "Keep in mind that using this feature exposes your IP address to IPFS third-party services."
+  },
+  "ensDomainsSettingDescriptionPart1": {
+    "message": "MetaMask checks with Ethereum's ENS contract to find the code connected to the ENS name."
+  },
+  "ensDomainsSettingDescriptionPart2": {
+    "message": "If the code links to IPFS, you can see the content associated with it (usually a website)."
+  },
+  "ensDomainsSettingTitle": {
+    "message": "Show ENS domains in address bar"
+  },
+  "ensIllegalCharacter": {
+    "message": "Illegal character for ENS."
+  },
+  "ensRegistrationError": {
+    "message": "Error in ENS name registration"
+  },
+  "ensUnknownError": {
+    "message": "ENS lookup failed."
+  },
+  "enterANumber": {
+    "message": "Enter a number"
+  },
+  "enterCustodianToken": {
+    "message": "Enter your $1 token or add a new token"
+  },
+  "enterMaxSpendLimit": {
+    "message": "Enter max spend limit"
+  },
+  "enterOptionalPassword": {
+    "message": "Enter optional password"
+  },
+  "enterPasswordContinue": {
+    "message": "Enter password to continue"
+  },
+  "enterTokenNameOrAddress": {
+    "message": "Enter token name or paste address"
+  },
+  "enterYourPassword": {
+    "message": "Enter your password"
+  },
+  "errorCode": {
+    "message": "Code: $1",
+    "description": "Displayed error code for debugging purposes. $1 is the error code"
+  },
+  "errorDetails": {
+    "message": "Error details",
+    "description": "Title for collapsible section that displays error details for debugging purposes"
+  },
+  "errorGettingSafeChainList": {
+    "message": "Error while getting safe chain list, please continue with caution."
+  },
+  "errorMessage": {
+    "message": "Message: $1",
+    "description": "Displayed error message for debugging purposes. $1 is the error message"
+  },
+  "errorName": {
+    "message": "Code: $1",
+    "description": "Displayed error name for debugging purposes. $1 is the error name"
+  },
+  "errorPageMessage": {
+    "message": "Try again by reloading the page, or contact support $1.",
+    "description": "Message displayed on generic error page in the fullscreen or notification UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
+  },
+  "errorPagePopupMessage": {
+    "message": "Try again by closing and reopening the popup, or contact support $1.",
+    "description": "Message displayed on generic error page in the popup UI, $1 is a clickable link with text defined by the 'here' key. The link will open to a form where users can file support tickets."
+  },
+  "errorPageTitle": {
+    "message": "MetaMask encountered an error",
+    "description": "Title of generic error page"
+  },
+  "errorStack": {
+    "message": "Stack:",
+    "description": "Title for error stack, which is displayed for debugging purposes"
+  },
+  "errorWhileConnectingToRPC": {
+    "message": "Error while connecting to the custom network."
+  },
+  "errorWithSnap": {
+    "message": "Error with $1",
+    "description": "$1 represents the name of the snap"
+  },
+  "estimatedFee": {
+    "message": "Estimated fee"
+  },
+  "estimatedFeeTooltip": {
+    "message": "Amount paid to process the transaction on network."
+  },
+  "ethGasPriceFetchWarning": {
+    "message": "Backup gas price is provided as the main gas estimation service is unavailable right now."
+  },
+  "ethereumProviderAccess": {
+    "message": "Grant Ethereum provider access to $1",
+    "description": "The parameter is the name of the requesting origin"
+  },
+  "ethereumPublicAddress": {
+    "message": "Ethereum public address"
+  },
+  "etherscan": {
+    "message": "Etherscan"
+  },
+  "etherscanView": {
+    "message": "View account on Etherscan"
+  },
+  "etherscanViewOn": {
+    "message": "View on Etherscan"
+  },
+  "existingChainId": {
+    "message": "The information you have entered is associated with an existing chain ID."
+  },
+  "existingRequestsBannerAlertDesc": {
+    "message": "To view and confirm your most recent request, you'll need to approve or reject existing requests first."
+  },
+  "existingRpcUrl": {
+    "message": "This URL is associated with another chain ID."
+  },
+  "expandView": {
+    "message": "Expand view"
+  },
+  "experimental": {
+    "message": "Experimental"
+  },
+  "extendWalletWithSnaps": {
+    "message": "Explore community-built Snaps to customize your web3 experience",
+    "description": "Banner description displayed on Snaps list page in Settings when less than 6 Snaps is installed."
+  },
+  "extensionInsallCompleteDescription": {
+    "message": "Return to the MetaMask Institutional product onboarding to connect your custodial or self-custodial accounts."
+  },
+  "extensionInsallCompleteTitle": {
+    "message": "Extension install complete"
+  },
+  "externalExtension": {
+    "message": "External extension"
+  },
+  "externalNameSourcesSetting": {
+    "message": "Proposed nicknames"
+  },
+  "externalNameSourcesSettingDescription": {
+    "message": "We’ll fetch proposed nicknames for addresses you interact with from third-party sources like Etherscan, Infura, and Lens Protocol. These sources will be able to see those addresses and your IP address. Your account address won’t be exposed to third parties."
+  },
+  "failed": {
+    "message": "Failed"
+  },
+  "failedToFetchChainId": {
+    "message": "Could not fetch chain ID. Is your RPC URL correct?"
+  },
+  "failedToFetchTickerSymbolData": {
+    "message": "Ticker symbol verification data is currently unavailable, make sure that the symbol you have entered is correct. It will impact the conversion rates that you see for this network"
+  },
+  "failureMessage": {
+    "message": "Something went wrong, and we were unable to complete the action"
+  },
+  "fast": {
+    "message": "Fast"
+  },
+  "feeAssociatedRequest": {
+    "message": "A fee is associated with this request."
+  },
+  "feeDetails": {
+    "message": "Fee details"
+  },
+  "fiat": {
+    "message": "Fiat",
+    "description": "Exchange type"
+  },
+  "fileImportFail": {
+    "message": "File import not working? Click here!",
+    "description": "Helps user import their account from a JSON file"
+  },
+  "findTheRightChainId": {
+    "message": "Find the right one on:"
+  },
+  "flaskWelcomeUninstall": {
+    "message": "you should uninstall this extension",
+    "description": "This request is shown on the Flask Welcome screen. It is intended for non-developers, and will be bolded."
+  },
+  "flaskWelcomeWarning1": {
+    "message": "Flask is for developers to experiment with new unstable APIs. Unless you are a developer or beta tester, $1.",
+    "description": "This is a warning shown on the Flask Welcome screen, intended to encourage non-developers not to proceed any further. $1 is the bolded message 'flaskWelcomeUninstall'"
+  },
+  "flaskWelcomeWarning2": {
+    "message": "We do not guarantee the safety or stability of this extension. The new APIs offered by Flask are not hardened against phishing attacks, meaning that any site or snap that requires Flask might be a malicious attempt to steal your assets.",
+    "description": "This explains the risks of using MetaMask Flask"
+  },
+  "flaskWelcomeWarning3": {
+    "message": "All Flask APIs are experimental. They may be changed or removed without notice, or they might stay on Flask indefinitely without ever being migrated to stable MetaMask. Use them at your own risk.",
+    "description": "This message warns developers about unstable Flask APIs"
+  },
+  "flaskWelcomeWarning4": {
+    "message": "Make sure to disable your regular MetaMask extension when using Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
+  "flaskWelcomeWarningAcceptButton": {
+    "message": "I accept the risks",
+    "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
+  },
+  "floatAmountToken": {
+    "message": "Token amount must be an integer"
+  },
+  "followUsOnTwitter": {
+    "message": "Follow us on Twitter"
+  },
+  "forbiddenIpfsGateway": {
+    "message": "Forbidden IPFS Gateway: Please specify a CID gateway"
+  },
+  "forgetDevice": {
+    "message": "Forget this device"
+  },
+  "forgotPassword": {
+    "message": "Forgot password?"
+  },
+  "form": {
+    "message": "form"
+  },
+  "from": {
+    "message": "From"
+  },
+  "fromAddress": {
+    "message": "From: $1",
+    "description": "$1 is the address to include in the From label. It is typically shortened first using shortenAddress"
+  },
+  "fromTokenLists": {
+    "message": "From token lists: $1"
+  },
+  "function": {
+    "message": "Function: $1"
+  },
+  "functionApprove": {
+    "message": "Function: Approve"
+  },
+  "functionSetApprovalForAll": {
+    "message": "Function: SetApprovalForAll"
+  },
+  "functionType": {
+    "message": "Function type"
+  },
+  "fundYourWallet": {
+    "message": "Fund your wallet"
+  },
+  "fundYourWalletDescription": {
+    "message": "Get started by adding some $1 to your wallet.",
+    "description": "$1 is the token symbol"
+  },
+  "gas": {
+    "message": "Gas"
+  },
+  "gasDisplayAcknowledgeDappButtonText": {
+    "message": "Edit suggested gas fee"
+  },
+  "gasDisplayDappWarning": {
+    "message": "This gas fee has been suggested by $1. Overriding this may cause a problem with your transaction. Please reach out to $1 if you have questions.",
+    "description": "$1 represents the Dapp's origin"
+  },
+  "gasIsETH": {
+    "message": "Gas is $1 "
+  },
+  "gasLimit": {
+    "message": "Gas limit"
+  },
+  "gasLimitInfoTooltipContent": {
+    "message": "Gas limit is the maximum amount of units of gas you are willing to spend."
+  },
+  "gasLimitRecommended": {
+    "message": "Recommended gas limit is $1. If the gas limit is less than that, it may fail."
+  },
+  "gasLimitTooLow": {
+    "message": "Gas limit must be at least 21000"
+  },
+  "gasLimitTooLowWithDynamicFee": {
+    "message": "Gas limit must be at least $1",
+    "description": "$1 is the custom gas limit, in decimal."
+  },
+  "gasLimitV2": {
+    "message": "Gas limit"
+  },
+  "gasOption": {
+    "message": "Gas option"
+  },
+  "gasPrice": {
+    "message": "Gas price (GWEI)"
+  },
+  "gasPriceExcessive": {
+    "message": "Your gas fee is set unnecessarily high. Consider lowering the amount."
+  },
+  "gasPriceExcessiveInput": {
+    "message": "Gas price is excessive"
+  },
+  "gasPriceExtremelyLow": {
+    "message": "Gas price extremely low"
+  },
+  "gasPriceFetchFailed": {
+    "message": "Gas price estimation failed due to network error."
+  },
+  "gasPriceInfoTooltipContent": {
+    "message": "Gas price specifies the amount of Ether you are willing to pay for each unit of gas."
+  },
+  "gasTimingHoursShort": {
+    "message": "$1 hrs",
+    "description": "$1 represents a number of hours"
+  },
+  "gasTimingLow": {
+    "message": "Slow"
+  },
+  "gasTimingMinutesShort": {
+    "message": "$1 min",
+    "description": "$1 represents a number of minutes"
+  },
+  "gasTimingSecondsShort": {
+    "message": "$1 sec",
+    "description": "$1 represents a number of seconds"
+  },
+  "gasUsed": {
+    "message": "Gas used"
+  },
+  "general": {
+    "message": "General"
+  },
+  "generalCameraError": {
+    "message": "We couldn't access your camera. Please give it another try."
+  },
+  "generalCameraErrorTitle": {
+    "message": "Something went wrong...."
+  },
+  "genericExplorerView": {
+    "message": "View account on $1"
+  },
+  "getStartedWithNFTs": {
+    "message": "Get $1 to buy NFTs",
+    "description": "$1 is the token symbol"
+  },
+  "getStartedWithNFTsDescription": {
+    "message": "Get started with NFTs by adding some $1 to your wallet.",
+    "description": "$1 is the token symbol"
+  },
+  "goBack": {
+    "message": "Go back"
+  },
+  "goToSite": {
+    "message": "Go to site"
+  },
+  "goerli": {
+    "message": "Goerli test network"
+  },
+  "gotIt": {
+    "message": "Got it"
+  },
+  "grantedToWithColon": {
+    "message": "Granted to:"
+  },
+  "gwei": {
+    "message": "GWEI"
+  },
+  "hardware": {
+    "message": "Hardware"
+  },
+  "hardwareWalletConnected": {
+    "message": "Hardware wallet connected"
+  },
+  "hardwareWalletLegacyDescription": {
+    "message": "(legacy)",
+    "description": "Text representing the MEW path"
+  },
+  "hardwareWalletSupportLinkConversion": {
+    "message": "click here"
+  },
+  "hardwareWallets": {
+    "message": "Connect a hardware wallet"
+  },
+  "hardwareWalletsInfo": {
+    "message": "Hardware wallet integrations use API calls to external servers, which can see your IP address and the smart contract addresses you interact with."
+  },
+  "hardwareWalletsMsg": {
+    "message": "Select a hardware wallet you would like to use with MetaMask."
+  },
+  "here": {
+    "message": "here",
+    "description": "as in -click here- for more information (goes with troubleTokenBalances)"
+  },
+  "hexData": {
+    "message": "Hex data"
+  },
+  "hiddenAccounts": {
+    "message": "Hidden accounts"
+  },
+  "hide": {
+    "message": "Hide"
+  },
+  "hideAccount": {
+    "message": "Hide account"
+  },
+  "hideFullTransactionDetails": {
+    "message": "Hide full transaction details"
+  },
+  "hideSeedPhrase": {
+    "message": "Hide seed phrase"
+  },
+  "hideSentitiveInfo": {
+    "message": "Hide sensitive information"
+  },
+  "hideToken": {
+    "message": "Hide token"
+  },
+  "hideTokenPrompt": {
+    "message": "Hide token?"
+  },
+  "hideTokenSymbol": {
+    "message": "Hide $1",
+    "description": "$1 is the symbol for a token (e.g. 'DAI')"
+  },
+  "hideZeroBalanceTokens": {
+    "message": "Hide tokens without balance"
+  },
+  "high": {
+    "message": "Aggressive"
+  },
+  "highGasSettingToolTipMessage": {
+    "message": "High probability, even in volatile markets. Use $1 to cover surges in network traffic due to things like popular NFT drops.",
+    "description": "$1 is key 'high' (text: 'Aggressive') separated here so that it can be passed in with bold font-weight"
+  },
+  "highLowercase": {
+    "message": "high"
+  },
+  "highestCurrentBid": {
+    "message": "Highest current bid"
+  },
+  "highestFloorPrice": {
+    "message": "Highest floor price"
+  },
+  "history": {
+    "message": "History"
+  },
+  "holdToRevealContent1": {
+    "message": "Your Secret Recovery Phrase provides $1",
+    "description": "$1 is a bolded text with the message from 'holdToRevealContent2'"
+  },
+  "holdToRevealContent2": {
+    "message": "full access to your wallet and funds.",
+    "description": "Is the bolded text in 'holdToRevealContent1'"
+  },
+  "holdToRevealContent3": {
+    "message": "Do not share this with anyone. $1 $2",
+    "description": "$1 is a message from 'holdToRevealContent4' and $2 is a text link with the message from 'holdToRevealContent5'"
+  },
+  "holdToRevealContent4": {
+    "message": "MetaMask Support will not request this,",
+    "description": "Part of 'holdToRevealContent3'"
+  },
+  "holdToRevealContent5": {
+    "message": "but phishers might.",
+    "description": "The text link in 'holdToRevealContent3'"
+  },
+  "holdToRevealContentPrivateKey1": {
+    "message": "Your Private Key provides $1",
+    "description": "$1 is a bolded text with the message from 'holdToRevealContentPrivateKey2'"
+  },
+  "holdToRevealContentPrivateKey2": {
+    "message": "full access to your wallet and funds.",
+    "description": "Is the bolded text in 'holdToRevealContentPrivateKey2'"
+  },
+  "holdToRevealLockedLabel": {
+    "message": "hold to reveal circle locked"
+  },
+  "holdToRevealPrivateKey": {
+    "message": "Hold to reveal Private Key"
+  },
+  "holdToRevealPrivateKeyTitle": {
+    "message": "Keep your private key safe"
+  },
+  "holdToRevealSRP": {
+    "message": "Hold to reveal SRP"
+  },
+  "holdToRevealSRPTitle": {
+    "message": "Keep your SRP safe"
+  },
+  "holdToRevealUnlockedLabel": {
+    "message": "hold to reveal circle unlocked"
+  },
+  "id": {
+    "message": "ID"
+  },
+  "ignoreAll": {
+    "message": "Ignore all"
+  },
+  "ignoreTokenWarning": {
+    "message": "If you hide tokens, they will not be shown in your wallet. However, you can still add them by searching for them."
+  },
+  "imToken": {
+    "message": "imToken"
+  },
+  "immediateAccessToYourNFTs": {
+    "message": "Immediately access your NFTs"
+  },
+  "immediateAccessToYourTokens": {
+    "message": "Immediate access to your tokens"
+  },
+  "import": {
+    "message": "Import",
+    "description": "Button to import an account from a selected file"
+  },
+  "importAccount": {
+    "message": "Import account"
+  },
+  "importAccountError": {
+    "message": "Error importing account."
+  },
+  "importAccountErrorIsSRP": {
+    "message": "You have entered a Secret Recovery Phrase (or mnemonic). To import an account here, you have to enter a private key, which is a hexadecimal string of length 64."
+  },
+  "importAccountErrorNotAValidPrivateKey": {
+    "message": "This is not a valid private key. You have entered a hexadecimal string, but it must be 64 characters long."
+  },
+  "importAccountErrorNotHexadecimal": {
+    "message": "This is not a valid private key. You must enter a hexadecimal string of length 64."
+  },
+  "importAccountJsonLoading1": {
+    "message": "Expect this JSON import to take a few minutes and freeze MetaMask."
+  },
+  "importAccountJsonLoading2": {
+    "message": "We apologize, and we will make it faster in the future."
+  },
+  "importAccountMsg": {
+    "message": "Imported accounts won’t be associated with your MetaMask Secret Recovery Phrase. Learn more about imported accounts"
+  },
+  "importMyWallet": {
+    "message": "Import my wallet"
+  },
+  "importNFT": {
+    "message": "Import NFT"
+  },
+  "importNFTAddressToolTip": {
+    "message": "On OpenSea, for example, on the NFT's page under Details, there is a blue hyperlinked value labeled 'Contract Address'. If you click on this, it will take you to the contract's address on Etherscan; at the top-left of that page, there should be an icon labeled 'Contract', and to the right, a long string of letters and numbers. This is the address of the contract that created your NFT. Click on the 'copy' icon to the right of the address, and you'll have it on your clipboard."
+  },
+  "importNFTPage": {
+    "message": "Import NFT page"
+  },
+  "importNFTTokenIdToolTip": {
+    "message": "An NFT's ID is a unique identifier since no two NFTs are alike. Again, on OpenSea this number is under 'Details'. Make a note of it, or copy it onto your clipboard."
+  },
+  "importSelectedTokens": {
+    "message": "Import selected tokens?"
+  },
+  "importSelectedTokensDescription": {
+    "message": "Only the tokens you've selected will appear in your wallet. You can always import hidden tokens later by searching for them."
+  },
+  "importTokenQuestion": {
+    "message": "Import token?"
+  },
+  "importTokenWarning": {
+    "message": "Anyone can create a token with any name, including fake versions of existing tokens. Add and trade at your own risk!"
+  },
+  "importTokensCamelCase": {
+    "message": "Import tokens"
+  },
+  "importTokensError": {
+    "message": "We could not import the tokens. Please try again later."
+  },
+  "importWithCount": {
+    "message": "Import $1",
+    "description": "$1 will the number of detected tokens that are selected for importing, if all of them are selected then $1 will be all"
+  },
+  "imported": {
+    "message": "Imported",
+    "description": "status showing that an account has been fully loaded into the keyring"
+  },
+  "inYourSettings": {
+    "message": "in your Settings"
+  },
+  "infuraBlockedNotification": {
+    "message": "MetaMask is unable to connect to the blockchain host. Review possible reasons $1.",
+    "description": "$1 is a clickable link with with text defined by the 'here' key"
+  },
+  "initialTransactionConfirmed": {
+    "message": "Your initial transaction was confirmed by the network. Click OK to go back."
+  },
+  "inputLogicEmptyState": {
+    "message": "Only enter a number that you're comfortable with the third party spending now or in the future. You can always increase the spending cap later."
+  },
+  "inputLogicEqualOrSmallerNumber": {
+    "message": "This allows the third party to spend $1 from your current balance.",
+    "description": "$1 is the current token balance in the account and the name of the current token"
+  },
+  "inputLogicHigherNumber": {
+    "message": "This allows the third party to spend all your token balance until it reaches the cap or you revoke the spending cap. If this is not intended, consider setting a lower spending cap."
+  },
+  "insightWarning": {
+    "message": "warning"
+  },
+  "insightWarningCheckboxMessage": {
+    "message": "$1 the request by $2",
+    "description": "$1 is the action i.e. sign, confirm. $2 is the origin making the request."
+  },
+  "insightWarningContentPlural": {
+    "message": "Review $1 before $2. Once made, the $3 is irreversible.",
+    "description": "$1 the 'insightWarnings' message (2 warnings) representing warnings, $2 is the action (i.e. signing) and $3 is the result (i.e. signature, transaction)"
+  },
+  "insightWarningContentSingular": {
+    "message": "Review $1 before $2. Once made, the $3 is irreversible.",
+    "description": "$1 is the 'insightWarning' message (1 warning), $2 is the action (i.e. signing) and $3 is the result (i.e. signature, transaction)"
+  },
+  "insightWarningHeader": {
+    "message": "This request may be risky"
+  },
+  "insightWarnings": {
+    "message": "warnings"
+  },
+  "insightsFromSnap": {
+    "message": "Insights from $1",
+    "description": "$1 represents the name of the snap"
+  },
+  "install": {
+    "message": "Install"
+  },
+  "installExtension": {
+    "message": "Install extension"
+  },
+  "installExtensionDescription": {
+    "message": "The institution-compliant version of the world's leading web3 wallet, MetaMask."
+  },
+  "installOrigin": {
+    "message": "Install origin"
+  },
+  "installRequest": {
+    "message": "Add to MetaMask"
+  },
+  "installedOn": {
+    "message": "Installed on $1",
+    "description": "$1 is the date when the snap has been installed"
+  },
+  "insufficientBalance": {
+    "message": "Insufficient balance."
+  },
+  "insufficientCurrencyBuyOrDeposit": {
+    "message": "You do not have enough $1 in your account to pay for transaction fees on $2 network. $3 or deposit from another account.",
+    "description": "$1 is the native currency of the network, $2 is the name of the current network, $3 is the key 'buy' + the ticker symbol of the native currency of the chain wrapped in a button"
+  },
+  "insufficientCurrencyBuyOrReceive": {
+    "message": "You do not have enough $1 in your account to pay for transaction fees on $2 network. $3 or $4 from another account.",
+    "description": "$1 is the native currency of the network, $2 is the name of the current network, $3 is the key 'buy' + the ticker symbol of the native currency of the chain wrapped in a button, $4 is the key 'deposit' button"
+  },
+  "insufficientCurrencyDeposit": {
+    "message": "You do not have enough $1 in your account to pay for transaction fees on $2 network. Deposit $1 from another account.",
+    "description": "$1 is the native currency of the network, $2 is the name of the current network"
+  },
+  "insufficientFunds": {
+    "message": "Insufficient funds."
+  },
+  "insufficientFundsForGas": {
+    "message": "Insufficient funds for gas"
+  },
+  "insufficientTokens": {
+    "message": "Insufficient tokens."
+  },
+  "interactingWith": {
+    "message": "Interacting with"
+  },
+  "interactingWithTransactionDescription": {
+    "message": "This is the contract you're interacting with. Protect yourself from scammers by verifying the details."
+  },
+  "invalidAddress": {
+    "message": "Invalid address"
+  },
+  "invalidAddressRecipient": {
+    "message": "Recipient address is invalid"
+  },
+  "invalidAddressRecipientNotEthNetwork": {
+    "message": "Not ETH network, set to lowercase"
+  },
+  "invalidAssetType": {
+    "message": "This asset is an NFT and needs to be re-added on the Import NFTs page found under the NFTs tab"
+  },
+  "invalidBlockExplorerURL": {
+    "message": "Invalid block explorer URL"
+  },
+  "invalidChainIdTooBig": {
+    "message": "Invalid chain ID. The chain ID is too big."
+  },
+  "invalidCustomNetworkAlertContent1": {
+    "message": "The chain ID for custom network '$1' has to be re-entered.",
+    "description": "$1 is the name/identifier of the network."
+  },
+  "invalidCustomNetworkAlertContent2": {
+    "message": "To protect you from malicious or faulty network providers, chain IDs are now required for all custom networks."
+  },
+  "invalidCustomNetworkAlertContent3": {
+    "message": "Go to Settings > Network and enter the chain ID. You can find the chain IDs of most popular networks on $1.",
+    "description": "$1 is a link to https://chainid.network"
+  },
+  "invalidCustomNetworkAlertTitle": {
+    "message": "Invalid custom network"
+  },
+  "invalidHexNumber": {
+    "message": "Invalid hexadecimal number."
+  },
+  "invalidHexNumberLeadingZeros": {
+    "message": "Invalid hexadecimal number. Remove any leading zeros."
+  },
+  "invalidIpfsGateway": {
+    "message": "Invalid IPFS Gateway: The value must be a valid URL"
+  },
+  "invalidNumber": {
+    "message": "Invalid number. Enter a decimal or '0x'-prefixed hexadecimal number."
+  },
+  "invalidNumberLeadingZeros": {
+    "message": "Invalid number. Remove any leading zeros."
+  },
+  "invalidRPC": {
+    "message": "Invalid RPC URL"
+  },
+  "invalidSeedPhrase": {
+    "message": "Invalid Secret Recovery Phrase"
+  },
+  "invalidSeedPhraseCaseSensitive": {
+    "message": "Invalid input! Secret Recovery Phrase is case sensitive."
+  },
+  "ipfsGateway": {
+    "message": "IPFS gateway"
+  },
+  "ipfsGatewayDescription": {
+    "message": "MetaMask uses third-party services to show images of your NFTs stored on IPFS, display information related to ENS addresses entered in your browser's address bar, and fetch icons for different tokens. Your IP address may be exposed to these services when you’re using them."
+  },
+  "ipfsToggleModalDescriptionOne": {
+    "message": "We use third-party services to show images of your NFTs stored on IPFS, display information related to ENS addresses entered in your browser's address bar, and fetch icons for different tokens. Your IP address may be exposed to these services when you’re using them."
+  },
+  "ipfsToggleModalDescriptionTwo": {
+    "message": "Selecting Confirm turns on IPFS resolution. You can turn it off in $1 at any time.",
+    "description": "$1 is the method to turn off ipfs"
+  },
+  "ipfsToggleModalSettings": {
+    "message": "Settings > Security and privacy"
+  },
+  "isSigningOrSubmitting": {
+    "message": "A previous transaction is still being signed or submitted"
+  },
+  "jazzAndBlockies": {
+    "message": "Jazzicons and Blockies are two different styles of unique icons that help you identify an account at a glance."
+  },
+  "jazzicons": {
+    "message": "Jazzicons"
+  },
+  "jsDeliver": {
+    "message": "jsDeliver"
+  },
+  "jsonFile": {
+    "message": "JSON File",
+    "description": "format for importing an account"
+  },
+  "keyringAccountName": {
+    "message": "Account name"
+  },
+  "keyringAccountPublicAddress": {
+    "message": "Public Address"
+  },
+  "keyringSnapRemovalResult1": {
+    "message": "$1 $2removed",
+    "description": "Displays the result after removal of a keyring snap. $1 is the snap name, $2 is whether it is successful or not"
+  },
+  "keyringSnapRemovalResultNotSuccessful": {
+    "message": "not ",
+    "description": "Displays the `not` word in $2."
+  },
+  "keyringSnapRemoveConfirmation": {
+    "message": "Type $1 to confirm you want to remove this snap:",
+    "description": "Asks user to input the name nap prior to deleting the snap. $1 is the snap name"
+  },
+  "keystone": {
+    "message": "Keystone"
+  },
+  "knownAddressRecipient": {
+    "message": "Known contract address."
+  },
+  "knownTokenWarning": {
+    "message": "This action will edit tokens that are already listed in your wallet, which can be used to phish you. Only approve if you are certain that you mean to change what these tokens represent. Learn more about $1"
+  },
+  "l1Fee": {
+    "message": "L1 fee"
+  },
+  "l1FeeTooltip": {
+    "message": "L1 gas fee"
+  },
+  "l2Fee": {
+    "message": "L2 fee"
+  },
+  "l2FeeTooltip": {
+    "message": "L2 gas fee"
+  },
+  "lastConnected": {
+    "message": "Last connected"
+  },
+  "lastSold": {
+    "message": "Last sold"
+  },
+  "lavaDomeCopyWarning": {
+    "message": "For your safety, selecting this text is not available right now."
+  },
+  "layer1Fees": {
+    "message": "Layer 1 fees"
+  },
+  "layer2Fees": {
+    "message": "Layer 2 fees"
+  },
+  "learnCancelSpeeedup": {
+    "message": "Learn how to $1",
+    "description": "$1 is link to cancel or speed up transactions"
+  },
+  "learnMore": {
+    "message": "learn more"
+  },
+  "learnMoreAboutGas": {
+    "message": "Want to $1 about gas?",
+    "description": "$1 will be replaced by the learnMore translation key"
+  },
+  "learnMoreKeystone": {
+    "message": "Learn More"
+  },
+  "learnMoreUpperCase": {
+    "message": "Learn more"
+  },
+  "learnMoreUpperCaseWithDot": {
+    "message": "Learn more."
+  },
+  "learnScamRisk": {
+    "message": "scams and security risks."
+  },
+  "learnToBridge": {
+    "message": "Learn to bridge"
+  },
+  "leaveMetaMask": {
+    "message": "Leave MetaMask?"
+  },
+  "leaveMetaMaskDesc": {
+    "message": "You're about to visit a site outside of MetaMask. Double-check the URL before continuing."
+  },
+  "ledgerAccountRestriction": {
+    "message": "You need to make use your last account before you can add a new one."
+  },
+  "ledgerConnectionInstructionCloseOtherApps": {
+    "message": "Close any other software connected to your device and then click here to refresh."
+  },
+  "ledgerConnectionInstructionHeader": {
+    "message": "Prior to clicking confirm:"
+  },
+  "ledgerConnectionInstructionStepFour": {
+    "message": "Enable \"smart contract data\" or \"blind signing\" on your Ledger device."
+  },
+  "ledgerConnectionInstructionStepThree": {
+    "message": "Be sure your Ledger is plugged in and to select the Ethereum app."
+  },
+  "ledgerDeviceOpenFailureMessage": {
+    "message": "The Ledger device failed to open. Your Ledger might be connected to other software. Please close Ledger Live or other applications connected to your Ledger device, and try to connect again."
+  },
+  "ledgerErrorConnectionIssue": {
+    "message": "Reconnect your ledger, open the ETH app and try again."
+  },
+  "ledgerErrorDevicedLocked": {
+    "message": "Your Ledger is locked. Unlock it then try again."
+  },
+  "ledgerErrorEthAppNotOpen": {
+    "message": "To solve the issue, open the ETH application on your device and retry."
+  },
+  "ledgerErrorTransactionDataNotPadded": {
+    "message": "Ethereum transaction's input data isn't sufficiently padded."
+  },
+  "ledgerLiveApp": {
+    "message": "Ledger Live App"
+  },
+  "ledgerLocked": {
+    "message": "Cannot connect to Ledger device. Please make sure your device is unlocked and Ethereum app is opened."
+  },
+  "ledgerTimeout": {
+    "message": "Ledger Live is taking too long to respond or connection timeout. Make sure Ledger Live app is opened and your device is unlocked."
+  },
+  "ledgerWebHIDNotConnectedErrorMessage": {
+    "message": "The ledger device was not connected. If you wish to connect your Ledger, please click 'Continue' again and approve HID connection",
+    "description": "An error message shown to the user during the hardware connect flow."
+  },
+  "levelArrow": {
+    "message": "level arrow"
+  },
+  "lightTheme": {
+    "message": "Light"
+  },
+  "likeToImportToken": {
+    "message": "Would you like to import this token?"
+  },
+  "likeToImportTokens": {
+    "message": "Would you like to import these tokens?"
+  },
+  "lineaGoerli": {
+    "message": "Linea Goerli test network"
+  },
+  "lineaMainnet": {
+    "message": "Linea Mainnet"
+  },
+  "lineaSepolia": {
+    "message": "Linea Sepolia test network"
+  },
+  "link": {
+    "message": "Link"
+  },
+  "links": {
+    "message": "Links"
+  },
+  "loadMore": {
+    "message": "Load more"
+  },
+  "loading": {
+    "message": "Loading..."
+  },
+  "loadingScreenHardwareWalletMessage": {
+    "message": "Please complete the transaction on the hardware wallet."
+  },
+  "loadingScreenSnapMessage": {
+    "message": "Please complete the transaction on the Snap."
+  },
+  "loadingTokens": {
+    "message": "Loading tokens..."
+  },
+  "localhost": {
+    "message": "Localhost 8545"
+  },
+  "lock": {
+    "message": "Lock"
+  },
+  "lockMetaMask": {
+    "message": "Lock MetaMask"
+  },
+  "lockTimeInvalid": {
+    "message": "Lock time must be a number between 0 and 10080"
+  },
+  "logo": {
+    "message": "$1 logo",
+    "description": "$1 is the name of the ticker"
+  },
+  "low": {
+    "message": "Low"
+  },
+  "lowGasSettingToolTipMessage": {
+    "message": "Use $1 to wait for a cheaper price. Time estimates are much less accurate as prices are somewhat unpredictable.",
+    "description": "$1 is key 'low' separated here so that it can be passed in with bold font-weight"
+  },
+  "lowLowercase": {
+    "message": "low"
+  },
+  "lowPriorityMessage": {
+    "message": "Future transactions will queue after this one."
+  },
+  "mainnet": {
+    "message": "Ethereum Mainnet"
+  },
+  "mainnetToken": {
+    "message": "This address matches a known Ethereum Mainnet token address. Recheck the contract address and network for the token you are trying to add."
+  },
+  "makeAnotherSwap": {
+    "message": "Create a new swap"
+  },
+  "makeSureNoOneWatching": {
+    "message": "Make sure nobody is looking",
+    "description": "Warning to users to be care while creating and saving their new Secret Recovery Phrase"
+  },
+  "marketCap": {
+    "message": "Market cap"
+  },
+  "marketDetails": {
+    "message": "Market details"
+  },
+  "max": {
+    "message": "Max"
+  },
+  "maxBaseFee": {
+    "message": "Max base fee"
+  },
+  "maxFee": {
+    "message": "Max fee"
+  },
+  "maxFeeTooltip": {
+    "message": "A maximum fee provided to pay for the transaction."
+  },
+  "maxPriorityFee": {
+    "message": "Max priority fee"
+  },
+  "medium": {
+    "message": "Market"
+  },
+  "mediumGasSettingToolTipMessage": {
+    "message": "Use $1 for fast processing at current market price.",
+    "description": "$1 is key 'medium' (text: 'Market') separated here so that it can be passed in with bold font-weight"
+  },
+  "memo": {
+    "message": "memo"
+  },
+  "message": {
+    "message": "Message"
+  },
+  "metaMaskConnectStatusParagraphOne": {
+    "message": "You now have more control over your account connections in MetaMask."
+  },
+  "metaMaskConnectStatusParagraphThree": {
+    "message": "Click it to manage your connected accounts."
+  },
+  "metaMaskConnectStatusParagraphTwo": {
+    "message": "The connection status button shows if the website you’re visiting is connected to your currently selected account."
+  },
+  "metadataModalSourceTooltip": {
+    "message": "$1 is hosted on npm and $2 is this Snap’s unique identifier.",
+    "description": "$1 is the snap name and $2 is the snap NPM id."
+  },
+  "metamaskInstitutionalVersion": {
+    "message": "MetaMask Institutional Version"
+  },
+  "metamaskNotificationsAreOff": {
+    "message": "Wallet notifications are currently not active."
+  },
+  "metamaskPortfolio": {
+    "message": "MetaMask Portfolio."
+  },
+  "metamaskSwapsOfflineDescription": {
+    "message": "MetaMask Swaps is undergoing maintenance. Please check back later."
+  },
+  "metamaskVersion": {
+    "message": "MetaMask Version"
+  },
+  "methodData": {
+    "message": "Method"
+  },
+  "methodDataTransactionDesc": {
+    "message": "Function executed based on decoded input data."
+  },
+  "methodNotSupported": {
+    "message": "Not supported with this account."
+  },
+  "metrics": {
+    "message": "Metrics"
+  },
+  "millionAbbreviation": {
+    "message": "M",
+    "description": "Shortened form of 'million'"
+  },
+  "mismatchAccount": {
+    "message": "Your selected account ($1) is different than the account trying to sign ($2)"
+  },
+  "mismatchedChainLinkText": {
+    "message": "verify the network details",
+    "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
+  },
+  "mismatchedChainRecommendation": {
+    "message": "We recommend that you $1 before proceeding.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key. The link will open to instructions for users to validate custom network details."
+  },
+  "mismatchedNetworkName": {
+    "message": "According to our record the network name may not correctly match this chain ID."
+  },
+  "mismatchedNetworkSymbol": {
+    "message": "The submitted currency symbol does not match what we expect for this chain ID."
+  },
+  "mismatchedRpcChainId": {
+    "message": "Chain ID returned by the custom network does not match the submitted chain ID."
+  },
+  "mismatchedRpcUrl": {
+    "message": "According to our records the submitted RPC URL value does not match a known provider for this chain ID."
+  },
+  "missingSetting": {
+    "message": "Can't find a setting?"
+  },
+  "missingSettingRequest": {
+    "message": "Request here"
+  },
+  "mmiBuiltAroundTheWorld": {
+    "message": "MetaMask Institutional is designed and built around the world."
+  },
+  "mmiNewNFTDetectedInNFTsTabMessage": {
+    "message": "Let MetaMask Institutional automatically detect and display NFTs in your wallet."
+  },
+  "mmiPasswordSetupDetails": {
+    "message": "This password will unlock your MetaMask Institutional extension only."
+  },
+  "more": {
+    "message": "more"
+  },
+  "multipleSnapConnectionWarning": {
+    "message": "$1 wants to use $2 Snaps",
+    "description": "$1 is the dapp and $2 is the number of snaps it wants to connect to."
+  },
+  "mustSelectOne": {
+    "message": "Must select at least 1 token."
+  },
+  "name": {
+    "message": "Name"
+  },
+  "nameAddressLabel": {
+    "message": "Address",
+    "description": "Label above address field in name component modal."
+  },
+  "nameInstructionsNew": {
+    "message": "If you know this address, give it a nickname to recognize it in the future.",
+    "description": "Instruction text in name component modal when value is not recognised."
+  },
+  "nameInstructionsRecognized": {
+    "message": "This address has a default nickname, but you can edit it or explore other suggestions.",
+    "description": "Instruction text in name component modal when value is recognized but not saved."
+  },
+  "nameInstructionsSaved": {
+    "message": "You've added a nickname for this address before. You can edit or view other suggested nicknames.",
+    "description": "Instruction text in name component modal when value is saved."
+  },
+  "nameLabel": {
+    "message": "Nickname",
+    "description": "Label above name input field in name component modal."
+  },
+  "nameModalMaybeProposedName": {
+    "message": "Maybe: $1",
+    "description": "$1 is the proposed name"
+  },
+  "nameModalTitleNew": {
+    "message": "Unknown address",
+    "description": "Title of the modal created by the name component when value is not recognised."
+  },
+  "nameModalTitleRecognized": {
+    "message": "Recognized address",
+    "description": "Title of the modal created by the name component when value is recognized but not saved."
+  },
+  "nameModalTitleSaved": {
+    "message": "Saved address",
+    "description": "Title of the modal created by the name component when value is saved."
+  },
+  "nameProviderProposedBy": {
+    "message": "Proposed by $1",
+    "description": "$1 is the name of the provider"
+  },
+  "nameProvider_ens": {
+    "message": "Ethereum Name Service (ENS)"
+  },
+  "nameProvider_etherscan": {
+    "message": "Etherscan"
+  },
+  "nameProvider_lens": {
+    "message": "Lens Protocol"
+  },
+  "nameProvider_token": {
+    "message": "MetaMask"
+  },
+  "nameSetPlaceholder": {
+    "message": "Choose a nickname...",
+    "description": "Placeholder text for name input field in name component modal."
+  },
+  "nativePermissionRequestDescription": {
+    "message": "Do you want this site to do the following?",
+    "description": "Description below header used on Permission Connect screen for native permissions."
+  },
+  "nativeToken": {
+    "message": "The native token on this network is $1. It is the token used for gas fees. ",
+    "description": "$1 represents the name of the native token on the current network"
+  },
+  "nativeTokenScamWarningConversion": {
+    "message": "Edit network details"
+  },
+  "nativeTokenScamWarningDescription": {
+    "message": "This network doesn't match its associated chain ID or name. Many popular tokens use the name $1, making it a target for scams. Scammers may trick you into sending them more valuable currency in return. Verify everything before you continue.",
+    "description": "$1 represents the currency name"
+  },
+  "nativeTokenScamWarningTitle": {
+    "message": "This is a potential scam"
+  },
+  "needHelp": {
+    "message": "Need help? Contact $1",
+    "description": "$1 represents `needHelpLinkText`, the text which goes in the help link"
+  },
+  "needHelpFeedback": {
+    "message": "Share your feedback"
+  },
+  "needHelpLinkText": {
+    "message": "MetaMask support"
+  },
+  "needHelpSubmitTicket": {
+    "message": "Submit a ticket"
+  },
+  "needImportFile": {
+    "message": "You must select a file to import.",
+    "description": "User is important an account and needs to add a file to continue"
+  },
+  "negativeETH": {
+    "message": "Can not send negative amounts of ETH."
+  },
+  "negativeOrZeroAmountToken": {
+    "message": "Cannot send negative or zero amounts of asset."
+  },
+  "network": {
+    "message": "Network:"
+  },
+  "networkAddedSuccessfully": {
+    "message": "Network added successfully!"
+  },
+  "networkDetails": {
+    "message": "Network details"
+  },
+  "networkIsBusy": {
+    "message": "Network is busy. Gas prices are high and estimates are less accurate."
+  },
+  "networkMenu": {
+    "message": "Network Menu"
+  },
+  "networkMenuHeading": {
+    "message": "Select a network"
+  },
+  "networkName": {
+    "message": "Network name"
+  },
+  "networkNameArbitrum": {
+    "message": "Arbitrum"
+  },
+  "networkNameAvalanche": {
+    "message": "Avalanche"
+  },
+  "networkNameBSC": {
+    "message": "BSC"
+  },
+  "networkNameBase": {
+    "message": "Base"
+  },
+  "networkNameBitcoin": {
+    "message": "Bitcoin"
+  },
+  "networkNameDefinition": {
+    "message": "The name associated with this network."
+  },
+  "networkNameEthereum": {
+    "message": "Ethereum"
+  },
+  "networkNameGoerli": {
+    "message": "Goerli"
+  },
+  "networkNameLinea": {
+    "message": "Linea"
+  },
+  "networkNameOpMainnet": {
+    "message": "OP Mainnet"
+  },
+  "networkNamePolygon": {
+    "message": "Polygon"
+  },
+  "networkNameTestnet": {
+    "message": "Testnet"
+  },
+  "networkNameZkSyncEra": {
+    "message": "zkSync Era"
+  },
+  "networkOptions": {
+    "message": "Network options"
+  },
+  "networkProvider": {
+    "message": "Network provider"
+  },
+  "networkSettingsChainIdDescription": {
+    "message": "The chain ID is used for signing transactions. It must match the chain ID returned by the network. You can enter a decimal or '0x'-prefixed hexadecimal number, but we will display the number in decimal."
+  },
+  "networkStatus": {
+    "message": "Network status"
+  },
+  "networkStatusBaseFeeTooltip": {
+    "message": "The base fee is set by the network and changes every 13-14 seconds. Our $1 and $2 options account for sudden increases.",
+    "description": "$1 and $2 are bold text for Medium and Aggressive respectively."
+  },
+  "networkStatusPriorityFeeTooltip": {
+    "message": "Range of priority fees (aka “miner tip”). This goes to miners and incentivizes them to prioritize your transaction."
+  },
+  "networkStatusStabilityFeeTooltip": {
+    "message": "Gas fees are $1 relative to the past 72 hours.",
+    "description": "$1 is networks stability value - stable, low, high"
+  },
+  "networkSwitchConnectionError": {
+    "message": "We can't connect to $1",
+    "description": "$1 represents the network name"
+  },
+  "networkURL": {
+    "message": "Network URL"
+  },
+  "networkURLDefinition": {
+    "message": "The URL used to access this network."
+  },
+  "networks": {
+    "message": "Networks"
+  },
+  "nevermind": {
+    "message": "Nevermind"
+  },
+  "new": {
+    "message": "New!"
+  },
+  "newAccount": {
+    "message": "New account"
+  },
+  "newAccountNumberName": {
+    "message": "Account $1",
+    "description": "Default name of next account to be created on create account screen"
+  },
+  "newContact": {
+    "message": "New contact"
+  },
+  "newContract": {
+    "message": "New contract"
+  },
+  "newNFTDetectedInImportNFTsMessageStrongText": {
+    "message": "Settings > Security and privacy"
+  },
+  "newNFTDetectedInImportNFTsMsg": {
+    "message": "To use Opensea to see your NFTs, turn on 'Display NFT Media' in $1.",
+    "description": "$1 is used for newNFTDetectedInImportNFTsMessageStrongText"
+  },
+  "newNFTDetectedInNFTsTabMessage": {
+    "message": "Let MetaMask automatically detect and display NFTs in your wallet."
+  },
+  "newNFTsAutodetected": {
+    "message": "NFT autodetection"
+  },
+  "newNetworkAdded": {
+    "message": "“$1” was successfully added!"
+  },
+  "newNetworkEdited": {
+    "message": "“$1” was successfully edited!"
+  },
+  "newNftAddedMessage": {
+    "message": "NFT was successfully added!"
+  },
+  "newPassword": {
+    "message": "New password (8 characters min)"
+  },
+  "newPrivacyPolicyActionButton": {
+    "message": "Read more"
+  },
+  "newPrivacyPolicyTitle": {
+    "message": "We’ve updated our privacy policy"
+  },
+  "newTokensImportedMessage": {
+    "message": "You’ve successfully imported $1.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Token imported"
+  },
+  "next": {
+    "message": "Next"
+  },
+  "nextNonceWarning": {
+    "message": "Nonce is higher than suggested nonce of $1",
+    "description": "The next nonce according to MetaMask's internal logic"
+  },
+  "nftAddFailedMessage": {
+    "message": "NFT can’t be added as the ownership details do not match. Make sure you have entered correct information."
+  },
+  "nftAddressError": {
+    "message": "This token is an NFT. Add on the $1",
+    "description": "$1 is a clickable link with text defined by the 'importNFTPage' key"
+  },
+  "nftAlreadyAdded": {
+    "message": "NFT has already been added."
+  },
+  "nftAutoDetectionEnabled": {
+    "message": "NFT autodetection enabled"
+  },
+  "nftDisclaimer": {
+    "message": "Disclaimer: MetaMask pulls the media file from the source url. This url sometimes gets changed by the marketplace on which the NFT was minted."
+  },
+  "nftOptions": {
+    "message": "NFT Options"
+  },
+  "nftTokenIdPlaceholder": {
+    "message": "Enter the token id"
+  },
+  "nftWarningContent": {
+    "message": "You're granting access to $1, including any you might own in the future. The party on the other end can transfer these NFTs from your wallet at any time without asking you until you revoke this approval. $2",
+    "description": "$1 is nftWarningContentBold bold part, $2 is Learn more link"
+  },
+  "nftWarningContentBold": {
+    "message": "all your $1 NFTs",
+    "description": "$1 is name of the collection"
+  },
+  "nftWarningContentGrey": {
+    "message": "Proceed with caution."
+  },
+  "nfts": {
+    "message": "NFTs"
+  },
+  "nftsPreviouslyOwned": {
+    "message": "Previously Owned"
+  },
+  "nickname": {
+    "message": "Nickname"
+  },
+  "noAccountsFound": {
+    "message": "No accounts found for the given search query"
+  },
+  "noAddressForName": {
+    "message": "No address has been set for this name."
+  },
+  "noConnectedAccountDescription": {
+    "message": "Select an account you want to use on this site to continue."
+  },
+  "noConnectedAccountTitle": {
+    "message": "MetaMask isn’t connected to this site"
+  },
+  "noConversionDateAvailable": {
+    "message": "No currency conversion date available"
+  },
+  "noConversionRateAvailable": {
+    "message": "No conversion rate available"
+  },
+  "noDomainResolution": {
+    "message": "No resolution for domain provided."
+  },
+  "noHardwareWalletOrSnapsSupport": {
+    "message": "Snaps, and most hardware wallets, will not work with your current browser version."
+  },
+  "noNFTs": {
+    "message": "No NFTs yet"
+  },
+  "noNetworksFound": {
+    "message": "No networks found for the given search query"
+  },
+  "noSnaps": {
+    "message": "You don't have any snaps installed."
+  },
+  "noThanks": {
+    "message": "No thanks"
+  },
+  "noTransactions": {
+    "message": "You have no transactions"
+  },
+  "noWebcamFound": {
+    "message": "Your computer's webcam was not found. Please try again."
+  },
+  "noWebcamFoundTitle": {
+    "message": "Webcam not found"
+  },
+  "nonCustodialAccounts": {
+    "message": "MetaMask Institutional allows you to use non-custodial accounts, if you plan to use these accounts backup the Secret Recovery Phrase."
+  },
+  "nonce": {
+    "message": "Nonce"
+  },
+  "nonceField": {
+    "message": "Customize transaction nonce"
+  },
+  "nonceFieldDesc": {
+    "message": "Turn this on to change the nonce (transaction number) when sending assets. This is an advanced feature, use cautiously."
+  },
+  "nonceFieldHeading": {
+    "message": "Custom nonce"
+  },
+  "notBusy": {
+    "message": "Not busy"
+  },
+  "notCurrentAccount": {
+    "message": "Is this the correct account? It's different from the currently selected account in your wallet"
+  },
+  "notEnoughBalance": {
+    "message": "Insufficient balance"
+  },
+  "notEnoughGas": {
+    "message": "Not enough gas"
+  },
+  "notRightNow": {
+    "message": "Not right now"
+  },
+  "note": {
+    "message": "Note"
+  },
+  "notePlaceholder": {
+    "message": "The approver will see this note when approving the transaction at the custodian."
+  },
+  "notificationDetail": {
+    "message": "Details"
+  },
+  "notificationDetailBaseFee": {
+    "message": "Base fee (GWEI)"
+  },
+  "notificationDetailGasLimit": {
+    "message": "Gas limit (units)"
+  },
+  "notificationDetailGasUsed": {
+    "message": "Gas used (units)"
+  },
+  "notificationDetailMaxFee": {
+    "message": "Max fee per gas"
+  },
+  "notificationDetailNetwork": {
+    "message": "Network"
+  },
+  "notificationDetailNetworkFee": {
+    "message": "Network fee"
+  },
+  "notificationDetailPriorityFee": {
+    "message": "Priority fee (GWEI)"
+  },
+  "notificationItemCheckBlockExplorer": {
+    "message": "Check on the Block Explorer"
+  },
+  "notificationItemCollection": {
+    "message": "Collection"
+  },
+  "notificationItemConfirmed": {
+    "message": "Confirmed"
+  },
+  "notificationItemError": {
+    "message": "Unable to retrieve fees currently"
+  },
+  "notificationItemFrom": {
+    "message": "From"
+  },
+  "notificationItemLidoStakeReadyToBeWithdrawn": {
+    "message": "Withdrawal Ready"
+  },
+  "notificationItemLidoStakeReadyToBeWithdrawnMessage": {
+    "message": "You can now withdraw your unstaked $1"
+  },
+  "notificationItemLidoWithdrawalRequestedMessage": {
+    "message": "Your request to unstake $1 has been sent"
+  },
+  "notificationItemNFTReceivedFrom": {
+    "message": "Received NFT from"
+  },
+  "notificationItemNFTSentTo": {
+    "message": "Sent NFT to"
+  },
+  "notificationItemNetwork": {
+    "message": "Network"
+  },
+  "notificationItemRate": {
+    "message": "Rate (fee included)"
+  },
+  "notificationItemReceived": {
+    "message": "Received"
+  },
+  "notificationItemReceivedFrom": {
+    "message": "Received from"
+  },
+  "notificationItemSent": {
+    "message": "Sent"
+  },
+  "notificationItemSentTo": {
+    "message": "Sent to"
+  },
+  "notificationItemStakeCompleted": {
+    "message": "Stake completed"
+  },
+  "notificationItemStaked": {
+    "message": "Staked"
+  },
+  "notificationItemStakingProvider": {
+    "message": "Staking Provider"
+  },
+  "notificationItemStatus": {
+    "message": "Status"
+  },
+  "notificationItemSwapped": {
+    "message": "Swapped"
+  },
+  "notificationItemSwappedFor": {
+    "message": "for"
+  },
+  "notificationItemTo": {
+    "message": "To"
+  },
+  "notificationItemTransactionId": {
+    "message": "Transaction ID"
+  },
+  "notificationItemUnStakeCompleted": {
+    "message": "UnStaking complete"
+  },
+  "notificationItemUnStaked": {
+    "message": "Unstaked"
+  },
+  "notificationItemUnStakingRequested": {
+    "message": "Unstaking requested"
+  },
+  "notificationTransactionFailedMessage": {
+    "message": "Transaction $1 failed! $2",
+    "description": "Content of the browser notification that appears when a transaction fails"
+  },
+  "notificationTransactionFailedMessageMMI": {
+    "message": "Transaction failed! $1",
+    "description": "Content of the browser notification that appears when a transaction fails in MMI"
+  },
+  "notificationTransactionFailedTitle": {
+    "message": "Failed transaction",
+    "description": "Title of the browser notification that appears when a transaction fails"
+  },
+  "notificationTransactionSuccessMessage": {
+    "message": "Transaction $1 confirmed!",
+    "description": "Content of the browser notification that appears when a transaction is confirmed"
+  },
+  "notificationTransactionSuccessTitle": {
+    "message": "Confirmed transaction",
+    "description": "Title of the browser notification that appears when a transaction is confirmed"
+  },
+  "notificationTransactionSuccessView": {
+    "message": "View on $1",
+    "description": "Additional content in a notification that appears when a transaction is confirmed and has a block explorer URL."
+  },
+  "notifications": {
+    "message": "Notifications"
+  },
+  "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."
+  },
+  "notificationsDropLedgerFirefoxTitle": {
+    "message": "Dropping Ledger Support for Firefox",
+    "description": "Title for a notification in the 'See What's New' popup. Tells firefox users that ledger support is being dropped."
+  },
+  "notificationsFeatureToggle": {
+    "message": "Enable Wallet Notifications",
+    "description": "Experimental feature title"
+  },
+  "notificationsFeatureToggleDescription": {
+    "message": "This enables wallet notifications like send/receive funds or nfts and feature announcements.",
+    "description": "Description of the experimental notifications feature"
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Mark all as read"
+  },
+  "notificationsPageEmptyTitle": {
+    "message": "Nothing to see here"
+  },
+  "notificationsPageErrorContent": {
+    "message": "Please, try to visit this page again."
+  },
+  "notificationsPageErrorTitle": {
+    "message": "There has been an error"
+  },
+  "notificationsPageNoNotificationsContent": {
+    "message": "You have not received any notifications yet."
+  },
+  "notificationsSettingsBoxError": {
+    "message": "Something went wrong. Please try again."
+  },
+  "notificationsSettingsPageAllowNotifications": {
+    "message": "Stay in the loop on what’s happening in your wallet with notifications. To use notifications, we use a profile to sync some settings across your devices. $1"
+  },
+  "notificationsSettingsPageAllowNotificationsLink": {
+    "message": "Learn how we protect your privacy while using this feature."
+  },
+  "numberOfNewTokensDetectedPlural": {
+    "message": "$1 new tokens found in this account",
+    "description": "$1 is the number of new tokens detected"
+  },
+  "numberOfNewTokensDetectedSingular": {
+    "message": "1 new token found in this account"
+  },
+  "numberOfTokens": {
+    "message": "Number of tokens"
+  },
+  "ofTextNofM": {
+    "message": "of"
+  },
+  "off": {
+    "message": "Off"
+  },
+  "offlineForMaintenance": {
+    "message": "Offline for maintenance"
+  },
+  "ok": {
+    "message": "Ok"
+  },
+  "on": {
+    "message": "On"
+  },
+  "onboardedMetametricsAccept": {
+    "message": "I agree"
+  },
+  "onboardedMetametricsDisagree": {
+    "message": "No thanks"
+  },
+  "onboardedMetametricsKey1": {
+    "message": "Latest developments"
+  },
+  "onboardedMetametricsKey2": {
+    "message": "Product features"
+  },
+  "onboardedMetametricsKey3": {
+    "message": "Other relevant promotional materials"
+  },
+  "onboardedMetametricsLink": {
+    "message": "MetaMetrics"
+  },
+  "onboardedMetametricsParagraph1": {
+    "message": "In addition to $1, we'd like to use data to understand how you interact with marketing communications.",
+    "description": "$1 represents the 'onboardedMetametricsLink' locale string"
+  },
+  "onboardedMetametricsParagraph2": {
+    "message": "This helps us personalize what we share with you, like:"
+  },
+  "onboardedMetametricsParagraph3": {
+    "message": "Remember, we never sell the data you provide and you can opt out any time."
+  },
+  "onboardedMetametricsTitle": {
+    "message": "Help us enhance your experience"
+  },
+  "onboarding": {
+    "message": "Onboarding"
+  },
+  "onboardingAdvancedPrivacyIPFSDescription": {
+    "message": "The IPFS gateway makes it possible to access and view data hosted by third parties. You can add a custom IPFS gateway or continue using the default."
+  },
+  "onboardingAdvancedPrivacyIPFSInvalid": {
+    "message": "Please enter a valid URL"
+  },
+  "onboardingAdvancedPrivacyIPFSTitle": {
+    "message": "Add custom IPFS Gateway"
+  },
+  "onboardingAdvancedPrivacyIPFSValid": {
+    "message": "IPFS gateway URL is valid"
+  },
+  "onboardingAdvancedPrivacyNetworkButton": {
+    "message": "Add custom network"
+  },
+  "onboardingAdvancedPrivacyNetworkDescription": {
+    "message": "We use Infura as our remote procedure call (RPC) provider to offer the most reliable and private access to Ethereum data we can. You can choose your own RPC, but remember that any RPC will receive your IP address and Ethereum wallet to make transactions. Read our $1 to learn more about how Infura handles data."
+  },
+  "onboardingAdvancedPrivacyNetworkTitle": {
+    "message": "Choose your network"
+  },
+  "onboardingCreateWallet": {
+    "message": "Create a new wallet"
+  },
+  "onboardingImportWallet": {
+    "message": "Import an existing wallet"
+  },
+  "onboardingMetametricsAgree": {
+    "message": "I agree"
+  },
+  "onboardingMetametricsDescription": {
+    "message": "We’d like to gather basic usage and diagnostics data to improve MetaMask. Know that we never sell the data you provide here."
+  },
+  "onboardingMetametricsDescription2": {
+    "message": "When we gather metrics, it will always be..."
+  },
+  "onboardingMetametricsInfuraTerms": {
+    "message": "We’ll let you know if we decide to use this data for other purposes. You can review our $1 for more information. Remember, you can go to settings and opt out at any time.",
+    "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`"
+  },
+  "onboardingMetametricsInfuraTermsPolicy": {
+    "message": "Privacy Policy"
+  },
+  "onboardingMetametricsModalTitle": {
+    "message": "Add custom network"
+  },
+  "onboardingMetametricsNeverCollect": {
+    "message": "$1 clicks and views on the app are stored, but other details (like your public address) are not.",
+    "description": "$1 represents `onboardingMetametricsNeverCollectEmphasis`"
+  },
+  "onboardingMetametricsNeverCollectEmphasis": {
+    "message": "Private:"
+  },
+  "onboardingMetametricsNeverCollectIP": {
+    "message": "$1 we temporarily use your IP address to detect a general location (like your country or region), but it's never stored.",
+    "description": "$1 represents `onboardingMetametricsNeverCollectIPEmphasis`"
+  },
+  "onboardingMetametricsNeverCollectIPEmphasis": {
+    "message": "General:"
+  },
+  "onboardingMetametricsNeverSellData": {
+    "message": "$1 you decide if you want to share or delete your usage data via settings any time.",
+    "description": "$1 represents `onboardingMetametricsNeverSellDataEmphasis`"
+  },
+  "onboardingMetametricsNeverSellDataEmphasis": {
+    "message": "Optional:"
+  },
+  "onboardingMetametricsPrivacyDescription": {
+    "message": "Learn how we protect your privacy while collecting usage data for your profile."
+  },
+  "onboardingMetametricsTitle": {
+    "message": "Help us improve MetaMask"
+  },
+  "onboardingMetametricsUseDataCheckbox": {
+    "message": "We’ll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features)."
+  },
+  "onboardingPinExtensionBillboardAccess": {
+    "message": "Full access"
+  },
+  "onboardingPinExtensionBillboardDescription": {
+    "message": "These extensions can see and change information"
+  },
+  "onboardingPinExtensionBillboardDescription2": {
+    "message": "on this site."
+  },
+  "onboardingPinExtensionBillboardTitle": {
+    "message": "Extensions"
+  },
+  "onboardingPinExtensionChrome": {
+    "message": "Click the browser extension icon"
+  },
+  "onboardingPinExtensionDescription": {
+    "message": "Pin MetaMask on your browser so it's accessible and easy to view transaction confirmations."
+  },
+  "onboardingPinExtensionDescription2": {
+    "message": "You can open MetaMask by clicking on the extension and access your wallet with 1 click."
+  },
+  "onboardingPinExtensionDescription3": {
+    "message": "Click browser extension icon to access it instantly"
+  },
+  "onboardingPinExtensionLabel": {
+    "message": "Pin MetaMask"
+  },
+  "onboardingPinExtensionStep1": {
+    "message": "1"
+  },
+  "onboardingPinExtensionStep2": {
+    "message": "2"
+  },
+  "onboardingPinExtensionTitle": {
+    "message": "Your MetaMask install is complete!"
+  },
+  "onboardingPinMmiExtensionLabel": {
+    "message": "Pin MetaMask Institutional"
+  },
+  "onboardingUsePhishingDetectionDescription": {
+    "message": "Phishing detection alerts rely on communication with $1. jsDeliver will have access to your IP address. View $2.",
+    "description": "The $1 is the word 'jsDeliver', from key 'jsDeliver' and $2 is the words Privacy Policy from key 'privacyMsg', both separated here so that it can be wrapped as a link"
+  },
+  "oneDayAbbreviation": {
+    "message": "1D",
+    "description": "Shortened form of '1 day'"
+  },
+  "oneMonthAbbreviation": {
+    "message": "1M",
+    "description": "Shortened form of '1 month'"
+  },
+  "oneWeekAbbreviation": {
+    "message": "1W",
+    "description": "Shortened form of '1 week'"
+  },
+  "oneYearAbbreviation": {
+    "message": "1Y",
+    "description": "Shortened form of '1 year'"
+  },
+  "onekey": {
+    "message": "OneKey"
+  },
+  "onlyAddTrustedNetworks": {
+    "message": "A malicious network provider can lie about the state of the blockchain and record your network activity. Only add custom networks you trust."
+  },
+  "onlyConnectTrust": {
+    "message": "Only connect with sites you trust. $1",
+    "description": "Text displayed above the buttons for connection confirmation. $1 is the link to the learn more web page."
+  },
+  "openCustodianApp": {
+    "message": "Open $1 app",
+    "description": "The $1 is the name of the Custodian that will be open"
+  },
+  "openFullScreenForLedgerWebHid": {
+    "message": "Go to full screen to connect your Ledger.",
+    "description": "Shown to the user on the confirm screen when they are viewing MetaMask in a popup window but need to connect their ledger via webhid."
+  },
+  "openInBlockExplorer": {
+    "message": "Open in block explorer"
+  },
+  "openSeaNew": {
+    "message": "OpenSea"
+  },
+  "operationFailed": {
+    "message": "Operation Failed"
+  },
+  "optional": {
+    "message": "Optional"
+  },
+  "optionalWithParanthesis": {
+    "message": "(Optional)"
+  },
+  "options": {
+    "message": "Options"
+  },
+  "or": {
+    "message": "or"
+  },
+  "origin": {
+    "message": "Origin"
+  },
+  "osTheme": {
+    "message": "System"
+  },
+  "otherSnaps": {
+    "message": "other snaps",
+    "description": "Used in the 'permission_rpc' message."
+  },
+  "outdatedBrowserNotification": {
+    "message": "Your browser is out of date. If you don't update your browser, you won't be able to get security patches and new features from MetaMask."
+  },
+  "padlock": {
+    "message": "Padlock"
+  },
+  "parameters": {
+    "message": "Parameters"
+  },
+  "participateInMetaMetrics": {
+    "message": "Participate in MetaMetrics"
+  },
+  "participateInMetaMetricsDescription": {
+    "message": "Participate in MetaMetrics to help us make MetaMask better"
+  },
+  "password": {
+    "message": "Password"
+  },
+  "passwordMmiTermsWarning": {
+    "message": "I understand that MetaMask Institutional cannot recover this password for me. $1"
+  },
+  "passwordNotLongEnough": {
+    "message": "Password not long enough"
+  },
+  "passwordSetupDetails": {
+    "message": "This password will unlock your MetaMask wallet only on this device. MetaMask can not recover this password."
+  },
+  "passwordStrength": {
+    "message": "Password strength: $1",
+    "description": "Return password strength to the user when user wants to create password."
+  },
+  "passwordStrengthDescription": {
+    "message": "A strong password can improve the security of your wallet should your device be stolen or compromised."
+  },
+  "passwordTermsWarning": {
+    "message": "I understand that MetaMask cannot recover this password for me. $1"
+  },
+  "passwordsDontMatch": {
+    "message": "Passwords don't match"
+  },
+  "pasteJWTToken": {
+    "message": "Paste or drop your token here:"
+  },
+  "pastePrivateKey": {
+    "message": "Enter your private key string here:",
+    "description": "For importing an account from a private key"
+  },
+  "paymasterInUse": {
+    "message": "The gas for this transaction will be paid by a paymaster.",
+    "description": "Alert shown in transaction confirmation if paymaster in use."
+  },
+  "pending": {
+    "message": "Pending"
+  },
+  "pendingTransactionInfo": {
+    "message": "This transaction will not process until that one is complete."
+  },
+  "pendingTransactionMultiple": {
+    "message": "You have ($1) pending transactions."
+  },
+  "pendingTransactionSingle": {
+    "message": "You have (1) pending transaction.",
+    "description": "$1 is count of pending transactions"
+  },
+  "permissionDetails": {
+    "message": "Permission details"
+  },
+  "permissionRequest": {
+    "message": "Permission request"
+  },
+  "permissionRequested": {
+    "message": "Requested now"
+  },
+  "permissionRequestedForAccounts": {
+    "message": "Requested now for $1",
+    "description": "Permission cell status for requested permission including accounts, rendered as AvatarGroup which is $1."
+  },
+  "permissionRevoked": {
+    "message": "Revoked in this update"
+  },
+  "permissionRevokedForAccounts": {
+    "message": "Revoked in this update for $1",
+    "description": "Permission cell status for revoked permission including accounts, rendered as AvatarGroup which is $1."
+  },
+  "permission_accessNamedSnap": {
+    "message": "Connect to $1.",
+    "description": "The description for the `wallet_snap` permission. $1 is the human-readable name of the snap."
+  },
+  "permission_accessNetwork": {
+    "message": "Access the internet.",
+    "description": "The description of the `endowment:network-access` permission."
+  },
+  "permission_accessNetworkDescription": {
+    "message": "Allow $1 to access the internet. This can be used to both send and receive data with third-party servers.",
+    "description": "An extended description of the `endowment:network-access` permission. $1 is the snap name."
+  },
+  "permission_accessSnap": {
+    "message": "Connect to the $1 snap.",
+    "description": "The description for the `wallet_snap` permission. $1 is the name of the snap."
+  },
+  "permission_accessSnapDescription": {
+    "message": "Allow the website or snap to interact with $1.",
+    "description": "The description for the `wallet_snap_*` permission. $1 is the name of the Snap."
+  },
+  "permission_cronjob": {
+    "message": "Schedule and execute periodic actions.",
+    "description": "The description for the `snap_cronjob` permission"
+  },
+  "permission_cronjobDescription": {
+    "message": "Allow $1 to perform actions that run periodically at fixed times, dates, or intervals. This can be used to trigger time-sensitive interactions or notifications.",
+    "description": "An extended description for the `snap_cronjob` permission. $1 is the snap name."
+  },
+  "permission_dialog": {
+    "message": "Display dialog windows in MetaMask.",
+    "description": "The description for the `snap_dialog` permission"
+  },
+  "permission_dialogDescription": {
+    "message": "Allow $1 to display MetaMask popups with custom text, input field, and buttons to approve or reject an action.\nCan be used to create e.g. alerts, confirmations, and opt-in flows for a snap.",
+    "description": "An extended description for the `snap_dialog` permission. $1 is the snap name."
+  },
+  "permission_ethereumAccounts": {
+    "message": "See address, account balance, activity and suggest transactions to approve",
+    "description": "The description for the `eth_accounts` permission"
+  },
+  "permission_ethereumProvider": {
+    "message": "Access the Ethereum provider.",
+    "description": "The description for the `endowment:ethereum-provider` permission"
+  },
+  "permission_ethereumProviderDescription": {
+    "message": "Allow $1 to communicate with MetaMask directly, in order for it to read data from the blockchain and suggest messages and transactions.",
+    "description": "An extended description for the `endowment:ethereum-provider` permission. $1 is the snap name."
+  },
+  "permission_getEntropy": {
+    "message": "Derive arbitrary keys unique to $1.",
+    "description": "The description for the `snap_getEntropy` permission. $1 is the snap name."
+  },
+  "permission_getEntropyDescription": {
+    "message": "Allow $1 to derive arbitrary keys unique to $1, without exposing them. These keys are separate from your MetaMask account(s) and not related to your private keys or Secret Recovery Phrase. Other snaps cannot access this information.",
+    "description": "An extended description for the `snap_getEntropy` permission. $1 is the snap name."
+  },
+  "permission_getLocale": {
+    "message": "View your preferred language.",
+    "description": "The description for the `snap_getLocale` permission"
+  },
+  "permission_getLocaleDescription": {
+    "message": "Let $1 access your preferred language from your MetaMask settings. This can be used to localize and display $1's content using your language.",
+    "description": "An extended description for the `snap_getLocale` permission. $1 is the snap name."
+  },
+  "permission_homePage": {
+    "message": "Display a custom screen",
+    "description": "The description for the `endowment:page-home` permission"
+  },
+  "permission_homePageDescription": {
+    "message": "Let $1 display a custom home screen in MetaMask. This can be used for user interfaces, configuration, and dashboards.",
+    "description": "An extended description for the `endowment:page-home` permission. $1 is the snap name."
+  },
+  "permission_keyring": {
+    "message": "Allow requests for adding and controlling Ethereum accounts",
+    "description": "The description for the `endowment:keyring` permission"
+  },
+  "permission_keyringDescription": {
+    "message": "Let $1 receive requests to add or remove accounts, plus sign and transact on behalf of these accounts.",
+    "description": "An extended description for the `endowment:keyring` permission. $1 is the snap name."
+  },
+  "permission_lifecycleHooks": {
+    "message": "Use lifecycle hooks.",
+    "description": "The description for the `endowment:lifecycle-hooks` permission"
+  },
+  "permission_lifecycleHooksDescription": {
+    "message": "Allow $1 to use lifecycle hooks to run code at specific times during its lifecycle.",
+    "description": "An extended description for the `endowment:lifecycle-hooks` permission. $1 is the snap name."
+  },
+  "permission_manageAccounts": {
+    "message": "Add and control Ethereum accounts",
+    "description": "The description for `snap_manageAccounts` permission"
+  },
+  "permission_manageAccountsDescription": {
+    "message": "Allow $1 to add or remove Ethereum accounts, then transact and sign with these accounts.",
+    "description": "An extended description for the `snap_manageAccounts` permission. $1 is the snap name."
+  },
+  "permission_manageBip32Keys": {
+    "message": "Manage $1 accounts.",
+    "description": "The description for the `snap_getBip32Entropy` permission. $1 is a derivation path, e.g. 'm/44'/0'/0' (secp256k1)'."
+  },
+  "permission_manageBip44AndBip32KeysDescription": {
+    "message": "Allow $1 to manage accounts and assets on the requested network. These accounts are derived and backed up using your secret recovery phrase (without revealing it). With the power to derive keys, $1 can support a variety of blockchain protocols beyond Ethereum (EVMs).",
+    "description": "An extended description for the `snap_getBip44Entropy` and `snap_getBip44Entropy` permissions. $1 is the snap name."
+  },
+  "permission_manageBip44Keys": {
+    "message": "Manage $1 accounts.",
+    "description": "The description for the `snap_getBip44Entropy` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
+  },
+  "permission_manageState": {
+    "message": "Store and manage its data on your device.",
+    "description": "The description for the `snap_manageState` permission"
+  },
+  "permission_manageStateDescription": {
+    "message": "Allow $1 to store, update, and retrieve data securely with encryption. Other snaps cannot access this information.",
+    "description": "An extended description for the `snap_manageState` permission. $1 is the snap name."
+  },
+  "permission_nameLookup": {
+    "message": "Provide domain and address lookups.",
+    "description": "The description for the `endowment:name-lookup` permission."
+  },
+  "permission_nameLookupDescription": {
+    "message": "Allow the snap to fetch and display address and domain lookups in different parts of the MetaMask UI.",
+    "description": "An extended description for the `endowment:name-lookup` permission."
+  },
+  "permission_notifications": {
+    "message": "Show notifications.",
+    "description": "The description for the `snap_notify` permission"
+  },
+  "permission_notificationsDescription": {
+    "message": "Allow $1 to display notifications within MetaMask. A short notification text can be triggered by a snap for actionable or time-sensitive information.",
+    "description": "An extended description for the `snap_notify` permission. $1 is the snap name."
+  },
+  "permission_rpc": {
+    "message": "Allow $1 to communicate directly with $2.",
+    "description": "The description for the `endowment:rpc` permission. $1 is 'other snaps' or 'websites', $2 is the snap name."
+  },
+  "permission_rpcDescription": {
+    "message": "Allow $1 to send messages to $2 and receive a response from $2.",
+    "description": "An extended description for the `endowment:rpc` permission. $1 is 'other snaps' or 'websites', $2 is the snap name."
+  },
+  "permission_rpcDescriptionOriginList": {
+    "message": "$1 and $2",
+    "description": "A list of allowed origins where $2 is the last origin of the list and $1 is the rest of the list separated by ','."
+  },
+  "permission_signatureInsight": {
+    "message": "Display signature insights modal.",
+    "description": "The description for the `endowment:signature-insight` permission"
+  },
+  "permission_signatureInsightDescription": {
+    "message": "Allow $1 to display a modal with insights on any signature request before approval. This can be used for anti-phishing and security solutions.",
+    "description": "An extended description for the `endowment:signature-insight` permission. $1 is the snap name."
+  },
+  "permission_signatureInsightOrigin": {
+    "message": "See the origins of websites that initiate a signature request",
+    "description": "The description for the `signatureOrigin` caveat, to be used with the `endowment:signature-insight` permission"
+  },
+  "permission_signatureInsightOriginDescription": {
+    "message": "Allow $1 to see the origin (URI) of websites that initiate signature requests. This can be used for anti-phishing and security solutions.",
+    "description": "An extended description for the `signatureOrigin` caveat, to be used with the `endowment:signature-insight` permission. $1 is the snap name."
+  },
+  "permission_transactionInsight": {
+    "message": "Fetch and display transaction insights.",
+    "description": "The description for the `endowment:transaction-insight` permission"
+  },
+  "permission_transactionInsightDescription": {
+    "message": "Allow $1 to decode transactions and show insights within the MetaMask UI. This can be used for anti-phishing and security solutions.",
+    "description": "An extended description for the `endowment:transaction-insight` permission. $1 is the snap name."
+  },
+  "permission_transactionInsightOrigin": {
+    "message": "See the origins of websites that suggest transactions",
+    "description": "The description for the `transactionOrigin` caveat, to be used with the `endowment:transaction-insight` permission"
+  },
+  "permission_transactionInsightOriginDescription": {
+    "message": "Allow $1 to see the origin (URI) of websites that suggest transactions. This can be used for anti-phishing and security solutions.",
+    "description": "An extended description for the `transactionOrigin` caveat, to be used with the `endowment:transaction-insight` permission. $1 is the snap name."
+  },
+  "permission_unknown": {
+    "message": "Unknown permission: $1",
+    "description": "$1 is the name of a requested permission that is not recognized."
+  },
+  "permission_viewBip32PublicKeys": {
+    "message": "View your public key for $1 ($2).",
+    "description": "The description for the `snap_getBip32PublicKey` permission. $1 is a derivation path, e.g. 'm/44'/0'/0''. $2 is the elliptic curve name, e.g. 'secp256k1'."
+  },
+  "permission_viewBip32PublicKeysDescription": {
+    "message": "Allow $2 to view your public keys (and addresses) for $1. This does not grant any control of accounts or assets.",
+    "description": "An extended description for the `snap_getBip32PublicKey` permission. $1 is a derivation path (name). $2 is the snap name."
+  },
+  "permission_viewNamedBip32PublicKeys": {
+    "message": "View your public key for $1.",
+    "description": "The description for the `snap_getBip32PublicKey` permission. $1 is a name for the derivation path, e.g., 'Ethereum accounts'."
+  },
+  "permission_walletSwitchEthereumChain": {
+    "message": "Switch to and use the following network",
+    "description": "The label for the `wallet_switchEthereumChain` permission"
+  },
+  "permission_webAssembly": {
+    "message": "Support for WebAssembly.",
+    "description": "The description of the `endowment:webassembly` permission."
+  },
+  "permission_webAssemblyDescription": {
+    "message": "Allow $1 to access low-level execution environments via WebAssembly.",
+    "description": "An extended description of the `endowment:webassembly` permission. $1 is the snap name."
+  },
+  "permissions": {
+    "message": "Permissions"
+  },
+  "permissionsPageEmptyContent": {
+    "message": "Nothing to see here"
+  },
+  "permissionsPageEmptySubContent": {
+    "message": "This is where you can see the permissions you've given to installed Snaps or connected sites."
+  },
+  "permissionsPageTourDescription": {
+    "message": "This is your control panel for managing permissions given to connected sites and installed Snaps."
+  },
+  "permissionsPageTourTitle": {
+    "message": "Connected sites are now permissions"
+  },
+  "permitSimulationDetailInfo": {
+    "message": "You're giving the spender permission to spend this many tokens from your account."
+  },
+  "personalAddressDetected": {
+    "message": "Personal address detected. Input the token contract address."
+  },
+  "petnamesEnabledToggle": {
+    "message": "Allow nicknames"
+  },
+  "petnamesEnabledToggleDescription": {
+    "message": "This lets you assign a nickname to any address. We’ll suggest names for addresses that you interact with when possible."
+  },
+  "pinExtensionDescription": {
+    "message": "Navigate to the extension menu and pin MetaMask Institutional for seamless access."
+  },
+  "pinExtensionTitle": {
+    "message": "Pin extension"
+  },
+  "pinToTop": {
+    "message": "Pin to top"
+  },
+  "pleaseConfirm": {
+    "message": "Please confirm"
+  },
+  "plusMore": {
+    "message": "+ $1 more",
+    "description": "$1 is the number of additional items"
+  },
+  "plusXMore": {
+    "message": "+ $1 more",
+    "description": "$1 is a number of additional but unshown items in a list- this message will be shown in place of those items"
+  },
+  "popularCustomNetworks": {
+    "message": "Popular custom networks"
+  },
+  "popularNetworkAddToolTip": {
+    "message": "Some of these networks rely on third parties. The connections may be less reliable or enable third-parties to track activity. $1",
+    "description": "$1 is Learn more link"
+  },
+  "portfolio": {
+    "message": "Portfolio"
+  },
+  "portfolioDashboard": {
+    "message": "Portfolio Dashboard"
+  },
+  "preparingSwap": {
+    "message": "Preparing swap..."
+  },
+  "prev": {
+    "message": "Prev"
+  },
+  "price": {
+    "message": "Price"
+  },
+  "priceUnavailable": {
+    "message": "price unavailable"
+  },
+  "primaryCurrencySetting": {
+    "message": "Primary currency"
+  },
+  "primaryCurrencySettingDescription": {
+    "message": "Select native to prioritize displaying values in the native currency of the chain (e.g. ETH). Select Fiat to prioritize displaying values in your selected fiat currency."
+  },
+  "primaryType": {
+    "message": "Primary type"
+  },
+  "priorityFee": {
+    "message": "Priority fee"
+  },
+  "priorityFeeProperCase": {
+    "message": "Priority Fee"
+  },
+  "privacy": {
+    "message": "Privacy"
+  },
+  "privacyMsg": {
+    "message": "Privacy policy"
+  },
+  "privateKey": {
+    "message": "Private Key",
+    "description": "select this type of file to use to import an account"
+  },
+  "privateKeyCopyWarning": {
+    "message": "Private key for $1",
+    "description": "$1 represents the account name"
+  },
+  "privateKeyHidden": {
+    "message": "The private key is hidden",
+    "description": "Explains that the private key input is hidden"
+  },
+  "privateKeyShow": {
+    "message": "Show/Hide the private key input",
+    "description": "Describes a toggle that is used to show or hide the private key input"
+  },
+  "privateKeyShown": {
+    "message": "This private key is being shown",
+    "description": "Explains that the private key input is being shown"
+  },
+  "privateKeyWarning": {
+    "message": "Warning: Never disclose this key. Anyone with your private keys can steal any assets held in your account."
+  },
+  "privateNetwork": {
+    "message": "Private network"
+  },
+  "proceedWithTransaction": {
+    "message": "I want to proceed anyway"
+  },
+  "productAnnouncements": {
+    "message": "Product announcements"
+  },
+  "profileSync": {
+    "message": "Profile Sync"
+  },
+  "profileSyncConfirmation": {
+    "message": "If you turn off profile sync, you won’t be able to receive notifications."
+  },
+  "profileSyncDescription": {
+    "message": "Creates a profile that MetaMask uses to sync some settings among your devices. This is required to get notifications. $1."
+  },
+  "profileSyncPrivacyLink": {
+    "message": "Learn how we protect your privacy"
+  },
+  "proposedApprovalLimit": {
+    "message": "Proposed approval limit"
+  },
+  "provide": {
+    "message": "Provide"
+  },
+  "publicAddress": {
+    "message": "Public address"
+  },
+  "pushPlatformNotificationsFundsReceivedDescription": {
+    "message": "You received $1 $2"
+  },
+  "pushPlatformNotificationsFundsReceivedDescriptionDefault": {
+    "message": "You received some tokens"
+  },
+  "pushPlatformNotificationsFundsReceivedTitle": {
+    "message": "Funds received"
+  },
+  "pushPlatformNotificationsFundsSentDescription": {
+    "message": "You successfully sent $1 $2"
+  },
+  "pushPlatformNotificationsFundsSentDescriptionDefault": {
+    "message": "You successfully sent some tokens"
+  },
+  "pushPlatformNotificationsFundsSentTitle": {
+    "message": "Funds sent"
+  },
+  "pushPlatformNotificationsNftReceivedDescription": {
+    "message": "You received new NFTs"
+  },
+  "pushPlatformNotificationsNftReceivedTitle": {
+    "message": "NFT received"
+  },
+  "pushPlatformNotificationsNftSentDescription": {
+    "message": "You have successfully sent an NFT"
+  },
+  "pushPlatformNotificationsNftSentTitle": {
+    "message": "NFT sent"
+  },
+  "pushPlatformNotificationsStakingLidoStakeCompletedDescription": {
+    "message": "Your Lido stake was successful"
+  },
+  "pushPlatformNotificationsStakingLidoStakeCompletedTitle": {
+    "message": "Stake complete"
+  },
+  "pushPlatformNotificationsStakingLidoStakeReadyToBeWithdrawnDescription": {
+    "message": "Your Lido stake is now ready to be withdrawn"
+  },
+  "pushPlatformNotificationsStakingLidoStakeReadyToBeWithdrawnTitle": {
+    "message": "Stake ready for withdrawal"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalCompletedDescription": {
+    "message": "Your Lido withdrawal was successful"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalCompletedTitle": {
+    "message": "Withdrawal completed"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalRequestedDescription": {
+    "message": "Your Lido withdrawal request was submitted"
+  },
+  "pushPlatformNotificationsStakingLidoWithdrawalRequestedTitle": {
+    "message": "Withdrawal requested"
+  },
+  "pushPlatformNotificationsStakingRocketpoolStakeCompletedDescription": {
+    "message": "Your RocketPool stake was successful"
+  },
+  "pushPlatformNotificationsStakingRocketpoolStakeCompletedTitle": {
+    "message": "Stake complete"
+  },
+  "pushPlatformNotificationsStakingRocketpoolUnstakeCompletedDescription": {
+    "message": "Your RocketPool unstake was successful"
+  },
+  "pushPlatformNotificationsStakingRocketpoolUnstakeCompletedTitle": {
+    "message": "Unstake complete"
+  },
+  "pushPlatformNotificationsSwapCompletedDescription": {
+    "message": "Your MetaMask Swap was successful"
+  },
+  "pushPlatformNotificationsSwapCompletedTitle": {
+    "message": "Swap completed"
+  },
+  "queued": {
+    "message": "Queued"
+  },
+  "quoteRate": {
+    "message": "Quote rate"
+  },
+  "rank": {
+    "message": "Rank"
+  },
+  "reAddAccounts": {
+    "message": "re-add any other accounts"
+  },
+  "reAdded": {
+    "message": "re-added"
+  },
+  "readdToken": {
+    "message": "You can add this token back in the future by going to “Import token” in your accounts options menu."
+  },
+  "receive": {
+    "message": "Receive"
+  },
+  "receiveTokensCamelCase": {
+    "message": "Receive tokens"
+  },
+  "recipientAddressPlaceholder": {
+    "message": "Enter public address (0x) or ENS name"
+  },
+  "recipientAddressPlaceholderFlask": {
+    "message": "Enter public address (0x) or domain name"
+  },
+  "recommendedGasLabel": {
+    "message": "Recommended"
+  },
+  "recoveryPhraseReminderBackupStart": {
+    "message": "Start here"
+  },
+  "recoveryPhraseReminderConfirm": {
+    "message": "Got it"
+  },
+  "recoveryPhraseReminderHasBackedUp": {
+    "message": "Always keep your Secret Recovery Phrase in a secure and secret place"
+  },
+  "recoveryPhraseReminderHasNotBackedUp": {
+    "message": "Need to backup your Secret Recovery Phrase again?"
+  },
+  "recoveryPhraseReminderItemOne": {
+    "message": "Never share your Secret Recovery Phrase with anyone"
+  },
+  "recoveryPhraseReminderItemTwo": {
+    "message": "The MetaMask team will never ask for your Secret Recovery Phrase"
+  },
+  "recoveryPhraseReminderSubText": {
+    "message": "Your Secret Recovery Phrase controls all of your accounts."
+  },
+  "recoveryPhraseReminderTitle": {
+    "message": "Protect your funds"
+  },
+  "redesignedConfirmationsEnabledToggle": {
+    "message": "Improved signature requests"
+  },
+  "redesignedConfirmationsToggleDescription": {
+    "message": "Turn this on to see signature requests in an enhanced format."
+  },
+  "refreshList": {
+    "message": "Refresh list"
+  },
+  "reject": {
+    "message": "Reject"
+  },
+  "rejectAll": {
+    "message": "Reject all"
+  },
+  "rejectRequestsDescription": {
+    "message": "You are about to batch reject $1 requests."
+  },
+  "rejectRequestsN": {
+    "message": "Reject $1 requests"
+  },
+  "rejectTxsDescription": {
+    "message": "You are about to batch reject $1 transactions."
+  },
+  "rejectTxsN": {
+    "message": "Reject $1 transactions"
+  },
+  "rejected": {
+    "message": "Rejected"
+  },
+  "remember": {
+    "message": "Remember:"
+  },
+  "remove": {
+    "message": "Remove"
+  },
+  "removeAccount": {
+    "message": "Remove account"
+  },
+  "removeAccountDescription": {
+    "message": "This account will be removed from your wallet. Please make sure you have the original Secret Recovery Phrase or private key for this imported account before continuing. You can import or create accounts again from the account drop-down. "
+  },
+  "removeJWT": {
+    "message": "Remove custodian token"
+  },
+  "removeJWTDescription": {
+    "message": "Are you sure you want to remove this token? All accounts assigned to this token will be removed from extension as well: "
+  },
+  "removeKeyringSnap": {
+    "message": "Removing this Snap removes these accounts from MetaMask:"
+  },
+  "removeKeyringSnapToolTip": {
+    "message": "The snap controls the accounts, and by removing it, the accounts will be removed from MetaMask, too, but they will remain in the blockchain."
+  },
+  "removeNFT": {
+    "message": "Remove NFT"
+  },
+  "removeNftErrorMessage": {
+    "message": "We could not remove this NFT."
+  },
+  "removeNftMessage": {
+    "message": "NFT was successfully removed!"
+  },
+  "removeSnap": {
+    "message": "Remove Snap"
+  },
+  "removeSnapAccountDescription": {
+    "message": "If you proceed, this account will no longer be available in MetaMask."
+  },
+  "removeSnapAccountTitle": {
+    "message": "Remove account"
+  },
+  "removeSnapConfirmation": {
+    "message": "Are you sure you want to remove $1?",
+    "description": "$1 represents the name of the snap"
+  },
+  "removeSnapDescription": {
+    "message": "This action will delete the snap, its data and revoke your given permissions."
+  },
+  "replace": {
+    "message": "replace"
+  },
+  "reportIssue": {
+    "message": "Report an issue"
+  },
+  "requestFlaggedAsMaliciousFallbackCopyReason": {
+    "message": "The security provider has not shared additional details"
+  },
+  "requestFlaggedAsMaliciousFallbackCopyReasonTitle": {
+    "message": "Request flagged as malicious"
+  },
+  "requestFrom": {
+    "message": "Request from"
+  },
+  "requestFromInfo": {
+    "message": "This is the site asking for your signature."
+  },
+  "requestFromTransactionDescription": {
+    "message": "This is the site asking for your confirmation."
+  },
+  "requestMayNotBeSafe": {
+    "message": "Request may not be safe"
+  },
+  "requestMayNotBeSafeError": {
+    "message": "The security provider didn't detect any known malicious activity, but it still may not be safe to continue."
+  },
+  "requestNotVerified": {
+    "message": "Request not verified"
+  },
+  "requestNotVerifiedError": {
+    "message": "Because of an error, this request was not verified by the security provider. Proceed with caution."
+  },
+  "requestsAwaitingAcknowledgement": {
+    "message": "requests waiting to be acknowledged"
+  },
+  "required": {
+    "message": "Required"
+  },
+  "reset": {
+    "message": "Reset"
+  },
+  "resetStates": {
+    "message": "Reset States"
+  },
+  "resetWallet": {
+    "message": "Reset wallet"
+  },
+  "resetWalletSubHeader": {
+    "message": "MetaMask does not keep a copy of your password. If you’re having trouble unlocking your account, you will need to reset your wallet. You can do this by providing the Secret Recovery Phrase you used when you set up your wallet."
+  },
+  "resetWalletUsingSRP": {
+    "message": "This action will delete your current wallet and Secret Recovery Phrase from this device, along with the list of accounts you’ve curated. After resetting with a Secret Recovery Phrase, you’ll see a list of accounts based on the Secret Recovery Phrase you use to reset. This new list will automatically include accounts that have a balance. You’ll also be able to $1 created previously. Custom accounts that you’ve imported will need to be $2, and any custom tokens you’ve added to an account will need to be $3 as well."
+  },
+  "resetWalletWarning": {
+    "message": "Make sure you’re using the correct Secret Recovery Phrase before proceeding. You will not be able to undo this."
+  },
+  "restartMetamask": {
+    "message": "Restart MetaMask"
+  },
+  "restore": {
+    "message": "Restore"
+  },
+  "restoreFailed": {
+    "message": "Can not restore your data from the file provided"
+  },
+  "restoreSuccessful": {
+    "message": "Your data has been restored successfully"
+  },
+  "restoreUserData": {
+    "message": "Restore user data"
+  },
+  "restoreUserDataDescription": {
+    "message": "You can restore data like contacts and preferences from a backup file."
+  },
+  "resultPageError": {
+    "message": "Error"
+  },
+  "resultPageErrorDefaultMessage": {
+    "message": "The operation failed."
+  },
+  "resultPageSuccess": {
+    "message": "Success"
+  },
+  "resultPageSuccessDefaultMessage": {
+    "message": "The operation completed successfully."
+  },
+  "retryTransaction": {
+    "message": "Retry transaction"
+  },
+  "reusedTokenNameWarning": {
+    "message": "A token here reuses a symbol from another token you watch, this can be confusing or deceptive."
+  },
+  "revealSeedWords": {
+    "message": "Reveal Secret Recovery Phrase"
+  },
+  "revealSeedWordsDescription1": {
+    "message": "The $1 provides $2",
+    "description": "This is a sentence consisting of link using 'revealSeedWordsSRPName' as $1 and bolded text using 'revealSeedWordsDescription3' as $2."
+  },
+  "revealSeedWordsDescription2": {
+    "message": "MetaMask is a $1. That means you're the owner of your SRP.",
+    "description": "$1 is text link with the message from 'revealSeedWordsNonCustodialWallet'"
+  },
+  "revealSeedWordsDescription3": {
+    "message": "full access to your wallet and funds.\n"
+  },
+  "revealSeedWordsNonCustodialWallet": {
+    "message": "non-custodial wallet"
+  },
+  "revealSeedWordsQR": {
+    "message": "QR"
+  },
+  "revealSeedWordsSRPName": {
+    "message": "Secret Recovery Phrase (SRP)"
+  },
+  "revealSeedWordsText": {
+    "message": "Text"
+  },
+  "revealSeedWordsWarning": {
+    "message": "Make sure no one is looking at your screen. $1",
+    "description": "$1 is bolded text using the message from 'revealSeedWordsWarning2'"
+  },
+  "revealSeedWordsWarning2": {
+    "message": "MetaMask Support will never request this.",
+    "description": "The bolded texted in the second part of 'revealSeedWordsWarning'"
+  },
+  "revealSensitiveContent": {
+    "message": "Reveal sensitive content"
+  },
+  "revealTheSeedPhrase": {
+    "message": "Reveal seed phrase"
+  },
+  "reviewAlerts": {
+    "message": "Review alerts"
+  },
+  "revokeAllTokensTitle": {
+    "message": "Revoke permission to access and transfer all of your $1?",
+    "description": "$1 is the symbol of the token for which the user is revoking approval"
+  },
+  "revokeAllTokensTitleWithoutSymbol": {
+    "message": "Revoke permission to access and transfer all of your NFTs from $1?",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
+  "revokeApproveForAllDescription": {
+    "message": "This revokes the permission for a third party to access and transfer all of your $1 without further notice.",
+    "description": "$1 is either a string or link of a given token symbol or name"
+  },
+  "revokeApproveForAllDescriptionWithoutSymbol": {
+    "message": "This revokes the permission for a third party to access and transfer all of your NFTs from $1 without further notice.",
+    "description": "$1 is a link to contract on the block explorer when we're not able to retrieve a erc721 or erc1155 name"
+  },
+  "revokePermission": {
+    "message": "Revoke permission"
+  },
+  "revokeSpendingCap": {
+    "message": "Revoke spending cap for your $1",
+    "description": "$1 is a token symbol"
+  },
+  "revokeSpendingCapTooltipText": {
+    "message": "This third party will be unable to spend any more of your current or future tokens."
+  },
+  "rpcUrl": {
+    "message": "New RPC URL"
+  },
+  "safeTransferFrom": {
+    "message": "Safe transfer from"
+  },
+  "save": {
+    "message": "Save"
+  },
+  "scanInstructions": {
+    "message": "Place the QR code in front of your camera"
+  },
+  "scanQrCode": {
+    "message": "Scan QR code"
+  },
+  "scrollDown": {
+    "message": "Scroll down"
+  },
+  "search": {
+    "message": "Search"
+  },
+  "searchAccounts": {
+    "message": "Search accounts"
+  },
+  "searchNfts": {
+    "message": "Search NFTs"
+  },
+  "searchTokens": {
+    "message": "Search tokens"
+  },
+  "secretRecoveryPhrase": {
+    "message": "Secret Recovery Phrase"
+  },
+  "secureWallet": {
+    "message": "Secure wallet"
+  },
+  "security": {
+    "message": "Security"
+  },
+  "securityAlert": {
+    "message": "Security alert from $1 and $2"
+  },
+  "securityAlerts": {
+    "message": "Security alerts"
+  },
+  "securityAlertsDescription": {
+    "message": "This feature alerts you to malicious activity by actively reviewing transaction and signature requests. $1",
+    "description": "Link to learn more about security alerts"
+  },
+  "securityAndPrivacy": {
+    "message": "Security & privacy"
+  },
+  "securityProviderPoweredBy": {
+    "message": "Powered by $1",
+    "description": "The security provider that is providing data"
+  },
+  "seeDetails": {
+    "message": "See details"
+  },
+  "seedPhraseConfirm": {
+    "message": "Confirm Secret Recovery Phrase"
+  },
+  "seedPhraseEnterMissingWords": {
+    "message": "Confirm Secret Recovery Phrase"
+  },
+  "seedPhraseIntroNotRecommendedButtonCopy": {
+    "message": "Remind me later (not recommended)"
+  },
+  "seedPhraseIntroRecommendedButtonCopy": {
+    "message": "Secure my wallet (recommended)"
+  },
+  "seedPhraseIntroSidebarBulletFour": {
+    "message": "Write down and store in multiple secret places"
+  },
+  "seedPhraseIntroSidebarBulletOne": {
+    "message": "Save in a password manager"
+  },
+  "seedPhraseIntroSidebarBulletThree": {
+    "message": "Store in a safe deposit box"
+  },
+  "seedPhraseIntroSidebarCopyOne": {
+    "message": "Your Secret Recovery Phrase is a 12-word phrase that is the “master key” to your wallet and your funds"
+  },
+  "seedPhraseIntroSidebarCopyThree": {
+    "message": "If someone asks for your recovery phrase they are likely trying to scam you and steal your wallet funds."
+  },
+  "seedPhraseIntroSidebarCopyTwo": {
+    "message": "Never, ever share your Secret Recovery Phrase, not even with MetaMask!"
+  },
+  "seedPhraseIntroSidebarTitleOne": {
+    "message": "What is a Secret Recovery Phrase?"
+  },
+  "seedPhraseIntroSidebarTitleThree": {
+    "message": "Should I share my Secret Recovery Phrase?"
+  },
+  "seedPhraseIntroSidebarTitleTwo": {
+    "message": "How do I save my Secret Recovery Phrase?"
+  },
+  "seedPhraseIntroTitle": {
+    "message": "Secure your wallet"
+  },
+  "seedPhraseIntroTitleCopy": {
+    "message": "Before getting started, watch this short video to learn about your Secret Recovery Phrase and how to keep your wallet safe."
+  },
+  "seedPhraseReq": {
+    "message": "Secret Recovery Phrases contain 12, 15, 18, 21, or 24 words"
+  },
+  "seedPhraseWriteDownDetails": {
+    "message": "Write down this 12-word Secret Recovery Phrase and save it in a place that you trust and only you can access."
+  },
+  "seedPhraseWriteDownHeader": {
+    "message": "Write down your Secret Recovery Phrase"
+  },
+  "select": {
+    "message": "Select"
+  },
+  "selectAccounts": {
+    "message": "Select the account(s) to use on this site"
+  },
+  "selectAccountsForSnap": {
+    "message": "Select the account(s) to use with this snap"
+  },
+  "selectAll": {
+    "message": "Select all"
+  },
+  "selectAllAccounts": {
+    "message": "Select all accounts"
+  },
+  "selectAnAccount": {
+    "message": "Select an account"
+  },
+  "selectAnAccountAlreadyConnected": {
+    "message": "This account has already been connected to MetaMask"
+  },
+  "selectAnAccountHelp": {
+    "message": "Select the custodian accounts to use in MetaMask Institutional."
+  },
+  "selectEnableDisplayMediaPrivacyPreference": {
+    "message": "Turn on Display NFT Media"
+  },
+  "selectHdPath": {
+    "message": "Select HD path"
+  },
+  "selectJWT": {
+    "message": "Select token"
+  },
+  "selectNFTPrivacyPreference": {
+    "message": "Enable NFT Autodetection"
+  },
+  "selectPathHelp": {
+    "message": "If you don't see the accounts you expect, try switching the HD path or current selected network."
+  },
+  "selectType": {
+    "message": "Select Type"
+  },
+  "selectingAllWillAllow": {
+    "message": "Selecting all will allow this site to view all of your current accounts. Make sure you trust this site."
+  },
+  "send": {
+    "message": "Send"
+  },
+  "sendBugReport": {
+    "message": "Send us a bug report."
+  },
+  "sendNoContactsConversionText": {
+    "message": "click here"
+  },
+  "sendNoContactsDescription": {
+    "message": "Contacts allow you to safely send transactions to another account multiple times.  To create a contact, $1",
+    "description": "$1 represents the action text 'click here'"
+  },
+  "sendNoContactsTitle": {
+    "message": "You don't have any contacts yet"
+  },
+  "sendSelectReceiveAsset": {
+    "message": "Select asset to receive"
+  },
+  "sendSelectSendAsset": {
+    "message": "Select asset to send"
+  },
+  "sendSpecifiedTokens": {
+    "message": "Send $1",
+    "description": "Symbol of the specified token"
+  },
+  "sendSwapSubmissionWarning": {
+    "message": "Clicking this button will immediately initiate your swap transaction. Please review your transaction details before proceeding."
+  },
+  "sendTokenAsToken": {
+    "message": "Send $1 as $2",
+    "description": "Used in the transaction display list to describe a swap and send. $1 and $2 are the symbols of tokens in involved in the swap."
+  },
+  "sendingAsset": {
+    "message": "Sending $1"
+  },
+  "sendingDisabled": {
+    "message": "Sending of ERC-1155 NFT assets is not yet supported."
+  },
+  "sendingNativeAsset": {
+    "message": "Sending $1",
+    "description": "$1 represents the native currency symbol for the current network (e.g. ETH or BNB)"
+  },
+  "sendingToTokenContractWarning": {
+    "message": "Warning: you are about to send to a token contract which could result in a loss of funds. $1",
+    "description": "$1 is a clickable link with text defined by the 'learnMoreUpperCase' key. The link will open to a support article regarding the known contract address warning"
+  },
+  "sendingZeroAmount": {
+    "message": "You are sending 0 $1."
+  },
+  "sepolia": {
+    "message": "Sepolia test network"
+  },
+  "serviceWorkerKeepAlive": {
+    "message": "Service Worker Keep Alive"
+  },
+  "setAdvancedPrivacySettingsDetails": {
+    "message": "MetaMask uses these trusted third-party services to enhance product usability and safety."
+  },
+  "setApprovalForAll": {
+    "message": "Set approval for all"
+  },
+  "setApprovalForAllTitle": {
+    "message": "Approve $1 with no spend limit",
+    "description": "The token symbol that is being approved"
+  },
+  "settingAddSnapAccount": {
+    "message": "Add account Snap"
+  },
+  "settings": {
+    "message": "Settings"
+  },
+  "settingsSearchMatchingNotFound": {
+    "message": "No matching results found."
+  },
+  "settingsSubHeadingSignaturesAndTransactions": {
+    "message": "Signature and transaction requests"
+  },
+  "show": {
+    "message": "Show"
+  },
+  "showAccount": {
+    "message": "Show account"
+  },
+  "showExtensionInFullSizeView": {
+    "message": "Show extension in full-size view"
+  },
+  "showExtensionInFullSizeViewDescription": {
+    "message": "Turn this on to make full-size view your default when you click the extension icon."
+  },
+  "showFiatConversionInTestnets": {
+    "message": "Show conversion on test networks"
+  },
+  "showFiatConversionInTestnetsDescription": {
+    "message": "Select this to show fiat conversion on test networks"
+  },
+  "showHexData": {
+    "message": "Show hex data"
+  },
+  "showHexDataDescription": {
+    "message": "Select this to show the hex data field on the send screen"
+  },
+  "showIncomingTransactions": {
+    "message": "Show incoming transactions"
+  },
+  "showIncomingTransactionsDescription": {
+    "message": "This relies on $1 which will have access to your Ethereum address and your IP address. $2",
+    "description": "$1 is the link to etherscan url and $2 is the link to the privacy policy of consensys APIs"
+  },
+  "showIncomingTransactionsExplainer": {
+    "message": "This relies on different third-party APIs for each network, which expose your Ethereum address and your IP address."
+  },
+  "showLess": {
+    "message": "Show less"
+  },
+  "showMore": {
+    "message": "Show more"
+  },
+  "showNft": {
+    "message": "Show NFT"
+  },
+  "showPermissions": {
+    "message": "Show permissions"
+  },
+  "showPrivateKey": {
+    "message": "Show private key"
+  },
+  "showTestnetNetworks": {
+    "message": "Show test networks"
+  },
+  "showTestnetNetworksDescription": {
+    "message": "Select this to show test networks in network list"
+  },
+  "sigRequest": {
+    "message": "Signature request"
+  },
+  "sign": {
+    "message": "Sign"
+  },
+  "signatureRequest": {
+    "message": "Signature request"
+  },
+  "signatureRequestGuidance": {
+    "message": "Only sign this message if you fully understand the content and trust the requesting site."
+  },
+  "signatureRequestWarning": {
+    "message": "Signing this message could be dangerous. You may be giving total control of your account and assets to the party on the other end of this message. That means they could drain your account at any time. Proceed with caution. $1."
+  },
+  "signed": {
+    "message": "Signed"
+  },
+  "signin": {
+    "message": "Sign-In"
+  },
+  "signing": {
+    "message": "Signing"
+  },
+  "signingInWith": {
+    "message": "Signing in with"
+  },
+  "simulationDetailsFailed": {
+    "message": "There was an error loading your estimation."
+  },
+  "simulationDetailsFiatNotAvailable": {
+    "message": "Not Available"
+  },
+  "simulationDetailsIncomingHeading": {
+    "message": "You receive"
+  },
+  "simulationDetailsNoBalanceChanges": {
+    "message": "No changes predicted for your wallet"
+  },
+  "simulationDetailsOutgoingHeading": {
+    "message": "You send"
+  },
+  "simulationDetailsTitle": {
+    "message": "Estimated changes"
+  },
+  "simulationDetailsTitleTooltip": {
+    "message": "Estimated changes are what might happen if you go through with this transaction. This is just a prediction, not a guarantee."
+  },
+  "simulationDetailsTotalFiat": {
+    "message": "Total = $1",
+    "description": "$1 is the total amount in fiat currency on one side of the transaction"
+  },
+  "simulationDetailsTransactionReverted": {
+    "message": "This transaction is likely to fail"
+  },
+  "simulationErrorMessageV2": {
+    "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. $1"
+  },
+  "simulationsSettingSubHeader": {
+    "message": "Estimate balance changes"
+  },
+  "siweIssued": {
+    "message": "Issued"
+  },
+  "siweNetwork": {
+    "message": "Network"
+  },
+  "siweRequestId": {
+    "message": "Request ID"
+  },
+  "siweResources": {
+    "message": "Resources"
+  },
+  "siweSignatureSimulationDetailInfo": {
+    "message": "You’re signing into a site and there are no predicted changes to your account."
+  },
+  "siweURI": {
+    "message": "URL"
+  },
+  "skip": {
+    "message": "Skip"
+  },
+  "skipAccountSecurity": {
+    "message": "Skip account security?"
+  },
+  "skipAccountSecurityDetails": {
+    "message": "I understand that until I back up my Secret Recovery Phrase, I may lose my accounts and all of their assets."
+  },
+  "smartContracts": {
+    "message": "Smart contracts"
+  },
+  "smartSwapsErrorNotEnoughFunds": {
+    "message": "Not enough funds for a smart swap."
+  },
+  "smartSwapsErrorUnavailable": {
+    "message": "Smart Swaps are temporarily unavailable."
+  },
+  "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": "99.5% success rate"
+  },
+  "smartTransactionsBenefit2": {
+    "message": "Saves you money"
+  },
+  "smartTransactionsBenefit3": {
+    "message": "Real-time updates"
+  },
+  "smartTransactionsDescription": {
+    "message": "Unlock higher success rates, frontrunning protection, and better visibility with Smart Transactions."
+  },
+  "smartTransactionsDescription2": {
+    "message": "Only available on Ethereum. Enable or disable any time in settings. $1",
+    "description": "$1 is an external link to learn more about Smart Transactions"
+  },
+  "smartTransactionsOptItModalTitle": {
+    "message": "Enhanced Transaction Protection"
+  },
+  "snapAccountCreated": {
+    "message": "Account created"
+  },
+  "snapAccountCreatedDescription": {
+    "message": "Your new account is ready to use!"
+  },
+  "snapAccountCreationFailed": {
+    "message": "Account creation failed"
+  },
+  "snapAccountCreationFailedDescription": {
+    "message": "$1 didn't manage to create an account for you.",
+    "description": "$1 is the snap name"
+  },
+  "snapAccountRedirectFinishSigningTitle": {
+    "message": "Finish signing"
+  },
+  "snapAccountRedirectSiteDescription": {
+    "message": "Follow the instructions from $1"
+  },
+  "snapAccountRemovalFailed": {
+    "message": "Account removal failed"
+  },
+  "snapAccountRemovalFailedDescription": {
+    "message": "$1 didn't manage to remove this account for you.",
+    "description": "$1 is the snap name"
+  },
+  "snapAccountRemoved": {
+    "message": "Account removed"
+  },
+  "snapAccountRemovedDescription": {
+    "message": "This account will no longer be available to use in MetaMask."
+  },
+  "snapAccounts": {
+    "message": "Account Snaps"
+  },
+  "snapAccountsDescription": {
+    "message": "Accounts controlled by third-party Snaps."
+  },
+  "snapConnectTo": {
+    "message": "Connect to $1",
+    "description": "$1 is the website URL or a Snap name. Used for Snaps pre-approved connections."
+  },
+  "snapConnectionPermissionDescription": {
+    "message": "Let $1 automatically connect to $2 without your approval.",
+    "description": "Used for Snap pre-approved connections. $1 is the Snap name, $2 is a website URL."
+  },
+  "snapConnectionWarning": {
+    "message": "$1 wants to use $2",
+    "description": "$2 is the snap and $1 is the dapp requesting connection to the snap."
+  },
+  "snapContent": {
+    "message": "This content is coming from $1",
+    "description": "This is shown when a snap shows transaction insight information in the confirmation UI. $1 is a link to the snap's settings page with the link text being the name of the snap."
+  },
+  "snapDetailWebsite": {
+    "message": "Website"
+  },
+  "snapHomeMenu": {
+    "message": "Snap Home Menu"
+  },
+  "snapInstallRequest": {
+    "message": "Installing $1 gives it the following permissions.",
+    "description": "$1 is the snap name."
+  },
+  "snapInstallSuccess": {
+    "message": "Installation complete"
+  },
+  "snapInstallWarningCheck": {
+    "message": "$1 wants permission to do the following:",
+    "description": "Warning message used in popup displayed on snap install. $1 is the snap name."
+  },
+  "snapInstallWarningHeading": {
+    "message": "Proceed with caution"
+  },
+  "snapInstallWarningPermissionDescriptionForBip32View": {
+    "message": "Allow $1 to view your public keys (and addresses). This does not grant any control of accounts or assets.",
+    "description": "An extended description for the `snap_getBip32PublicKey` permission used for tooltip on Snap Install Warning screen (popup/modal). $1 is the snap name."
+  },
+  "snapInstallWarningPermissionDescriptionForEntropy": {
+    "message": "Allow $1 Snap to manage accounts and assets on the requested network(s). These accounts are derived and backed up using your secret recovery phrase (without revealing it). With the power to derive keys, $1 can support a variety of blockchain protocols beyond Ethereum (EVMs).",
+    "description": "An extended description for the `snap_getBip44Entropy` and `snap_getBip44Entropy` permissions used for tooltip on Snap Install Warning screen (popup/modal). $1 is the snap name."
+  },
+  "snapInstallWarningPermissionNameForEntropy": {
+    "message": "Manage $1 accounts",
+    "description": "Permission name used for the Permission Cell component displayed on warning popup when installing a Snap. $1 is list of account types."
+  },
+  "snapInstallWarningPermissionNameForViewPublicKey": {
+    "message": "View your public key for $1",
+    "description": "Permission name used for the Permission Cell component displayed on warning popup when installing a Snap. $1 is list of account types."
+  },
+  "snapInstallationErrorDescription": {
+    "message": "$1 couldn’t be installed.",
+    "description": "Error description used when snap installation fails. $1 is the snap name."
+  },
+  "snapInstallationErrorTitle": {
+    "message": "Installation failed",
+    "description": "Error title used when snap installation fails."
+  },
+  "snapResultError": {
+    "message": "Error"
+  },
+  "snapResultSuccess": {
+    "message": "Success"
+  },
+  "snapResultSuccessDescription": {
+    "message": "$1 is ready to use"
+  },
+  "snapUpdateAlertDescription": {
+    "message": "Get the latest version of $1",
+    "description": "Description used in Snap update alert banner when snap update is available. $1 is the Snap name."
+  },
+  "snapUpdateAvailable": {
+    "message": "Update available"
+  },
+  "snapUpdateErrorDescription": {
+    "message": "$1 couldn’t be updated.",
+    "description": "Error description used when snap update fails. $1 is the snap name."
+  },
+  "snapUpdateErrorTitle": {
+    "message": "Update failed",
+    "description": "Error title used when snap update fails."
+  },
+  "snapUpdateRequest": {
+    "message": "Updating $1 gives it the following permissions.",
+    "description": "$1 is the Snap name."
+  },
+  "snapUpdateSuccess": {
+    "message": "Update complete"
+  },
+  "snapUrlIsBlocked": {
+    "message": "This Snap wants to take you to a blocked site. $1."
+  },
+  "snaps": {
+    "message": "Snaps"
+  },
+  "snapsConnected": {
+    "message": "Snaps connected"
+  },
+  "snapsNoInsight": {
+    "message": "The snap didn't return any insight"
+  },
+  "snapsPrivacyWarningFirstMessage": {
+    "message": "You acknowledge that any Snap that you install is a Third Party Service, unless otherwise identified, as defined in the Consensys $1. Your use of Third Party Services is governed by separate terms and conditions set forth by the Third Party Service provider. Consensys does not recommend the use of any Snap by any particular person for any particular reason. You access, rely upon or use the Third Party Service at your own risk. Consensys disclaims all responsibility and liability for any losses on account of your use of Third Party Services.",
+    "description": "First part of a message in popup modal displayed when installing a snap for the first time. $1 is terms of use link."
+  },
+  "snapsPrivacyWarningSecondMessage": {
+    "message": "Any information you share with Third Party Services will be collected directly by those Third Party Services in accordance with their privacy policies. Please refer to their privacy policies for more information.",
+    "description": "Second part of a message in popup modal displayed when installing a snap for the first time."
+  },
+  "snapsPrivacyWarningThirdMessage": {
+    "message": "Consensys has no access to information you share with Third Party Services.",
+    "description": "Third part of a message in popup modal displayed when installing a snap for the first time."
+  },
+  "snapsSettings": {
+    "message": "Snap settings"
+  },
+  "snapsTermsOfUse": {
+    "message": "Terms of Use"
+  },
+  "snapsToggle": {
+    "message": "A snap will only run if it is enabled"
+  },
+  "snapsUIError": {
+    "message": "Contact the creators of $1 for further support.",
+    "description": "This is shown when the insight snap throws an error. $1 is the snap name"
+  },
+  "someNetworksMayPoseSecurity": {
+    "message": "Some networks may pose security and/or privacy risks. Understand the risks before adding & using a network."
+  },
+  "somethingDoesntLookRight": {
+    "message": "Something doesn't look right? $1",
+    "description": "A false positive message for users to contact support. $1 is a link to the support page."
+  },
+  "somethingIsWrong": {
+    "message": "Something's gone wrong. Try reloading the page."
+  },
+  "somethingWentWrong": {
+    "message": "Oops! Something went wrong."
+  },
+  "source": {
+    "message": "Source"
+  },
+  "speed": {
+    "message": "Speed"
+  },
+  "speedUp": {
+    "message": "Speed up"
+  },
+  "speedUpCancellation": {
+    "message": "Speed up this cancellation"
+  },
+  "speedUpExplanation": {
+    "message": "We’ve updated the gas fee based on current network conditions and have increased it by at least 10% (required by the network)."
+  },
+  "speedUpPopoverTitle": {
+    "message": "Speed up transaction"
+  },
+  "speedUpTooltipText": {
+    "message": "New gas fee"
+  },
+  "speedUpTransaction": {
+    "message": "Speed up this transaction"
+  },
+  "spendLimitInsufficient": {
+    "message": "Spend limit insufficient"
+  },
+  "spendLimitInvalid": {
+    "message": "Spend limit invalid; must be a positive number"
+  },
+  "spendLimitPermission": {
+    "message": "Spend limit permission"
+  },
+  "spendLimitRequestedBy": {
+    "message": "Spend limit requested by $1",
+    "description": "Origin of the site requesting the spend limit"
+  },
+  "spendLimitTooLarge": {
+    "message": "Spend limit too large"
+  },
+  "spender": {
+    "message": "Spender"
+  },
+  "spendingCap": {
+    "message": "Spending cap"
+  },
+  "spendingCapError": {
+    "message": "Error: Enter numbers only"
+  },
+  "spendingCapErrorDescription": {
+    "message": "Only enter a number that you're comfortable with $1 accessing now or in the future. You can always increase the token limit later.",
+    "description": "$1 is origin of the site requesting the token limit"
+  },
+  "spendingCapRequest": {
+    "message": "Spending cap request for your $1"
+  },
+  "srpInputNumberOfWords": {
+    "message": "I have a $1-word phrase",
+    "description": "This is the text for each option in the dropdown where a user selects how many words their secret recovery phrase has during import. The $1 is the number of words (either 12, 15, 18, 21, or 24)."
+  },
+  "srpPasteFailedTooManyWords": {
+    "message": "Paste failed because it contained over 24 words. A secret recovery phrase can have a maximum of 24 words.",
+    "description": "Description of SRP paste error when the pasted content has too many words"
+  },
+  "srpPasteTip": {
+    "message": "You can paste your entire secret recovery phrase into any field",
+    "description": "Our secret recovery phrase input is split into one field per word. This message explains to users that they can paste their entire secrete recovery phrase into any field, and we will handle it correctly."
+  },
+  "srpSecurityQuizGetStarted": {
+    "message": "Get started"
+  },
+  "srpSecurityQuizImgAlt": {
+    "message": "An eye with a keyhole in the center, and three floating password fields"
+  },
+  "srpSecurityQuizIntroduction": {
+    "message": "To reveal your Secret Recovery Phrase, you need to correctly answer two questions"
+  },
+  "srpSecurityQuizQuestionOneQuestion": {
+    "message": "If you lose your Secret Recovery Phrase, MetaMask..."
+  },
+  "srpSecurityQuizQuestionOneRightAnswer": {
+    "message": "Can’t help you"
+  },
+  "srpSecurityQuizQuestionOneRightAnswerDescription": {
+    "message": "Write it down, engrave it on metal, or keep it in multiple secret spots so you never lose it. If you lose it, it’s gone forever."
+  },
+  "srpSecurityQuizQuestionOneRightAnswerTitle": {
+    "message": "Right! No one can help get your Secret Recovery Phrase back"
+  },
+  "srpSecurityQuizQuestionOneWrongAnswer": {
+    "message": "Can get it back for you"
+  },
+  "srpSecurityQuizQuestionOneWrongAnswerDescription": {
+    "message": "If you lose your Secret Recovery Phrase, it’s gone forever. No one can help you get it back, no matter what they might say."
+  },
+  "srpSecurityQuizQuestionOneWrongAnswerTitle": {
+    "message": "Wrong! No one can help get your Secret Recovery Phrase back"
+  },
+  "srpSecurityQuizQuestionTwoQuestion": {
+    "message": "If anyone, even a support agent, asks for your Secret Recovery Phrase..."
+  },
+  "srpSecurityQuizQuestionTwoRightAnswer": {
+    "message": "You’re being scammed"
+  },
+  "srpSecurityQuizQuestionTwoRightAnswerDescription": {
+    "message": "Anyone claiming to need your Secret Recovery Phrase is lying to you. If you share it with them, they will steal your assets."
+  },
+  "srpSecurityQuizQuestionTwoRightAnswerTitle": {
+    "message": "Correct! Sharing your Secret Recovery Phrase is never a good idea"
+  },
+  "srpSecurityQuizQuestionTwoWrongAnswer": {
+    "message": "You should give it to them"
+  },
+  "srpSecurityQuizQuestionTwoWrongAnswerDescription": {
+    "message": "Anyone claiming to need your Secret Recovery Phrase is lying to you. If you share it with them, they will steal your assets."
+  },
+  "srpSecurityQuizQuestionTwoWrongAnswerTitle": {
+    "message": "Nope! Never share your Secret Recovery Phrase with anyone, ever"
+  },
+  "srpSecurityQuizTitle": {
+    "message": "Security quiz"
+  },
+  "srpToggleShow": {
+    "message": "Show/Hide this word of the secret recovery phrase",
+    "description": "Describes a toggle that is used to show or hide a single word of the secret recovery phrase"
+  },
+  "srpWordHidden": {
+    "message": "This word is hidden",
+    "description": "Explains that a word in the secret recovery phrase is hidden"
+  },
+  "srpWordShown": {
+    "message": "This word is being shown",
+    "description": "Explains that a word in the secret recovery phrase is being shown"
+  },
+  "stable": {
+    "message": "Stable"
+  },
+  "stableLowercase": {
+    "message": "stable"
+  },
+  "stake": {
+    "message": "Stake"
+  },
+  "startYourJourney": {
+    "message": "Start your journey with $1",
+    "description": "$1 is the token symbol"
+  },
+  "startYourJourneyDescription": {
+    "message": "Get started with web3 by adding some $1 to your wallet.",
+    "description": "$1 is the token symbol"
+  },
+  "stateLogError": {
+    "message": "Error in retrieving state logs."
+  },
+  "stateLogFileName": {
+    "message": "MetaMask state logs"
+  },
+  "stateLogs": {
+    "message": "State logs"
+  },
+  "stateLogsDescription": {
+    "message": "State logs contain your public account addresses and sent transactions."
+  },
+  "states": {
+    "message": "States"
+  },
+  "status": {
+    "message": "Status"
+  },
+  "statusNotConnected": {
+    "message": "Not connected"
+  },
+  "statusNotConnectedAccount": {
+    "message": "No accounts connected"
+  },
+  "step1LatticeWallet": {
+    "message": "Connect your Lattice1"
+  },
+  "step1LatticeWalletMsg": {
+    "message": "You can connect MetaMask to your Lattice1 device once it is set up and online. Unlock your device and have your Device ID ready.",
+    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
+  },
+  "step1LedgerWallet": {
+    "message": "Download Ledger app"
+  },
+  "step1LedgerWalletMsg": {
+    "message": "Download, set up, and enter your password to unlock $1.",
+    "description": "$1 represents the `ledgerLiveApp` localization value"
+  },
+  "step1TrezorWallet": {
+    "message": "Connect your Trezor"
+  },
+  "step1TrezorWalletMsg": {
+    "message": "Plug your Trezor directly into your computer and unlock it. Make sure you use the correct passphrase.",
+    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
+  },
+  "step2LedgerWallet": {
+    "message": "Connect your Ledger"
+  },
+  "step2LedgerWalletMsg": {
+    "message": "Plug your Ledger directly into your computer, then  unlock it and open the Ethereum app.",
+    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
+  },
+  "stillGettingMessage": {
+    "message": "Still getting this message?"
+  },
+  "strong": {
+    "message": "Strong"
+  },
+  "stxCancelled": {
+    "message": "Swap would have failed"
+  },
+  "stxCancelledDescription": {
+    "message": "Your transaction would have failed and was cancelled to protect you from paying unnecessary gas fees."
+  },
+  "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"
+  },
+  "stxFailureDescription": {
+    "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 on Ethereum Mainnet. $1"
+  },
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Privately submitting your Swap..."
+  },
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Publicly submitting your Swap..."
+  },
+  "stxSuccess": {
+    "message": "Swap complete!"
+  },
+  "stxSuccessDescription": {
+    "message": "Your $1 is now available.",
+    "description": "$1 is a token symbol, e.g. ETH"
+  },
+  "stxSwapCompleteIn": {
+    "message": "Swap will complete in <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
+  "stxTryingToCancel": {
+    "message": "Trying to cancel your transaction..."
+  },
+  "stxUnknown": {
+    "message": "Status unknown"
+  },
+  "stxUnknownDescription": {
+    "message": "A transaction has been successful but we’re unsure what it is. This may be due to submitting another transaction while this swap was processing."
+  },
+  "stxUserCancelled": {
+    "message": "Swap cancelled"
+  },
+  "stxUserCancelledDescription": {
+    "message": "Your transaction has been cancelled and you did not pay any unnecessary gas fees."
+  },
+  "submit": {
+    "message": "Submit"
+  },
+  "submitted": {
+    "message": "Submitted"
+  },
+  "suggestedBySnap": {
+    "message": "Suggested by $1",
+    "description": "$1 is the snap name"
+  },
+  "suggestedTokenName": {
+    "message": "Suggested name:"
+  },
+  "suggestedTokenSymbol": {
+    "message": "Suggested ticker symbol:"
+  },
+  "support": {
+    "message": "Support"
+  },
+  "supportCenter": {
+    "message": "Visit our support center"
+  },
+  "surveyConversion": {
+    "message": "Take our survey"
+  },
+  "surveyTitle": {
+    "message": "Shape the future of MetaMask"
+  },
+  "swap": {
+    "message": "Swap"
+  },
+  "swapAdjustSlippage": {
+    "message": "Adjust slippage"
+  },
+  "swapAggregator": {
+    "message": "Aggregator"
+  },
+  "swapAllowSwappingOf": {
+    "message": "Allow swapping of $1",
+    "description": "Shows a user that they need to allow a token for swapping on their hardware wallet"
+  },
+  "swapAmountReceived": {
+    "message": "Guaranteed amount"
+  },
+  "swapAmountReceivedInfo": {
+    "message": "This is the minimum amount you will receive. You may receive more depending on slippage."
+  },
+  "swapAndSend": {
+    "message": "Swap & Send"
+  },
+  "swapAnyway": {
+    "message": "Swap anyway"
+  },
+  "swapApproval": {
+    "message": "Approve $1 for swaps",
+    "description": "Used in the transaction display list to describe a transaction that is an approve call on a token that is to be swapped.. $1 is the symbol of a token that has been approved."
+  },
+  "swapApproveNeedMoreTokens": {
+    "message": "You need $1 more $2 to complete this swap",
+    "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
+  },
+  "swapAreYouStillThere": {
+    "message": "Are you still there?"
+  },
+  "swapAreYouStillThereDescription": {
+    "message": "We’re ready to show you the latest quotes when you want to continue"
+  },
+  "swapBuildQuotePlaceHolderText": {
+    "message": "No tokens available matching $1",
+    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
+  },
+  "swapConfirmWithHwWallet": {
+    "message": "Confirm with your hardware wallet"
+  },
+  "swapContinueSwapping": {
+    "message": "Continue swapping"
+  },
+  "swapContractDataDisabledErrorDescription": {
+    "message": "In the Ethereum app on your Ledger, go to \"Settings\" and allow contract data. Then, try your swap again."
+  },
+  "swapContractDataDisabledErrorTitle": {
+    "message": "Contract data is not enabled on your Ledger"
+  },
+  "swapCustom": {
+    "message": "custom"
+  },
+  "swapDecentralizedExchange": {
+    "message": "Decentralized exchange"
+  },
+  "swapDirectContract": {
+    "message": "Direct contract"
+  },
+  "swapEditLimit": {
+    "message": "Edit limit"
+  },
+  "swapEnableDescription": {
+    "message": "This is required and gives MetaMask permission to swap your $1.",
+    "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
+  },
+  "swapEnableTokenForSwapping": {
+    "message": "This will $1 for swapping",
+    "description": "$1 is for the 'enableToken' key, e.g. 'enable ETH'"
+  },
+  "swapEnterAmount": {
+    "message": "Enter an amount"
+  },
+  "swapEstimatedNetworkFees": {
+    "message": "Estimated network fees"
+  },
+  "swapEstimatedNetworkFeesInfo": {
+    "message": "This is an estimate of the network fee that will be used to complete your swap. The actual amount may change according to network conditions."
+  },
+  "swapFailedErrorDescriptionWithSupportLink": {
+    "message": "Transaction failures happen and we are here to help. If this issue persists, you can reach our customer support at $1 for further assistance.",
+    "description": "This message is shown to a user if their swap fails. The $1 will be replaced by support.metamask.io"
+  },
+  "swapFailedErrorTitle": {
+    "message": "Swap failed"
+  },
+  "swapFetchingQuote": {
+    "message": "Fetching quote"
+  },
+  "swapFetchingQuoteNofN": {
+    "message": "Fetching quote $1 of $2",
+    "description": "A count of possible quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of resources that we check for quotes. Keep in mind that not all resources will have a quote for a particular swap."
+  },
+  "swapFetchingQuotes": {
+    "message": "Fetching quotes..."
+  },
+  "swapFetchingQuotesErrorDescription": {
+    "message": "Hmmm... something went wrong. Try again, or if errors persist, contact customer support."
+  },
+  "swapFetchingQuotesErrorTitle": {
+    "message": "Error fetching quotes"
+  },
+  "swapFetchingTokens": {
+    "message": "Fetching tokens..."
+  },
+  "swapFromTo": {
+    "message": "The swap of $1 to $2",
+    "description": "Tells a user that they need to confirm on their hardware wallet a swap of 2 tokens. $1 is a source token and $2 is a destination token"
+  },
+  "swapGasFeesDetails": {
+    "message": "Gas fees are estimated and will fluctuate based on network traffic and transaction complexity."
+  },
+  "swapGasFeesLearnMore": {
+    "message": "Learn more about gas fees"
+  },
+  "swapGasFeesSplit": {
+    "message": "Gas fees on the previous screen are split between these two transactions."
+  },
+  "swapGasFeesSummary": {
+    "message": "Gas fees are paid to crypto miners who process transactions on the $1 network. MetaMask does not profit from gas fees.",
+    "description": "$1 is the selected network, e.g. Ethereum or BSC"
+  },
+  "swapHighSlippage": {
+    "message": "High slippage"
+  },
+  "swapHighSlippageWarning": {
+    "message": "Slippage amount is very high."
+  },
+  "swapIncludesMMFee": {
+    "message": "Includes a $1% MetaMask fee.",
+    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
+  },
+  "swapIncludesMMFeeAlt": {
+    "message": "Quote reflects $1% MetaMask fee",
+    "description": "Provides information about the fee that metamask takes for swaps using the latest copy. $1 is a decimal number."
+  },
+  "swapIncludesMetaMaskFeeViewAllQuotes": {
+    "message": "Includes a $1% MetaMask fee – $2",
+    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number and $2 is a link to view all quotes."
+  },
+  "swapLearnMore": {
+    "message": "Learn more about Swaps"
+  },
+  "swapLiquiditySourceInfo": {
+    "message": "We search multiple liquidity sources (exchanges, aggregators and professional market makers) to compare exchange rates and network fees."
+  },
+  "swapLowSlippage": {
+    "message": "Low slippage"
+  },
+  "swapLowSlippageError": {
+    "message": "Transaction may fail, max slippage too low."
+  },
+  "swapMaxSlippage": {
+    "message": "Max slippage"
+  },
+  "swapMetaMaskFee": {
+    "message": "MetaMask fee"
+  },
+  "swapMetaMaskFeeDescription": {
+    "message": "The fee of $1% is automatically factored into this quote. You pay it in exchange for a license to use MetaMask's liquidity provider information aggregation software.",
+    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
+  },
+  "swapNQuotesWithDot": {
+    "message": "$1 quotes.",
+    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
+  },
+  "swapNewQuoteIn": {
+    "message": "New quotes in $1",
+    "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
+  },
+  "swapNoTokensAvailable": {
+    "message": "No tokens available matching $1",
+    "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text"
+  },
+  "swapOnceTransactionHasProcess": {
+    "message": "Your $1 will be added to your account once this transaction has processed.",
+    "description": "This message communicates the token that is being transferred. It is shown on the awaiting swap screen. The $1 will be a token symbol."
+  },
+  "swapPriceDifference": {
+    "message": "You are about to swap $1 $2 (~$3) for $4 $5 (~$6).",
+    "description": "This message represents the price slippage for the swap.  $1 and $4 are a number (ex: 2.89), $2 and $5 are symbols (ex: ETH), and $3 and $6 are fiat currency amounts."
+  },
+  "swapPriceDifferenceTitle": {
+    "message": "Price difference of ~$1%",
+    "description": "$1 is a number (ex: 1.23) that represents the price difference."
+  },
+  "swapPriceImpactTooltip": {
+    "message": "Price impact is the difference between the current market price and the amount received during transaction execution. Price impact is a function of the size of your trade relative to the size of the liquidity pool."
+  },
+  "swapPriceUnavailableDescription": {
+    "message": "Price impact could not be determined due to lack of market price data. Please confirm that you are comfortable with the amount of tokens you are about to receive before swapping."
+  },
+  "swapPriceUnavailableTitle": {
+    "message": "Check your rate before proceeding"
+  },
+  "swapProcessing": {
+    "message": "Processing"
+  },
+  "swapQuoteDetails": {
+    "message": "Quote details"
+  },
+  "swapQuoteNofM": {
+    "message": "$1 of $2",
+    "description": "A count of possible quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of resources that we check for quotes. Keep in mind that not all resources will have a quote for a particular swap."
+  },
+  "swapQuoteSource": {
+    "message": "Quote source"
+  },
+  "swapQuotesExpiredErrorDescription": {
+    "message": "Please request new quotes to get the latest rates."
+  },
+  "swapQuotesExpiredErrorTitle": {
+    "message": "Quotes timeout"
+  },
+  "swapQuotesNotAvailableDescription": {
+    "message": "Reduce the size of your trade or use a different token."
+  },
+  "swapQuotesNotAvailableErrorDescription": {
+    "message": "Try adjusting the amount or slippage settings and try again."
+  },
+  "swapQuotesNotAvailableErrorTitle": {
+    "message": "No quotes available"
+  },
+  "swapRate": {
+    "message": "Rate"
+  },
+  "swapReceiving": {
+    "message": "Receiving"
+  },
+  "swapReceivingInfoTooltip": {
+    "message": "This is an estimate. The exact amount depends on slippage."
+  },
+  "swapRequestForQuotation": {
+    "message": "Request for quotation"
+  },
+  "swapReviewSwap": {
+    "message": "Review swap"
+  },
+  "swapSearchNameOrAddress": {
+    "message": "Search name or paste address"
+  },
+  "swapSelect": {
+    "message": "Select"
+  },
+  "swapSelectAQuote": {
+    "message": "Select a quote"
+  },
+  "swapSelectAToken": {
+    "message": "Select token"
+  },
+  "swapSelectQuotePopoverDescription": {
+    "message": "Below are all the quotes gathered from multiple liquidity sources."
+  },
+  "swapSelectToken": {
+    "message": "Select token"
+  },
+  "swapShowLatestQuotes": {
+    "message": "Show latest quotes"
+  },
+  "swapSlippageHighDescription": {
+    "message": "The slippage entered ($1%) is considered very high and may result in a bad rate",
+    "description": "$1 is the amount of % for slippage"
+  },
+  "swapSlippageHighTitle": {
+    "message": "High slippage"
+  },
+  "swapSlippageLowDescription": {
+    "message": "A value this low ($1%) may result in a failed swap",
+    "description": "$1 is the amount of % for slippage"
+  },
+  "swapSlippageLowTitle": {
+    "message": "Low slippage"
+  },
+  "swapSlippageNegative": {
+    "message": "Slippage must be greater or equal to zero"
+  },
+  "swapSlippageNegativeDescription": {
+    "message": "Slippage must be greater or equal to zero"
+  },
+  "swapSlippageNegativeTitle": {
+    "message": "Increase slippage to continue"
+  },
+  "swapSlippageOverLimitDescription": {
+    "message": "Slippage tolerance must be 15% or less. Anything higher will result in a bad rate."
+  },
+  "swapSlippageOverLimitTitle": {
+    "message": "Very high slippage"
+  },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
+  "swapSlippageTooltip": {
+    "message": "If the price changes between the time your order is placed and confirmed it’s called “slippage”. Your swap will automatically cancel if slippage exceeds your “slippage tolerance” setting."
+  },
+  "swapSlippageZeroDescription": {
+    "message": "There are fewer zero-slippage quote providers which will result in a less competitive quote."
+  },
+  "swapSlippageZeroTitle": {
+    "message": "Sourcing zero-slippage providers"
+  },
+  "swapSource": {
+    "message": "Liquidity source"
+  },
+  "swapSuggested": {
+    "message": "Swap suggested"
+  },
+  "swapSuggestedGasSettingToolTipMessage": {
+    "message": "Swaps are complex and time sensitive transactions. We recommend this gas fee for a good balance between cost and confidence of a successful Swap."
+  },
+  "swapSwapFrom": {
+    "message": "Swap from"
+  },
+  "swapSwapSwitch": {
+    "message": "Switch token order"
+  },
+  "swapSwapTo": {
+    "message": "Swap to"
+  },
+  "swapToConfirmWithHwWallet": {
+    "message": "to confirm with your hardware wallet"
+  },
+  "swapTokenAddedManuallyDescription": {
+    "message": "Verify this token on $1 and make sure it is the token you want to trade.",
+    "description": "$1 points the user to etherscan as a place they can verify information about a token. $1 is replaced with the translation for \"etherscan\""
+  },
+  "swapTokenAddedManuallyTitle": {
+    "message": "Token added manually"
+  },
+  "swapTokenAvailable": {
+    "message": "Your $1 has been added to your account.",
+    "description": "This message is shown after a swap is successful and communicates the exact amount of tokens the user has received for a swap. The $1 is a decimal number of tokens followed by the token symbol."
+  },
+  "swapTokenBalanceUnavailable": {
+    "message": "We were unable to retrieve your $1 balance",
+    "description": "This message communicates to the user that their balance of a given token is currently unavailable. $1 will be replaced by a token symbol"
+  },
+  "swapTokenNotAvailable": {
+    "message": "Token is not available to swap in this region"
+  },
+  "swapTokenToToken": {
+    "message": "Swap $1 to $2",
+    "description": "Used in the transaction display list to describe a swap. $1 and $2 are the symbols of tokens in involved in a swap."
+  },
+  "swapTokenVerificationAddedManually": {
+    "message": "This token has been added manually."
+  },
+  "swapTokenVerificationMessage": {
+    "message": "Always confirm the token address on $1.",
+    "description": "Points the user to Etherscan as a place they can verify information about a token. $1 is replaced with the translation for \"Etherscan\" followed by an info icon that shows more info on hover."
+  },
+  "swapTokenVerificationOnlyOneSource": {
+    "message": "Only verified on 1 source."
+  },
+  "swapTokenVerificationSources": {
+    "message": "Verified on $1 sources.",
+    "description": "Indicates the number of token information sources that recognize the symbol + address. $1 is a decimal number."
+  },
+  "swapTokenVerifiedOn1SourceDescription": {
+    "message": "$1 is only verified on 1 source. Consider verifying it on $2 before proceeding.",
+    "description": "$1 is a token name, $2 points the user to etherscan as a place they can verify information about a token. $1 is replaced with the translation for \"etherscan\""
+  },
+  "swapTokenVerifiedOn1SourceTitle": {
+    "message": "Potentially inauthentic token"
+  },
+  "swapTooManyDecimalsError": {
+    "message": "$1 allows up to $2 decimals",
+    "description": "$1 is a token symbol and $2 is the max. number of decimals allowed for the token"
+  },
+  "swapTransactionComplete": {
+    "message": "Transaction complete"
+  },
+  "swapTwoTransactions": {
+    "message": "2 transactions"
+  },
+  "swapUnknown": {
+    "message": "Unknown"
+  },
+  "swapVerifyTokenExplanation": {
+    "message": "Multiple tokens can use the same name and symbol. Check $1 to verify this is the token you're looking for.",
+    "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
+  },
+  "swapYourTokenBalance": {
+    "message": "$1 $2 available to swap",
+    "description": "Tells the user how much of a token they have in their balance. $1 is a decimal number amount of tokens, and $2 is a token symbol"
+  },
+  "swapZeroSlippage": {
+    "message": "0% Slippage"
+  },
+  "swapsAdvancedOptions": {
+    "message": "Advanced options"
+  },
+  "swapsExcessiveSlippageWarning": {
+    "message": "Slippage amount is too high and will result in a bad rate. Please reduce your slippage tolerance to a value below 15%."
+  },
+  "swapsMaxSlippage": {
+    "message": "Slippage tolerance"
+  },
+  "swapsNotEnoughForTx": {
+    "message": "Not enough $1 to complete this transaction",
+    "description": "Tells the user that they don't have enough of a token for a proposed swap. $1 is a token symbol"
+  },
+  "swapsNotEnoughToken": {
+    "message": "Not enough $1",
+    "description": "Tells the user that they don't have enough of a token for a proposed swap. $1 is a token symbol"
+  },
+  "swapsViewInActivity": {
+    "message": "View in activity"
+  },
+  "switch": {
+    "message": "Switch"
+  },
+  "switchEthereumChainConfirmationDescription": {
+    "message": "This will switch the selected network within MetaMask to a previously added network:"
+  },
+  "switchEthereumChainConfirmationTitle": {
+    "message": "Allow this site to switch the network?"
+  },
+  "switchInputCurrency": {
+    "message": "Switch input currency"
+  },
+  "switchNetwork": {
+    "message": "Switch network"
+  },
+  "switchNetworks": {
+    "message": "Switch networks"
+  },
+  "switchToNetwork": {
+    "message": "Switch to $1",
+    "description": "$1 represents the custom network that has previously been added"
+  },
+  "switchToThisAccount": {
+    "message": "Switch to this account"
+  },
+  "switchedNetworkToastDecline": {
+    "message": "Don't show again"
+  },
+  "switchedNetworkToastMessage": {
+    "message": "$1 is now active on $2",
+    "description": "$1 represents the account name, $2 represents the network name"
+  },
+  "switchedTo": {
+    "message": "You're now using"
+  },
+  "switchingNetworksCancelsPendingConfirmations": {
+    "message": "Switching networks will cancel all pending confirmations"
+  },
+  "symbol": {
+    "message": "Symbol"
+  },
+  "symbolBetweenZeroTwelve": {
+    "message": "Symbol must be 11 characters or fewer."
+  },
+  "tenPercentIncreased": {
+    "message": "10% increase"
+  },
+  "terms": {
+    "message": "Terms of use"
+  },
+  "termsOfService": {
+    "message": "Terms of service"
+  },
+  "termsOfUseAgreeText": {
+    "message": " I agree to the Terms of Use, which apply to my use of MetaMask and all of its features"
+  },
+  "termsOfUseFooterText": {
+    "message": "Please scroll to read all sections"
+  },
+  "termsOfUseTitle": {
+    "message": "Our Terms of Use have updated"
+  },
+  "testNetworks": {
+    "message": "Test networks"
+  },
+  "theme": {
+    "message": "Theme"
+  },
+  "themeDescription": {
+    "message": "Choose your preferred MetaMask theme."
+  },
+  "thingsToKeep": {
+    "message": "Keep in mind:"
+  },
+  "thirdPartySoftware": {
+    "message": "Third-party software notice",
+    "description": "Title of a popup modal displayed when installing a snap for the first time."
+  },
+  "thisCollection": {
+    "message": "this collection"
+  },
+  "threeMonthsAbbreviation": {
+    "message": "3M",
+    "description": "Shortened form of '3 months'"
+  },
+  "time": {
+    "message": "Time"
+  },
+  "tips": {
+    "message": "Tips"
+  },
+  "to": {
+    "message": "To"
+  },
+  "toAddress": {
+    "message": "To: $1",
+    "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
+  },
+  "toggleEthSignBannerDescription": {
+    "message": "You’re at risk for phishing attacks. Protect yourself by turning off eth_sign."
+  },
+  "toggleEthSignDescriptionField": {
+    "message": "If you enable this setting, you might get signature requests that aren’t readable. By signing a message you don't understand, you could be agreeing to give away your funds and NFTs."
+  },
+  "toggleEthSignField": {
+    "message": "Eth_sign requests"
+  },
+  "toggleEthSignModalBannerBoldText": {
+    "message": " you might be getting scammed"
+  },
+  "toggleEthSignModalBannerText": {
+    "message": "If you've been asked to turn this setting on,"
+  },
+  "toggleEthSignModalCheckBox": {
+    "message": "I understand that I can lose all of my funds and NFTs if I enable eth_sign requests. "
+  },
+  "toggleEthSignModalDescription": {
+    "message": "Allowing eth_sign requests can make you vulnerable to phishing attacks. Always review the URL and be careful when signing  messages that contain code."
+  },
+  "toggleEthSignModalFormError": {
+    "message": "The text is incorrect"
+  },
+  "toggleEthSignModalFormLabel": {
+    "message": "Enter “I only sign what I understand” to continue"
+  },
+  "toggleEthSignModalFormValidation": {
+    "message": "I only sign what I understand"
+  },
+  "toggleEthSignModalTitle": {
+    "message": "Use at your own risk"
+  },
+  "toggleEthSignOff": {
+    "message": "OFF (Recommended)"
+  },
+  "toggleEthSignOn": {
+    "message": "ON (Not recommended)"
+  },
+  "toggleRequestQueueDescription": {
+    "message": "This allows you to select a network for each site instead of a single selected network for all sites. This feature will prevent you from switching networks manually, which may break your user experience on certain sites."
+  },
+  "toggleRequestQueueField": {
+    "message": "Select networks for each site"
+  },
+  "toggleRequestQueueOff": {
+    "message": "Off"
+  },
+  "toggleRequestQueueOn": {
+    "message": "On"
+  },
+  "token": {
+    "message": "Token"
+  },
+  "tokenAddress": {
+    "message": "Token address"
+  },
+  "tokenAlreadyAdded": {
+    "message": "Token has already been added."
+  },
+  "tokenAutoDetection": {
+    "message": "Token autodetection"
+  },
+  "tokenContractAddress": {
+    "message": "Token contract address"
+  },
+  "tokenDecimal": {
+    "message": "Token decimal"
+  },
+  "tokenDecimalFetchFailed": {
+    "message": "Token decimal required. Find it on: $1"
+  },
+  "tokenDecimalTitle": {
+    "message": "Token decimal:"
+  },
+  "tokenDetails": {
+    "message": "Token details"
+  },
+  "tokenFoundTitle": {
+    "message": "1 new token found"
+  },
+  "tokenId": {
+    "message": "Token ID"
+  },
+  "tokenList": {
+    "message": "Token lists"
+  },
+  "tokenScamSecurityRisk": {
+    "message": "token scams and security risks"
+  },
+  "tokenShowUp": {
+    "message": "Your tokens may not automatically show up in your wallet. "
+  },
+  "tokenStandard": {
+    "message": "Token standard"
+  },
+  "tokenSymbol": {
+    "message": "Token symbol"
+  },
+  "tokens": {
+    "message": "Tokens"
+  },
+  "tokensFoundTitle": {
+    "message": "$1 new tokens found",
+    "description": "$1 is the number of new tokens detected"
+  },
+  "tokensInCollection": {
+    "message": "Tokens in collection"
+  },
+  "tooltipApproveButton": {
+    "message": "I understand"
+  },
+  "tooltipSatusConnected": {
+    "message": "connected"
+  },
+  "tooltipSatusConnectedUpperCase": {
+    "message": "Connected"
+  },
+  "tooltipSatusNotConnected": {
+    "message": "not connected"
+  },
+  "total": {
+    "message": "Total"
+  },
+  "totalVolume": {
+    "message": "Total volume"
+  },
+  "transaction": {
+    "message": "transaction"
+  },
+  "transactionCancelAttempted": {
+    "message": "Transaction cancel attempted with estimated gas fee of $1 at $2"
+  },
+  "transactionCancelSuccess": {
+    "message": "Transaction successfully cancelled at $2"
+  },
+  "transactionConfirmed": {
+    "message": "Transaction confirmed at $2."
+  },
+  "transactionCreated": {
+    "message": "Transaction created with a value of $1 at $2."
+  },
+  "transactionDataFunction": {
+    "message": "Function"
+  },
+  "transactionDetailDappGasMoreInfo": {
+    "message": "Site suggested"
+  },
+  "transactionDetailDappGasTooltip": {
+    "message": "Edit to use MetaMask's recommended gas fee based on the latest block."
+  },
+  "transactionDetailGasHeading": {
+    "message": "Estimated gas fee"
+  },
+  "transactionDetailGasTooltipConversion": {
+    "message": "Learn more about gas fees"
+  },
+  "transactionDetailGasTooltipExplanation": {
+    "message": "Gas fees are set by the network and fluctuate based on network traffic and transaction complexity."
+  },
+  "transactionDetailGasTooltipIntro": {
+    "message": "Gas fees are paid to crypto miners who process transactions on the $1 network. MetaMask does not profit from gas fees."
+  },
+  "transactionDetailGasTotalSubtitle": {
+    "message": "Amount + gas fee"
+  },
+  "transactionDetailLayer2GasHeading": {
+    "message": "Layer 2 gas fee"
+  },
+  "transactionDetailMultiLayerTotalSubtitle": {
+    "message": "Amount + fees"
+  },
+  "transactionDropped": {
+    "message": "Transaction dropped at $2."
+  },
+  "transactionError": {
+    "message": "Transaction error. Exception thrown in contract code."
+  },
+  "transactionErrorNoContract": {
+    "message": "Trying to call a function on a non-contract address."
+  },
+  "transactionErrored": {
+    "message": "Transaction encountered an error."
+  },
+  "transactionFailed": {
+    "message": "Transaction Failed"
+  },
+  "transactionFee": {
+    "message": "Transaction fee"
+  },
+  "transactionHistoryBaseFee": {
+    "message": "Base fee (GWEI)"
+  },
+  "transactionHistoryL1GasLabel": {
+    "message": "Total L1 gas fee"
+  },
+  "transactionHistoryL2GasLimitLabel": {
+    "message": "L2 gas limit"
+  },
+  "transactionHistoryL2GasPriceLabel": {
+    "message": "L2 gas price"
+  },
+  "transactionHistoryMaxFeePerGas": {
+    "message": "Max fee per gas"
+  },
+  "transactionHistoryPriorityFee": {
+    "message": "Priority fee (GWEI)"
+  },
+  "transactionHistoryTotalGasFee": {
+    "message": "Total gas fee"
+  },
+  "transactionNote": {
+    "message": "Transaction note"
+  },
+  "transactionResubmitted": {
+    "message": "Transaction resubmitted with estimated gas fee increased to $1 at $2"
+  },
+  "transactionSettings": {
+    "message": "Transaction settings"
+  },
+  "transactionSubmitted": {
+    "message": "Transaction submitted with estimated gas fee of $1 at $2."
+  },
+  "transactionUpdated": {
+    "message": "Transaction updated at $2."
+  },
+  "transactions": {
+    "message": "Transactions"
+  },
+  "transfer": {
+    "message": "Transfer"
+  },
+  "transferFrom": {
+    "message": "Transfer from"
+  },
+  "trillionAbbreviation": {
+    "message": "T",
+    "description": "Shortened form of 'trillion'"
+  },
+  "troubleConnectingToLedgerU2FOnFirefox": {
+    "message": "We're having trouble connecting your Ledger. $1",
+    "description": "$1 is a link to the wallet connection guide;"
+  },
+  "troubleConnectingToLedgerU2FOnFirefox2": {
+    "message": "Review our hardware wallet connection guide and try again.",
+    "description": "$1 of the ledger wallet connection guide"
+  },
+  "troubleConnectingToLedgerU2FOnFirefoxLedgerSolution": {
+    "message": "If you're on the latest version of Firefox, you might be experiencing an issue related to Firefox dropping U2F support. Learn how to fix this issue $1.",
+    "description": "It is a link to the ledger website for the workaround."
+  },
+  "troubleConnectingToLedgerU2FOnFirefoxLedgerSolution2": {
+    "message": "here",
+    "description": "Second part of the error message; It is a link to the ledger website for the workaround."
+  },
+  "troubleConnectingToWallet": {
+    "message": "We had trouble connecting to your $1, try reviewing $2 and try again.",
+    "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
+  },
+  "troubleStarting": {
+    "message": "MetaMask had trouble starting. This error could be intermittent, so try restarting the extension."
+  },
+  "trustSiteApprovePermission": {
+    "message": "By granting permission, you are allowing the following $1 to access your funds"
+  },
+  "tryAgain": {
+    "message": "Try again"
+  },
+  "turnOff": {
+    "message": "Turn off"
+  },
+  "turnOffMetamaskNotificationsError": {
+    "message": "There was an error in disabling the notifications. Please try again later."
+  },
+  "turnOn": {
+    "message": "Turn on"
+  },
+  "turnOnMetamaskNotifications": {
+    "message": "Turn on notifications"
+  },
+  "turnOnMetamaskNotificationsButton": {
+    "message": "Turn on"
+  },
+  "turnOnMetamaskNotificationsError": {
+    "message": "There was an error in creating the notifications. Please try again later."
+  },
+  "turnOnMetamaskNotificationsMessageFirst": {
+    "message": "Stay in the loop on what's happening in your wallet with notifications."
+  },
+  "turnOnMetamaskNotificationsMessagePrivacyBold": {
+    "message": "notifications settings."
+  },
+  "turnOnMetamaskNotificationsMessagePrivacyLink": {
+    "message": "Learn how we protect your privacy while using this feature."
+  },
+  "turnOnMetamaskNotificationsMessageSecond": {
+    "message": "To use wallet notifications, we use a profile to sync some settings across your devices. $1"
+  },
+  "turnOnMetamaskNotificationsMessageThird": {
+    "message": "You can turn off notifications at any time in the $1"
+  },
+  "turnOnTokenDetection": {
+    "message": "Turn on enhanced token detection"
+  },
+  "tutorial": {
+    "message": "Tutorial"
+  },
+  "twelveHrTitle": {
+    "message": "12hr:"
+  },
+  "typeYourSRP": {
+    "message": "Type your Secret Recovery Phrase"
+  },
+  "u2f": {
+    "message": "U2F",
+    "description": "A name on an API for the browser to interact with devices that support the U2F protocol. On some browsers we use it to connect MetaMask to Ledger devices."
+  },
+  "unMatchedChain": {
+    "message": "According to our records, this URL does not match a known provider for this chain ID."
+  },
+  "unapproved": {
+    "message": "Unapproved"
+  },
+  "units": {
+    "message": "units"
+  },
+  "unknown": {
+    "message": "Unknown"
+  },
+  "unknownCollection": {
+    "message": "Unnamed collection"
+  },
+  "unknownNetwork": {
+    "message": "Unknown private network"
+  },
+  "unknownNetworkForKeyEntropy": {
+    "message": "Unknown network",
+    "description": "Displayed on places like Snap install warning when regular name is not available."
+  },
+  "unknownQrCode": {
+    "message": "Error: We couldn't identify that QR code"
+  },
+  "unlimited": {
+    "message": "Unlimited"
+  },
+  "unlock": {
+    "message": "Unlock"
+  },
+  "unlockMessage": {
+    "message": "The decentralized web awaits"
+  },
+  "unpin": {
+    "message": "Unpin"
+  },
+  "unrecognizedChain": {
+    "message": "This custom network is not recognized",
+    "description": "$1 is a clickable link with text defined by the 'unrecognizedChanLinkText' key. The link will open to instructions for users to validate custom network details."
+  },
+  "unsendableAsset": {
+    "message": "Sending NFT (ERC-721) tokens is not currently supported",
+    "description": "This is an error message we show the user if they attempt to send an NFT asset type, for which currently don't support sending"
+  },
+  "unverifiedContractAddressMessage": {
+    "message": "We cannot verify this contract. Make sure you trust this address."
+  },
+  "upArrow": {
+    "message": "up arrow"
+  },
+  "update": {
+    "message": "Update"
+  },
+  "updateOrEditNetworkInformations": {
+    "message": "Update your information or"
+  },
+  "updateRequest": {
+    "message": "Update request"
+  },
+  "updatedWithDate": {
+    "message": "Updated $1"
+  },
+  "uploadDropFile": {
+    "message": "Drop your file here"
+  },
+  "uploadFile": {
+    "message": "Upload file"
+  },
+  "urlErrorMsg": {
+    "message": "URLs require the appropriate HTTP/HTTPS prefix."
+  },
+  "urlExistsErrorMsg": {
+    "message": "This URL is currently used by the $1 network."
+  },
+  "use4ByteResolution": {
+    "message": "Decode smart contracts"
+  },
+  "use4ByteResolutionDescription": {
+    "message": "To improve user experience, we customize the activity tab with messages based on the smart contracts you interact with. MetaMask uses a service called 4byte.directory to decode data and show you a version of a smart contract that's easier to read. This helps reduce your chances of approving malicious smart contract actions, but can result in your IP address being shared."
+  },
+  "useMultiAccountBalanceChecker": {
+    "message": "Batch account balance requests"
+  },
+  "useMultiAccountBalanceCheckerSettingDescription": {
+    "message": "Get faster balance updates by batching account balance requests. This lets us fetch your account balances together, so you get quicker updates for an improved experience. When this feature is off, third parties may be less likely to associate your accounts with each other."
+  },
+  "useNftDetection": {
+    "message": "Autodetect NFTs"
+  },
+  "useNftDetectionDescriptionText": {
+    "message": "Let MetaMask add NFTs you own using third-party services. Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk."
+  },
+  "usePhishingDetection": {
+    "message": "Use phishing detection"
+  },
+  "usePhishingDetectionDescription": {
+    "message": "Display a warning for phishing domains targeting Ethereum users"
+  },
+  "useSafeChainsListValidation": {
+    "message": "Network details check"
+  },
+  "useSafeChainsListValidationDescription": {
+    "message": "MetaMask uses a third-party service called $1 to show accurate and standardized network details. This reduces your chances of connecting to malicious or incorrect network. When using this feature, your IP address is exposed to chainid.network."
+  },
+  "useSafeChainsListValidationWebsite": {
+    "message": "chainid.network",
+    "description": "useSafeChainsListValidationWebsite is separated from the rest of the text so that we can bold the third party service name in the middle of them"
+  },
+  "useSiteSuggestion": {
+    "message": "Use site suggestion"
+  },
+  "useTokenDetectionPrivacyDesc": {
+    "message": "Automatically displaying tokens sent to your account involves communication with third party servers to fetch token’s images. Those serves will have access to your IP address."
+  },
+  "usedByClients": {
+    "message": "Used by a variety of different clients"
+  },
+  "userName": {
+    "message": "Username"
+  },
+  "userOpContractDeployError": {
+    "message": "Contract deployment from a smart contract account is not supported"
+  },
+  "verifyContractDetails": {
+    "message": "Verify third-party details"
+  },
+  "verifyThisTokenOn": {
+    "message": "Verify this token on $1",
+    "description": "Points the user to etherscan as a place they can verify information about a token. $1 is replaced with the translation for \"etherscan\""
+  },
+  "verifyThisUnconfirmedTokenOn": {
+    "message": "Verify this token on $1 and make sure this is the token you want to trade.",
+    "description": "Points the user to etherscan as a place they can verify information about a token. $1 is replaced with the translation for \"etherscan\""
+  },
+  "version": {
+    "message": "Version"
+  },
+  "view": {
+    "message": "View"
+  },
+  "viewActivity": {
+    "message": "View activity"
+  },
+  "viewAllDetails": {
+    "message": "View all details"
+  },
+  "viewAllQuotes": {
+    "message": "view all quotes"
+  },
+  "viewContact": {
+    "message": "View contact"
+  },
+  "viewDetails": {
+    "message": "View details"
+  },
+  "viewFullTransactionDetails": {
+    "message": "View full transaction details"
+  },
+  "viewMore": {
+    "message": "View more"
+  },
+  "viewOnBlockExplorer": {
+    "message": "View on block explorer"
+  },
+  "viewOnCustomBlockExplorer": {
+    "message": "View $1 at $2",
+    "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",
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap)"
+  },
+  "viewOnExplorer": {
+    "message": "View on explorer"
+  },
+  "viewOnOpensea": {
+    "message": "View on Opensea"
+  },
+  "viewTransaction": {
+    "message": "View transaction"
+  },
+  "viewinCustodianApp": {
+    "message": "View in custodian app"
+  },
+  "viewinExplorer": {
+    "message": "View $1 in explorer",
+    "description": "$1 is the action type. e.g (Account, Transaction, Swap)"
+  },
+  "visitSite": {
+    "message": "Visit site"
+  },
+  "visitWebSite": {
+    "message": "Visit our website"
+  },
+  "wallet": {
+    "message": "Wallet"
+  },
+  "walletConnectionGuide": {
+    "message": "our hardware wallet connection guide"
+  },
+  "walletCreationSuccessDetail": {
+    "message": "You’ve successfully protected your wallet. Keep your Secret Recovery Phrase safe and secret -- it’s your responsibility!"
+  },
+  "walletCreationSuccessReminder1": {
+    "message": "MetaMask can’t recover your Secret Recovery Phrase."
+  },
+  "walletCreationSuccessReminder2": {
+    "message": "MetaMask will never ask you for your Secret Recovery Phrase."
+  },
+  "walletCreationSuccessReminder3": {
+    "message": "$1 with anyone or risk your funds being stolen",
+    "description": "$1 is separated as walletCreationSuccessReminder3BoldSection so that we can bold it"
+  },
+  "walletCreationSuccessReminder3BoldSection": {
+    "message": "Never share your Secret Recovery Phrase",
+    "description": "This string is localized separately from walletCreationSuccessReminder3 so that we can bold it"
+  },
+  "walletCreationSuccessTitle": {
+    "message": "Wallet creation successful"
+  },
+  "wantToAddThisNetwork": {
+    "message": "Want to add this network?"
+  },
+  "wantsToAddThisAsset": {
+    "message": "This allows the following asset to be added to your wallet."
+  },
+  "warning": {
+    "message": "Warning"
+  },
+  "warningFromSnap": {
+    "message": "Warning from $1",
+    "description": "$1 represents the name of the snap"
+  },
+  "warningTooltipText": {
+    "message": "$1 The third party could spend your entire token balance without further notice or consent. Protect yourself by customizing a lower spending cap.",
+    "description": "$1 is a warning icon with text 'Be careful' in 'warning' colour"
+  },
+  "weak": {
+    "message": "Weak"
+  },
+  "web3": {
+    "message": "Web3"
+  },
+  "web3ShimUsageNotification": {
+    "message": "We noticed that the current website tried to use the removed window.web3 API. If the site appears to be broken, please click $1 for more information.",
+    "description": "$1 is a clickable link."
+  },
+  "webhid": {
+    "message": "WebHID",
+    "description": "Refers to a interface for connecting external devices to the browser. Used for connecting ledger to the browser. Read more here https://developer.mozilla.org/en-US/docs/Web/API/WebHID_API"
+  },
+  "websites": {
+    "message": "websites",
+    "description": "Used in the 'permission_rpc' message."
+  },
+  "welcomeBack": {
+    "message": "Welcome back!"
+  },
+  "welcomeExploreDescription": {
+    "message": "Store, send and spend crypto currencies and assets."
+  },
+  "welcomeExploreTitle": {
+    "message": "Explore decentralized apps"
+  },
+  "welcomeLoginDescription": {
+    "message": "Use your MetaMask to login to decentralized apps - no signup needed."
+  },
+  "welcomeLoginTitle": {
+    "message": "Say hello to your wallet"
+  },
+  "welcomeToMetaMask": {
+    "message": "Let's get started"
+  },
+  "welcomeToMetaMaskIntro": {
+    "message": "Trusted by millions, MetaMask is a secure wallet making the world of web3 accessible to all."
+  },
+  "whatsNew": {
+    "message": "What's new",
+    "description": "This is the title of a popup that gives users notifications about new features and updates to MetaMask."
+  },
+  "whatsThis": {
+    "message": "What's this?"
+  },
+  "wrongChainId": {
+    "message": "This chain ID doesn’t match the network name."
+  },
+  "wrongNetworkName": {
+    "message": "According to our records, the network name may not correctly match this chain ID."
+  },
+  "xOfYPending": {
+    "message": "$1 of $2 pending",
+    "description": "$1 and $2 are intended to be two numbers, where $2 is a total number of pending confirmations, and $1 is a count towards that total"
+  },
+  "yes": {
+    "message": "Yes"
+  },
+  "you": {
+    "message": "You"
+  },
+  "youHaveAddedAll": {
+    "message": "You've added all the popular networks. You can discover more networks $1 Or you can $2",
+    "description": "$1 is a link with the text 'here' and $2 is a button with the text 'add more networks manually'"
+  },
+  "youNeedToAllowCameraAccess": {
+    "message": "You need to allow camera access to use this feature."
+  },
+  "youSign": {
+    "message": "You are signing"
+  },
+  "yourAccounts": {
+    "message": "Your accounts"
+  },
+  "yourActivity": {
+    "message": "Your activity"
+  },
+  "yourBalance": {
+    "message": "Your balance"
+  },
+  "yourFundsMayBeAtRisk": {
+    "message": "Your funds may be at risk"
+  },
+  "yourNFTmayBeAtRisk": {
+    "message": "Your NFT may be at risk"
+  },
+  "yourPrivateSeedPhrase": {
+    "message": "Your Secret Recovery Phrase"
+  },
+  "yourTransactionConfirmed": {
+    "message": "Transaction already confirmed"
+  },
+  "yourTransactionJustConfirmed": {
+    "message": "We weren't able to cancel your transaction before it was confirmed on the blockchain."
+  },
+  "zeroGasPriceOnSpeedUpError": {
+    "message": "Zero gas price on speed up"
+  }
+}

From acce79152c52b8bb264dc7c361468a584a01f4f0 Mon Sep 17 00:00:00 2001
From: Marina Boboc <120041701+benjisclowder@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:06:28 +0300
Subject: [PATCH 144/236] v12.0.0 changelog (#25391)

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

---------

Co-authored-by: Chloe Gao <chloe.gao@consensys.net>
Co-authored-by: Dan J Miller <danjm.com@gmail.com>
---
 CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39f8ce48b1d8..6a046de6f3b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,57 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.0]
+### Added
+- Allow users to 'Select networks for each site' ([#24274](https://github.com/MetaMask/metamask-extension/pull/24274))
+- Introduced new features in MetaMask including Profile Syncing for privacy-preserving data sharing across clients and customizable on-chain activity notifications ([#24482](https://github.com/MetaMask/metamask-extension/pull/24482))
+- Implemented Blockaid validation support for the OPBNB network ([#24361](https://github.com/MetaMask/metamask-extension/pull/24361))
+- Implemented the Swap+Send feature, allowing users to swap assets immediately before sending ([#23703](https://github.com/MetaMask/metamask-extension/pull/23703))
+- Introduced a modal prompting existing users to enable automatic token detection ([#24281](https://github.com/MetaMask/metamask-extension/pull/24281))
+- Added the `wallet_switchEthereumChain` permission, to let dApps switch Ethereum chains with user's initial permission ([#24415](https://github.com/MetaMask/metamask-extension/pull/24415))
+- Introduced QR code support for adding OneKey Pro hardware wallets ([#24492](https://github.com/MetaMask/metamask-extension/pull/24492))
+
+### Changed
+- Updated the 'Help us improve MetaMask' onboarding text ([#24050](https://github.com/MetaMask/metamask-extension/pull/24050))
+- Redesign of the Send flow UI ([#22457](https://github.com/MetaMask/metamask-extension/pull/22457))
+- Enhanced the UI to display pre-approved connections during the permission confirmation step for installing or updating a Snap ([#24403](https://github.com/MetaMask/metamask-extension/pull/24403))
+- Updated the information section for SIWE signature types ([#24811](https://github.com/MetaMask/metamask-extension/pull/24811))
+- Updated the gas UI styles in Transaction Details ([#24241](https://github.com/MetaMask/metamask-extension/pull/24241))
+- Improved the positioning of the warning icon on gas details ([#24999](https://github.com/MetaMask/metamask-extension/pull/24999))
+- Disabled specific gas warnings and errors for transactions on the Mantle network ([#24860](https://github.com/MetaMask/metamask-extension/pull/24860))
+- Redesigns of the personal and typed (EIP-712) signature screens, now available for opt-in ([#24466](https://github.com/MetaMask/metamask-extension/pull/24466))
+- Updated the information section for permit signature types to provide clearer details ([#24808](https://github.com/MetaMask/metamask-extension/pull/24808))
+- Introduced a simulation section for Sign-In With Ethereum (SIWE) personal signature requests ([#24865](https://github.com/MetaMask/metamask-extension/pull/24865))
+- Support transaction specific gas fee estimates, allowing for more precise gas estimates in some scenarios ([#24222](https://github.com/MetaMask/metamask-extension/pull/24222))
+- Updated contract names for MetaMask Pooled Staking and MetaMask Third Party Staking features ([#25077](https://github.com/MetaMask/metamask-extension/pull/25077))
+- Redesigned Snap UI buttons as inline-style text buttons ([#23610](https://github.com/MetaMask/metamask-extension/pull/23610))
+- Removed the account type pill from the wallet overview screen ([#24717](https://github.com/MetaMask/metamask-extension/pull/24717))
+- Updated the Snaps interface to conceal Snaps that are currently installing ([#24215](https://github.com/MetaMask/metamask-extension/pull/24215))
+- Adjusted the validation for network symbols to allow single character symbols when adding a network ([#24872](https://github.com/MetaMask/metamask-extension/pull/24872))
+- Corrected Aurora deprecation message to guide users on migrating from Infura to mainnet.aurora.dev for continued support ([#24534](https://github.com/MetaMask/metamask-extension/pull/24534))
+- Implemented a fallback for currency formatting in cases of unknown currencies ([#24563](https://github.com/MetaMask/metamask-extension/pull/24563))
+- Updated the SnapAvatar's background and border colors to enhance visual appeal ([#24346](https://github.com/MetaMask/metamask-extension/pull/24346))
+
+### Fixed
+- Fixed an issue where adding a new HD account incorrectly retrieved addresses from all keyrings ([#24199](https://github.com/MetaMask/metamask-extension/pull/24199))
+- Fixed an issue where changing accounts during an NFT transaction incorrectly retained the NFT asset selection ([#24398](https://github.com/MetaMask/metamask-extension/pull/24398))
+- Enhanced network verification to handle special cases like chain ID collisions with different symbols ([#23802](https://github.com/MetaMask/metamask-extension/pull/23802))
+- Resolved an issue where users were unable to manually edit gas fees in the advanced gas fee editing modal ([#24387](https://github.com/MetaMask/metamask-extension/pull/24387))
+- Fixed an issue where swaps initiated by DApps were causing errors in MetaMask ([#24382](https://github.com/MetaMask/metamask-extension/pull/24382))
+- Corrected the display mismatch of maximum gas for transactions on the Optimism network ([#24272](https://github.com/MetaMask/metamask-extension/pull/24272))
+- Resolved an issue causing duplicate display of Layer 1 and Layer 2 fees for transactions on Layer 2 networks ([#24264](https://github.com/MetaMask/metamask-extension/pull/24264))
+- Improved the layout of the confirmation page in extended view ([#24211](https://github.com/MetaMask/metamask-extension/pull/24211))
+- Improved support for custom token approval transactions, allowing for extra data like attribution tags ([#23527](https://github.com/MetaMask/metamask-extension/pull/23527))
+- Adjusted the Connect Account Toast to honor user preferences ([#24474](https://github.com/MetaMask/metamask-extension/pull/24474))
+- Fixed a display issue by removing the outdated account alert ([#24475](https://github.com/MetaMask/metamask-extension/pull/24475))
+- Resolved a double-click issue and console errors during ERC20 token import process ([#24620](https://github.com/MetaMask/metamask-extension/pull/24620))
+- Optimized handling of prerender issues in MetaMask for certain Chromium versions ([#24317](https://github.com/MetaMask/metamask-extension/pull/24317))
+- Enhanced MetaMask's browser support by updating code for better compatibility with older versions ([#24907](https://github.com/MetaMask/metamask-extension/pull/24907))
+- Fixed a UI inconsistency in the Transaction Insight tab for Snaps ([#24849](https://github.com/MetaMask/metamask-extension/pull/24849))
+- Resolved error handling issues for user rejections on chain switch and add requests ([#25339](https://github.com/MetaMask/metamask-extension/pull/25339))
+- Adjusted UI to truncate long NFT IDs with ellipses ([#25479](https://github.com/MetaMask/metamask-extension/pull/25479))
+- Fixed a bug to handle cases of undefined transaction data ([#25506](https://github.com/MetaMask/metamask-extension/pull/25506))
+- Fixed a bug that caused empty nonce fields for new transactions on different networks when a Smart Transaction was pending ([#25629](https://github.com/MetaMask/metamask-extension/pull/25629))
+- Fixed an issue ensuring MetaMask UI remains responsive when switching to a dApp tab on a down network ([#25425](https://github.com/MetaMask/metamask-extension/pull/25425))
 
 ## [11.16.15]
 ### Changed

From f3565916b0aa3e5878c099a9d1c8b587b2dd4872 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 30 Jul 2024 17:55:42 -0230
Subject: [PATCH 145/236]  test(cherry-pick-v12): use tsx for E2E tests instead
 of ts-node (#25399) (#26233)

Cherry pick d70b65010f (#25399) to v12

Co-authored-by: Howard Braham <howrad@gmail.com>
---
 test/e2e/.mocharc.js        | 5 ++++-
 test/e2e/e2e-mocha-setup.js | 5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 test/e2e/e2e-mocha-setup.js

diff --git a/test/e2e/.mocharc.js b/test/e2e/.mocharc.js
index 3513eaa0efdd..77eccc7deb25 100644
--- a/test/e2e/.mocharc.js
+++ b/test/e2e/.mocharc.js
@@ -1,5 +1,8 @@
 // This file exists to add mocha configuration options specific to our
 // E2E Test suite.
 module.exports = {
-  require: ['test/e2e/e2e-mocha-setup.js'],
+  // Registers tsx so that we may use the same TypeScript features in
+  // E2E tests that we use elsewhere in our code.
+  require: ['tsx/esm'],
+  'node-option': ['import=tsx'],
 };
diff --git a/test/e2e/e2e-mocha-setup.js b/test/e2e/e2e-mocha-setup.js
deleted file mode 100644
index 26965006ece5..000000000000
--- a/test/e2e/e2e-mocha-setup.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file simply registers babel and ts-node so that we may use the same
-// ECMAScript features in E2E tests that we use elsewhere in our code. It also
-// allows values to be read from TypeScript files.
-require('@babel/register');
-require('ts-node/register');

From 2561bccf6e163dfd82bd10f9cb26bb508c0b9d6b Mon Sep 17 00:00:00 2001
From: sahar-fehri <sahar.fehri@consensys.net>
Date: Tue, 30 Jul 2024 23:45:31 +0200
Subject: [PATCH 146/236] Fix/cherry pick new locales (#26223)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

cherry-picks
https://github.com/MetaMask/metamask-extension/pull/25939/files

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26223?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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 <37885440+metamaskbot@users.noreply.github.com>
Co-authored-by: Dan J Miller <danjm.com@gmail.com>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
---
 app/_locales/de/messages.json                         |  5 ++++-
 app/_locales/el/messages.json                         |  7 +++++--
 app/_locales/en/messages.json                         |  2 +-
 app/_locales/es/messages.json                         |  7 +++++--
 app/_locales/fr/messages.json                         |  7 +++++--
 app/_locales/hi/messages.json                         |  7 +++++--
 app/_locales/id/messages.json                         |  7 +++++--
 app/_locales/ja/messages.json                         |  7 +++++--
 app/_locales/ko/messages.json                         |  7 +++++--
 app/_locales/pt/messages.json                         |  7 +++++--
 app/_locales/ru/messages.json                         |  7 +++++--
 app/_locales/tl/messages.json                         | 11 +++++++----
 app/_locales/tr/messages.json                         |  7 +++++--
 app/_locales/vi/messages.json                         |  7 +++++--
 app/_locales/zh_CN/messages.json                      |  5 ++++-
 .../__snapshots__/security-tab.test.js.snap           |  2 +-
 16 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 991981b23bb8..666b5d464fdb 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1657,6 +1657,9 @@
     "message": "$1 aktivieren",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Automatische Token-Erkennung aktivieren"
+  },
   "enabled": {
     "message": "Aktiviert"
   },
@@ -6026,7 +6029,7 @@
     "message": "NFTs automatisch erkennen"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Lassen Sie MetaMask NFTs, die Sie besitzen, anhand von Drittanbieterdiensten (wie OpenSea) hinzufügen. Durch die automatische Erkennung von NFTs werden Ihre IP- und Kontoadresse für diese Dienste offengelegt. Durch die Aktivierung dieser Funktion können eventuell Ihre IP- und Ethereum-Adresse miteinander in Verbindung gebracht und gefälschte, von Betrügern per Airdropping abgesetzte NFTs anzeigt werden. Es ist möglich, Tokens manuell hinzufügen, um dieses Risiko zu vermeiden."
+    "message": "Lassen Sie MetaMask NFTs, die Sie besitzen, anhand von Drittanbieterdiensten hinzufügen. Durch die automatische Erkennung von NFTs werden Ihre IP- und Kontoadresse für diese Dienste offengelegt. Durch die Aktivierung dieser Funktion können eventuell Ihre IP- und Ethereum-Adresse miteinander in Verbindung gebracht und gefälschte, von Betrügern per Airdropping abgesetzte NFTs anzeigt werden. Es ist möglich, Tokens manuell hinzufügen, um dieses Risiko zu vermeiden."
   },
   "usePhishingDetection": {
     "message": "Phishing-Erkennung verwenden"
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 94aca613679c..8875f05c05d2 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Προσθήκη νέου λογαριασμού"
+    "message": "Προσθήκη νέου λογαριασμού Ethereum"
   },
   "addNewToken": {
     "message": "Προσθήκη νέου token"
@@ -1657,6 +1657,9 @@
     "message": "ενεργοποίηση $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Ενεργοποίηση της αυτόματης ανίχνευσης των tokens"
+  },
   "enabled": {
     "message": "Ενεργοποιημένο"
   },
@@ -6026,7 +6029,7 @@
     "message": "Αυτόματη ανίχνευση των NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Επιτρέψτε στο MetaMask να προσθέτει NFT που σας ανήκουν χρησιμοποιώντας υπηρεσίες τρίτων (όπως το OpenSea). Ο αυτόματος εντοπισμός NFT εκθέτει τη διεύθυνση IP και τον λογαριασμό σας σε αυτές τις υπηρεσίες. Η ενεργοποίηση αυτής της λειτουργίας θα μπορούσε να συσχετίσει τη διεύθυνση IP σας με τη διεύθυνση Ethereum σας και να εμφανίσει ψεύτικα NFT που διοχετεύουν οι απατεώνες. Μπορείτε να προσθέσετε tokens χειροκίνητα για να αποφύγετε αυτόν τον κίνδυνο."
+    "message": "Επιτρέψτε στο MetaMask να προσθέτει NFT που σας ανήκουν χρησιμοποιώντας υπηρεσίες τρίτων. Ο αυτόματος εντοπισμός NFT εκθέτει τη διεύθυνση IP και την διεύθυνση του λογαριασμού σας σε αυτές τις υπηρεσίες. Η ενεργοποίηση αυτής της λειτουργίας θα μπορούσε να συσχετίσει τη διεύθυνση IP σας με τη διεύθυνση Ethereum σας και να εμφανίσει ψεύτικα NFT τακτικής airdrop που διοχετεύουν οι απατεώνες. Μπορείτε να προσθέσετε tokens μη αυτόματα για να αποφύγετε αυτόν τον κίνδυνο."
   },
   "usePhishingDetection": {
     "message": "Χρήση ανίχνευσης phishing"
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 8ac184cfd38c..4d510adadc8e 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -6129,7 +6129,7 @@
     "message": "Autodetect NFTs"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Let MetaMask add NFTs you own using third-party services (like OpenSea). Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk."
+    "message": "Let MetaMask add NFTs you own using third-party services. Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk."
   },
   "usePhishingDetection": {
     "message": "Use phishing detection"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index e5739a02f0f5..39d6cde96d57 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Añadir una cuenta nueva"
+    "message": "Añadir una cuenta nueva de Ethereum"
   },
   "addNewToken": {
     "message": "Agregar nuevo token"
@@ -1654,6 +1654,9 @@
     "message": "activar $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Activar la autodetección de tokens"
+  },
   "enabled": {
     "message": "Activado"
   },
@@ -6023,7 +6026,7 @@
     "message": "Detección automática de NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Permita que MetaMask agregue NFT de su propiedad mediante servicios de terceros (como OpenSea). La detección automática de NFT expone su IP y dirección de cuenta a estos servicios. Habilitar esta función podría asociar su dirección IP con su dirección de Ethereum y mostrar NFT enviados mediante airdrop por estafadores. Puede agregar tokens manualmente para evitar este riesgo."
+    "message": "Deje que MetaMask agregue los NFT de su propiedad mediante servicios de terceros. La detección automática de los NFT expone su IP y dirección de cuenta a estos servicios. Habilitar esta función podría asociar su dirección IP con su dirección de Ethereum y mostrar NFT falsos enviados mediante airdrop por estafadores. Puede agregar tókenes manualmente para evitar este riesgo."
   },
   "usePhishingDetection": {
     "message": "Usar detección de phishing"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 2cc719c01991..96f9be9a4c8f 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Ajouter un nouveau compte"
+    "message": "Ajouter un nouveau compte Ethereum"
   },
   "addNewToken": {
     "message": "Ajouter un nouveau jeton"
@@ -1657,6 +1657,9 @@
     "message": "activer $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Activer la détection automatique des jetons"
+  },
   "enabled": {
     "message": "Activé"
   },
@@ -6026,7 +6029,7 @@
     "message": "Détection automatique des NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Laissez MetaMask ajouter les NFT que vous possédez en utilisant des services tiers (comme OpenSea). La détection automatique des NFT expose votre adresse IP et l’adresse de votre compte à ces services. Si vous activez cette fonctionnalité, un lien pourrait être établi entre votre adresse IP et votre adresse Ethereum, et entrainer l’affichage de faux NFT distribués par des escrocs. Vous pouvez ajouter des jetons manuellement pour éviter ce risque."
+    "message": "Laissez MetaMask ajouter les NFT que vous possédez en utilisant des services tiers. La détection automatique des NFT révèle votre adresse IP et l’adresse de votre compte à ces services. Si vous activez cette fonctionnalité, un lien pourrait être établi entre votre adresse IP et votre adresse Ethereum, et entrainer l’affichage de faux NFT parachutés par des arnaqueurs. Vous pouvez ajouter des jetons manuellement pour éviter ce risque."
   },
   "usePhishingDetection": {
     "message": "Utiliser la fonction anti-hameçonnage"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index ee2adaf2087c..db278acc5b6f 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "एक नया अकाउंट जोड़ें"
+    "message": "एक नया Ethereum अकाउंट जोड़ें"
   },
   "addNewToken": {
     "message": "नया टोकन जोड़ें"
@@ -1654,6 +1654,9 @@
     "message": "$1 इनेबल करें",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "टोकन ऑटोडिटेक्शन चालू करें"
+  },
   "enabled": {
     "message": "इनेबल किया गया"
   },
@@ -6023,7 +6026,7 @@
     "message": "NFT को ऑटो-डिटेक्ट करें"
   },
   "useNftDetectionDescriptionText": {
-    "message": "MetaMask को थर्ड पार्टी सर्विसेज़ (जैसे OpenSea) का उपयोग करके आपके NFTs जोड़ने दें। NFTs को ऑटोडिटेक्ट करने से आपका आईपी और अकाउंट एड्रेस इन सेवाओं के सामने आ जाता है। इस फ़ीचर को चालू करने से आपका आईपी ​​एड्रेस आपके Ethereum एड्रेस के साथ जुड़ सकता है और धोखाधड़ी करने वाले लोगों द्वारा एयरड्रॉप किए गए नकली NFTs दिख सकते हैं। आप मैन्युअल तरीके से टोकन जोड़कर इस ख़तरे से बच सकते हैं।"
+    "message": "MetaMask को थर्ड पार्टी सर्विसेज़ का उपयोग करके आपके NFTs जोड़ने दें। NFTs को ऑटोडिटेक्ट करने से आपका आईपी और अकाउंट एड्रेस इन सेवाओं के सामने आ जाता है। इस फ़ीचर को चालू करने से आपका आईपी ​​एड्रेस आपके Ethereum एड्रेस के साथ जुड़ सकता है और धोखाधड़ी करने वाले लोगों द्वारा एयरड्रॉप किए गए नकली NFTs दिख सकते हैं। आप मैन्युअल तरीके से टोकन जोड़कर इस ख़तरे से बच सकते हैं।"
   },
   "usePhishingDetection": {
     "message": "फिशिंग डिटेक्शन का इस्तेमाल करें"
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index dadb3eca200d..f1158182ef5c 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Tambahkan akun baru"
+    "message": "Tambahkan akun Ethereum baru"
   },
   "addNewToken": {
     "message": "Tambahkan token baru"
@@ -1657,6 +1657,9 @@
     "message": "aktifkan $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Aktifkan autodeteksi token"
+  },
   "enabled": {
     "message": "Diaktifkan"
   },
@@ -6026,7 +6029,7 @@
     "message": "Deteksi otomatis NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Izinkan MetaMask menambahkan NFT yang Anda miliki menggunakan layanan pihak ketiga (seperti OpenSea). Autodeteksi NFT mengekspos alamat IP dan akun Anda ke layanan ini. Mengaktifkan fitur ini dapat mengaitkan alamat IP dengan alamat Ethereum Anda dan menampilkan NFT palsu yang di-airdrop oleh penipu. Anda dapat menambahkan token secara manual untuk menghindari risiko ini."
+    "message": "Izinkan MetaMask menambahkan NFT yang Anda miliki menggunakan layanan pihak ketiga. Autodeteksi NFT mengekspos alamat IP dan akun Anda ke layanan ini. Mengaktifkan fitur ini dapat mengaitkan alamat IP dengan alamat Ethereum Anda dan menampilkan NFT palsu yang di-airdrop oleh penipu. Anda dapat menambahkan token secara manual untuk menghindari risiko ini."
   },
   "usePhishingDetection": {
     "message": "Gunakan deteksi phishing"
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index b3ac5ec3ebd8..5734f8275e2f 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "新しいアカウントを追加"
+    "message": "新しいイーサリアムアカウントを追加"
   },
   "addNewToken": {
     "message": "新しいトークンを追加"
@@ -1654,6 +1654,9 @@
     "message": "$1を有効にする",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "トークンの自動検出を有効にする"
+  },
   "enabled": {
     "message": "有効"
   },
@@ -6023,7 +6026,7 @@
     "message": "NFTを自動検出"
   },
   "useNftDetectionDescriptionText": {
-    "message": "MetaMaskが、サードパーティサービス (例: OpenSea) を使って、ユーザーが所有するNFTを追加することを許可します。NFTの自動検出機能を利用すると、ユーザーのIPとアカウントアドレスがこれらのサービスに公開されます。この機能を有効にした場合、ユーザーのIPアドレスとイーサリアムアドレスが紐付けられ、詐欺師によりエアドロップされた偽のNFTが表示される可能性があります。このリスクを回避するため、手動でトークンを追加することもできます。"
+    "message": "MetaMaskが、サードパーティサービス を使って、ユーザーが所有するNFTを追加することを許可します。NFTの自動検出機能を利用すると、ユーザーのIPとアカウントアドレスがこれらのサービスに公開されます。この機能を有効にした場合、ユーザーのIPアドレスとイーサリアムアドレスが紐付けられ、詐欺師によりエアドロップされた偽のNFTが表示される可能性があります。このリスクを回避するため、手動でトークンを追加することもできます。"
   },
   "usePhishingDetection": {
     "message": "フィッシング検出を使用"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index f4250affbac7..6961d688203f 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "새 계정 추가"
+    "message": "새 이더리움 계정 추가"
   },
   "addNewToken": {
     "message": "신규 토큰 추가"
@@ -1654,6 +1654,9 @@
     "message": "$1 활성화",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "토큰 자동 감지 활성화"
+  },
   "enabled": {
     "message": "활성화됨"
   },
@@ -6023,7 +6026,7 @@
     "message": "NFT 자동 감지"
   },
   "useNftDetectionDescriptionText": {
-    "message": "MetaMask가 제삼자 서비스(예: OpenSea)를 이용하여 회원님의 NFT를 추가할 수 있도록 합니다. NFT를 자동 감지하면 이러한 서비스에 IP와 계정 주소가 노출됩니다. 이 기능을 켜면 IP 주소가 이더리움 주소와 연결되고 사기꾼이 에어드랍한 가짜 NFT가 표시될 수 있습니다. 이러한 위험을 피하기 위해 수동으로 토큰을 추가할 수 있습니다."
+    "message": "MetaMask가 제삼자 서비스를 이용하여 회원님의 NFT를 추가할 수 있도록 합니다. NFT를 자동 감지하면 이러한 서비스에 IP와 계정 주소가 노출됩니다. 이 기능을 켜면 IP 주소가 이더리움 주소와 연결되고 사기꾼이 에어드랍한 가짜 NFT가 표시될 수 있습니다. 이러한 위험을 피하기 위해 수동으로 토큰을 추가할 수 있습니다."
   },
   "usePhishingDetection": {
     "message": "피싱 감지 사용"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 8a88bdcf5dbf..70e6a4a6e273 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Adicionar uma nova conta"
+    "message": "Adicionar uma nova conta Ethereum"
   },
   "addNewToken": {
     "message": "Adicionar novo token"
@@ -1657,6 +1657,9 @@
     "message": "ativar $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Ativar detecção automática de tokens"
+  },
   "enabled": {
     "message": "Ativado"
   },
@@ -6026,7 +6029,7 @@
     "message": "Detectar NFTs automaticamente"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Permita que a MetaMask use serviços de terceiros (como o OpenSea) para adicionar os NFTs que você possui. A detecção automática de NFTs expõe seu endereço IP e o endereço da sua conta a esses serviços. Ativar esse recurso pode associar seu endereço IP ao seu endereço Ethereum e exibir NFTs falsos enviados por golpistas via AirDrop. Você pode adicionar tokens manualmente para evitar esse risco."
+    "message": "Permita que a MetaMask use serviços de terceiros para adicionar os NFTs que você possui. A detecção automática de NFTs expõe seu endereço IP e o endereço da sua conta a esses serviços. Ativar esse recurso pode associar seu endereço IP ao seu endereço Ethereum e exibir NFTs falsos enviados por golpistas. Você pode adicionar tokens manualmente para evitar esse risco."
   },
   "usePhishingDetection": {
     "message": "Usar detecção de phishing"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index fb2446c6b16c..ec49daa88cb1 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Добавить новый счет"
+    "message": "Добавить новый счет Ethereum"
   },
   "addNewToken": {
     "message": "Добавить новый токен"
@@ -1657,6 +1657,9 @@
     "message": "активирует для $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Включите автоопределение токена"
+  },
   "enabled": {
     "message": "Включено"
   },
@@ -6026,7 +6029,7 @@
     "message": "Автоопределение NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Разрешает MetaMask добавлять ваши собственные NFT с помощью сторонних сервисов (например, OpenSea). Автоопределение NFT раскрывает ваш IP-адрес и адрес счета этим сервисам. Включение этой функции может связать ваш IP-адрес с вашим адресом Ethereum и отобразить поддельные NFT-файлы, аирдропнутые мошенниками. Вы можете добавлять токены вручную, чтобы избежать этой угрозы."
+    "message": "Разрешает MetaMask добавлять ваши собственные NFT с помощью сторонних сервисов. Автоопределение NFT раскрывает ваш IP-адрес и адрес счета этим сервисам. Включение этой функции может связать ваш IP-адрес с вашим адресом Ethereum и отобразить поддельные NFT-файлы, аирдропнутые мошенниками. Вы можете добавлять токены вручную, чтобы избежать этой угрозы."
   },
   "usePhishingDetection": {
     "message": "Использовать обнаружение фишинга"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 4fe457aad146..c16626c0caf1 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Magdagdag ng bagong account"
+    "message": "Magdagdag ng bagong account sa Ethereum"
   },
   "addNewToken": {
     "message": "Magdagdag ng bagong token"
@@ -1654,6 +1654,9 @@
     "message": "paganahin ang $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Paganahin ang autodetection ng token"
+  },
   "enabled": {
     "message": "Pinagana"
   },
@@ -2306,7 +2309,7 @@
     "message": "Nakikipag-ugnayan sa"
   },
   "interactingWithTransactionDescription": {
-    "message": "Sa kontrata na ito ka nakikipag-ugnayan ka. Protektahan ang iyong sarili mula sa mga scammer sa pamamagitan ng pagberipika ng mga detalye."
+    "message": "Nakikipag-ugnayan ka sa kontrato na ito. Protektahan ang iyong sarili mula sa mga scammer sa pamamagitan ng pagberipika ng mga detalye."
   },
   "invalidAddress": {
     "message": "Di-wastong address"
@@ -3037,7 +3040,7 @@
     "message": "Wala kang naka-install na snaps."
   },
   "noThanks": {
-    "message": "Salamat nalang"
+    "message": "Salamat na lang"
   },
   "noTransactions": {
     "message": "Wala kang transaksyon"
@@ -6023,7 +6026,7 @@
     "message": "Awtomatikong tuklasin ang mga NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Hayaan ang MetaMask na magdagdag ng mga NFT na iyong pag-aari gamit ang mga third-party na serbisyo (tulad ng OpenSea). Ang awtomatikong pagtuklas ng mga NFT ay naglalantad sa iyong IP at address ng account sa mga serbisyong ito. Ang pag-enable sa tampok na ito ay maaaring mag-ugnay sa iyong IP sa iyong Ethereum address at magpakita ng pekeng NFT na in-airdrop ng mga manloloko. Maaari kang magdagdag ng token sa manwal na paraan para iwasan ang panganib na ito."
+    "message": "Hayaan ang MetaMask na magdagdag ng mga NFT na iyong pag-aari gamit ang mga third-party na serbisyo. Ang awtomatikong pagtuklas ng mga NFT ay naglalantad sa iyong IP at address ng account sa mga serbisyong ito. Ang pag-enable sa tampok na ito ay maaaring mag-ugnay sa iyong IP sa iyong Ethereum address at magpakita ng pekeng NFT na in-airdrop ng mga scammer. Maaari kang magdagdag ng token sa manu-manong paraan para iwasan ang panganib na ito."
   },
   "usePhishingDetection": {
     "message": "Gumamit ng phishing detection"
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 8b58e9ac8218..d1b37a3f3e9f 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Yeni bir hesap ekleyin"
+    "message": "Yeni bir Ethereum hesabı ekle"
   },
   "addNewToken": {
     "message": "Yeni token ekleyin"
@@ -1657,6 +1657,9 @@
     "message": "şunu etkinleştir: $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Otomatik token algılamayı etkinleştir"
+  },
   "enabled": {
     "message": "Etkinleştirildi"
   },
@@ -6026,7 +6029,7 @@
     "message": "NFT'leri otomatik algıla"
   },
   "useNftDetectionDescriptionText": {
-    "message": "MetaMask'in üçüncü taraf hizmetleri (OpenSea gibi) kullanarak size ait olan NFT'leri eklemesine izin verin. NFT'leri otomatik algılama, IP adresinizi ve hesap adresinizi bu hizmetlerle paylaşır. Bu özelliğin etkinleştirilmesi IP adresinizi Ethereum adresinizle ilişkilendirebilir ve dolandırıcılar tarafından airdrop'u gerçekleştirilen sahte NFT'leri gösterebilir. Bu riski önlemek için tokenleri elle ekleyebilirsiniz."
+    "message": "MetaMask'in üçüncü taraf hizmetleri kullanarak size ait olan NFT'leri eklemesine izin verin. NFT'leri otomatik algılama, IP adresinizi ve hesap adresinizi bu hizmetlerle paylaşır. Bu özelliğin etkinleştirilmesi IP adresinizi Ethereum adresinizle ilişkilendirebilir ve dolandırıcılar tarafından airdrop'u gerçekleştirilen sahte NFT'leri gösterebilir. Bu riski önlemek için tokenleri elle ekleyebilirsiniz."
   },
   "usePhishingDetection": {
     "message": "Kimlik avı algılama kullan"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 0961e6746022..f3c673274ced 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -275,7 +275,7 @@
     "description": "$1 is Learn more link"
   },
   "addNewAccount": {
-    "message": "Thêm tài khoản"
+    "message": "Thêm tài khoản Ethereum mới"
   },
   "addNewToken": {
     "message": "Thêm token mới"
@@ -1654,6 +1654,9 @@
     "message": "bật $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "Bật tính năng tự động phát hiện token"
+  },
   "enabled": {
     "message": "Đã bật"
   },
@@ -6023,7 +6026,7 @@
     "message": "Tự động phát hiện NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "Cho phép MetaMask thêm các NFT mà bạn sở hữu bằng cách sử dụng dịch vụ của bên thứ ba (như OpenSea). Tính năng Tự động phát hiện NFT sẽ làm lộ địa chỉ IP và tài khoản của bạn với các dịch vụ này. Việc bật tính năng này có thể liên kết địa chỉ IP của bạn với địa chỉ Ethereum của bạn và hiển thị các NFT giả do những kẻ lừa đảo phát tán. Bạn có thể thêm token theo cách thủ công để tránh rủi ro này."
+    "message": "Cho phép MetaMask thêm các NFT mà bạn sở hữu bằng cách sử dụng dịch vụ của bên thứ ba. Tính năng Tự động phát hiện NFT sẽ làm lộ địa chỉ IP và tài khoản của bạn với các dịch vụ này. Việc bật tính năng này có thể liên kết địa chỉ IP của bạn với địa chỉ Ethereum của bạn và hiển thị các NFT giả do những kẻ lừa đảo phát tán. Bạn có thể thêm token theo cách thủ công để tránh rủi ro này."
   },
   "usePhishingDetection": {
     "message": "Sử dụng tính năng phát hiện lừa đảo"
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 35107849d647..2894a43fc0fb 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1654,6 +1654,9 @@
     "message": "启用 $1",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "enableTokenAutoDetection": {
+    "message": "启用代币自动检测"
+  },
   "enabled": {
     "message": "已启用"
   },
@@ -6023,7 +6026,7 @@
     "message": "自动检测NFT"
   },
   "useNftDetectionDescriptionText": {
-    "message": "让 MetaMask 使用第三方服务（如 OpenSea）来添加您所拥有的 NFT。打开自动检测 NFT 功能后，这些服务就可以看到您的 IP 地址和账户地址。启用此功能可能会将您的 IP 地址与以太坊地址关联起来，并显示骗子空投的虚假 NFT。您可以手动添加代币以避免此风险。"
+    "message": "让 MetaMask 使用第三方服务来添加您所拥有的 NFT。打开自动检测 NFT 功能后，这些服务就可以看到您的 IP 地址和账户地址。启用此功能可能会将您的 IP 地址与以太坊地址关联起来，并显示骗子空投的虚假 NFT。您可以手动添加代币以避免此风险。"
   },
   "usePhishingDetection": {
     "message": "使用网络钓鱼检测"
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 c2ab279a6979..95e139b3320f 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
@@ -1698,7 +1698,7 @@ exports[`Security Tab should match snapshot 1`] = `
           <div
             class="settings-page__content-description"
           >
-            Let MetaMask add NFTs you own using third-party services (like OpenSea). Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk.
+            Let MetaMask add NFTs you own using third-party services. Autodetecting NFTs exposes your IP and account address to these services. Enabling this feature could associate your IP address with your Ethereum address and display fake NFTs airdropped by scammers. You can add tokens manually to avoid this risk.
           </div>
         </div>
         <div

From 8b3bbd35761fbda4b115d7596b97033343423469 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Tue, 30 Jul 2024 22:11:09 +0000
Subject: [PATCH 147/236] Update Attributions

---
 attribution.txt | 86 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/attribution.txt b/attribution.txt
index 493e487992d2..00985b585d23 100644
--- a/attribution.txt
+++ b/attribution.txt
@@ -50,6 +50,34 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
+******************************
+
+aes-js
+3.0.0 <https://github.com/ricmoo/aes-js>
+The MIT License (MIT)
+
+Copyright (c) 2015 Richard Moore
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
 ******************************
 
 aes-js
@@ -2410,7 +2438,7 @@ SOFTWARE.
 ******************************
 
 @blockaid/ppom_release
-1.4.8 <>
+1.5.1 <>
 Blockaid BSL License, Version 1.0 (EPL-1.0)
 
 Licensor:  Blockaid, Inc.
@@ -10351,6 +10379,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+@ethersproject/json-wallets
+5.7.0 <https://github.com/ethers-io/ethers.js>
+MIT License
+
+Copyright (c) 2019 Richard Moore
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ******************************
 
 @ethersproject/keccak256
@@ -10655,6 +10710,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+******************************
+
+@ethersproject/wallet
+5.7.0 <https://github.com/ethers-io/ethers.js>
+MIT License
+
+Copyright (c) 2019 Richard Moore
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ******************************
 
 @ethersproject/web
@@ -11535,7 +11617,7 @@ SOFTWARE.
 ******************************
 
 fast-xml-parser
-4.3.4 <https://github.com/NaturalIntelligence/fast-xml-parser>
+4.4.1 <https://github.com/NaturalIntelligence/fast-xml-parser>
 MIT License
 
 Copyright (c) 2017 Amit Kumar Gupta

From 7efdeb05e78015b34130674e112bf282e7b6d3d5 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 31 Jul 2024 11:47:06 -0230
Subject: [PATCH 148/236] fix: Fix CircleCI `create_release_pull_request` job
 (#26246)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The `create_release_pull_request` job has been failing since we switched
to using a shallow checkout by default. It's failing because the first
step of this job uses the `yarn version` command, which expects a full
repository history for some reason. The script works again with a full
checkout.

Example failure:
https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/94314/workflows/e2b01944-7607-4714-9cac-01489cce3d2e/jobs/3510394

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

## **Related issues**

N/A

## **Manual testing steps**

I was able to reproduce the failure by running the shallow checkout
steps locally, then running the `release-bump-manifest-version.sh`
script. I tested that this worked by doing the same thing with a full
checkout. Note that you need to set the `CI, `CIRCLECI`, and
`CIRCLECI_BRANCH` environment variables for the script to work.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 30d30afd652f..f81113055666 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -401,7 +401,7 @@ jobs:
   create_release_pull_request:
     executor: node-browsers-small
     steps:
-      - run: *shallow-git-clone
+      - checkout
       - run: sudo corepack enable
       - attach_workspace:
           at: .

From 438168d164d556b2b19f1d9756f51bdc0285ceff Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 31 Jul 2024 13:08:28 -0230
Subject: [PATCH 149/236] fix: Fix `create_release_pull_request` OOM error
 (#26249)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

The `create_release_pull_request` job is failing due to a lack of memory
during the `yarn version` step. The `yarn version` command appears to
install Yarn dependencies over again. The job where we install Yarn
dependencies uses a "medium" size execution environment because we
encountered similar memory issues there, but the
`create_release_pull_request` job is still using small.

It has been updated to use a medium execution environment, which should
be enough memory given that it's what `prep-deps` uses.

Example failure:
https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/94391/workflows/4fce2a9e-2762-4c07-8617-317b0781dd27/jobs/3513290

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

## **Related issues**

N/A

## **Manual testing steps**

We should be able to reproduce this by running the job in a Docker
image. But I have not tried this. Probably easier to merge it and see if
it works in this case.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f81113055666..f38bd8c5ab46 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -399,7 +399,7 @@ jobs:
                   - builds-beta
 
   create_release_pull_request:
-    executor: node-browsers-small
+    executor: node-browsers-medium
     steps:
       - checkout
       - run: sudo corepack enable

From bcb2309f7aff8894563bdba2a66883ae72492ba7 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Wed, 31 Jul 2024 15:43:16 +0000
Subject: [PATCH 150/236] Version v12.0.1

---
 CHANGELOG.md | 8 +++++++-
 package.json | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dae39d1235c2..b0b5be04636b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.0.1]
+### Uncategorized
+- fix: Fix `create_release_pull_request` OOM error ([#26249](https://github.com/MetaMask/metamask-extension/pull/26249))
+- fix: Fix CircleCI `create_release_pull_request` job ([#26246](https://github.com/MetaMask/metamask-extension/pull/26246))
+
 ## [12.0.0]
 ### Added
 - Allow users to 'Select networks for each site' ([#24274](https://github.com/MetaMask/metamask-extension/pull/24274))
@@ -4888,7 +4893,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...HEAD
+[12.0.1]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...v12.0.1
 [12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.16...v12.0.0
 [11.16.16]: https://github.com/MetaMask/metamask-extension/compare/v11.16.15...v11.16.16
 [11.16.15]: https://github.com/MetaMask/metamask-extension/compare/v11.16.14...v11.16.15
diff --git a/package.json b/package.json
index 6209651f8d45..d4762864e9b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "private": true,
   "repository": {
     "type": "git",

From c880e07732d0ba936874a87661b84fcc791cb149 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 1 Aug 2024 10:41:13 -0230
Subject: [PATCH 151/236] chore: Update changelog to remove unneeded entries
 (#26277)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

These two entries were for release automation script changes, not user-
facing. They can be omitted.

The changelog for the current RC is now empty, but we can update it
later after we add more changes.


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

## **Related issues**

N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b5be04636b..bf9723844cb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.1]
-### Uncategorized
-- fix: Fix `create_release_pull_request` OOM error ([#26249](https://github.com/MetaMask/metamask-extension/pull/26249))
-- fix: Fix CircleCI `create_release_pull_request` job ([#26246](https://github.com/MetaMask/metamask-extension/pull/26246))
 
 ## [12.0.0]
 ### Added

From 8263f93a47350ec695f2e7e0afd8778a264209bd Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Fri, 2 Aug 2024 14:05:35 +0200
Subject: [PATCH 152/236] fix: Cherry-pick persistence fix to RC (#26305)

## **Description**

Cherry-picks
https://github.com/MetaMask/metamask-extension/commit/fcf474c4c718e32ecaf7f18335fc2bb82e2dafb3
to the RC.

Description from the original PR:

Fixes a bug where `ComposableObservableStore` would allow non-persistent
state properties in its `initialState`. This in turn would cause state
properties flagged as non-persistent to be persisted until a controller
state change.

This PR addresses this by taking the `persist` flag into account when
deriving the initial state for each controller. If the controller does
not support `metadata` or persistence is disabled, everything should
continue to work as-is.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26305?quickstart=1)
---
 app/scripts/lib/ComposableObservableStore.js  |  7 +++-
 .../lib/ComposableObservableStore.test.js     | 42 ++++++++++++++++---
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/app/scripts/lib/ComposableObservableStore.js b/app/scripts/lib/ComposableObservableStore.js
index 80d9c483d77a..def67b51240f 100644
--- a/app/scripts/lib/ComposableObservableStore.js
+++ b/app/scripts/lib/ComposableObservableStore.js
@@ -74,7 +74,12 @@ export default class ComposableObservableStore extends ObservableStore {
         );
       }
 
-      initialState[key] = store.state ?? store.getState?.();
+      const initialStoreState = store.state ?? store.getState?.();
+
+      initialState[key] =
+        this.persist && config[key].metadata
+          ? getPersistentState(initialStoreState, config[key].metadata)
+          : initialStoreState;
     }
     this.updateState(initialState);
   }
diff --git a/app/scripts/lib/ComposableObservableStore.test.js b/app/scripts/lib/ComposableObservableStore.test.js
index f00120ac27bd..7abc87cb52b6 100644
--- a/app/scripts/lib/ComposableObservableStore.test.js
+++ b/app/scripts/lib/ComposableObservableStore.test.js
@@ -25,10 +25,12 @@ class OldExampleController extends BaseControllerV1 {
 class ExampleController extends BaseController {
   static defaultState = {
     bar: 'bar',
+    baz: 'baz',
   };
 
   static metadata = {
     bar: { persist: true, anonymous: true },
+    baz: { persist: false, anonymous: true },
   };
 
   constructor({ messenger }) {
@@ -41,8 +43,8 @@ class ExampleController extends BaseController {
   }
 
   updateBar(contents) {
-    this.update(() => {
-      return { bar: contents };
+    this.update((state) => {
+      state.bar = contents;
     });
   }
 }
@@ -94,7 +96,9 @@ describe('ComposableObservableStore', () => {
     const store = new ComposableObservableStore({ controllerMessenger });
     store.updateStructure({ Example: exampleController });
     exampleController.updateBar('state');
-    expect(store.getState()).toStrictEqual({ Example: { bar: 'state' } });
+    expect(store.getState()).toStrictEqual({
+      Example: { bar: 'state', baz: 'baz' },
+    });
   });
 
   it('should update structure with all three types of stores', () => {
@@ -114,7 +118,7 @@ describe('ComposableObservableStore', () => {
     exampleController.updateBar('state');
     oldExampleController.updateBaz('state');
     expect(store.getState()).toStrictEqual({
-      Example: { bar: 'state' },
+      Example: { bar: 'state', baz: 'baz' },
       OldExample: { baz: 'state' },
       Store: 'state',
     });
@@ -139,7 +143,7 @@ describe('ComposableObservableStore', () => {
     });
 
     expect(store.getState()).toStrictEqual({
-      Example: { bar: 'state' },
+      Example: { bar: 'state', baz: 'baz' },
       OldExample: { baz: 'state' },
       Store: 'state',
     });
@@ -160,6 +164,34 @@ describe('ComposableObservableStore', () => {
     });
   });
 
+  it('should strip non-persisted state from initial state with all three types of stores', () => {
+    const controllerMessenger = new ControllerMessenger();
+    const exampleStore = new ObservableStore();
+    const exampleController = new ExampleController({
+      messenger: controllerMessenger,
+    });
+    const oldExampleController = new OldExampleController();
+    exampleStore.putState('state');
+    exampleController.updateBar('state');
+    oldExampleController.updateBaz('state');
+    const store = new ComposableObservableStore({
+      controllerMessenger,
+      persist: true,
+    });
+
+    store.updateStructure({
+      Example: exampleController,
+      OldExample: oldExampleController,
+      Store: exampleStore,
+    });
+
+    expect(store.getState()).toStrictEqual({
+      Example: { bar: 'state' },
+      OldExample: { baz: 'state' },
+      Store: 'state',
+    });
+  });
+
   it('should return flattened state', () => {
     const controllerMessenger = new ControllerMessenger();
     const fooStore = new ObservableStore({ foo: 'foo' });

From 13af9718640f49fdd935ffd475e99dbe5470dd9d Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:42:13 -0400
Subject: [PATCH 153/236] fix: handle send transaction API errors (#26253)
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.
-->

We are seeing a pair of sentry errors for a failing deconstruction
error, `Cannot destructure property 'id' of '(intermediate value)' as it
is null`:

-
https://metamask.sentry.io/issues/5093909594/?project=273505&query=is%3Aunresolved+Cannot+destructure+property+%27id%27+of&referrer=issue-stream&statsPeriod=14d&stream_index=0
-
https://metamask.sentry.io/issues/5093909594/?project=273505&query=is%3Aunresolved+Cannot+destructure+property+%27id%27+of&referrer=issue-stream&statsPeriod=14d&stream_index=0

This is because instead of returning an error when a transaction fails,
we return `null` for the metadata.

This PR addresses the underlying issue by rethrowing the error for a
failed transaction request, then adding UI treatments for the failed
transaction.

<!--
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/26253?quickstart=1)

Fixes:

1. Add an `Error` right before the `sendTransaction` background method
in `addTransactionAndRouteToConfirmationPage`
2. Go to the send flow
3. Attempt a basic send
4. Ensure that `

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

https://github.com/user-attachments/assets/0342e322-4348-47bd-8bfc-3f92db8f1001

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

https://github.com/user-attachments/assets/32ba3e75-f266-48c0-abfa-3816c4d3abd5

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

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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.
---
 .../asset-picker-amount.tsx                   |  6 +-
 ui/components/multichain/pages/send/send.js   | 44 ++++++----
 ui/ducks/send/send.test.js                    | 84 +++++++++++++++++--
 ui/store/actions.ts                           |  1 +
 4 files changed, 111 insertions(+), 24 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
index 190da522cad2..12be182cfbd3 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-amount.tsx
@@ -41,6 +41,7 @@ type AssetPickerAmountProps = OverridingUnion<
     asset: Asset;
     amount: Amount;
     isAmountLoading?: boolean;
+    error?: string;
     /**
      * Callback for when the amount changes; disables the input when undefined
      */
@@ -57,6 +58,7 @@ export const AssetPickerAmount = ({
   amount,
   onAmountChange,
   isAmountLoading,
+  error: passedError,
   ...assetPickerProps
 }: AssetPickerAmountProps) => {
   const selectedAccount = useSelector(getSelectedInternalAccount);
@@ -170,7 +172,9 @@ export const AssetPickerAmount = ({
       </Box>
       <Box display={Display.Flex}>
         {/* Only show balance if mutable */}
-        {onAmountChange && <AssetBalance asset={asset} error={error} />}
+        {onAmountChange && (
+          <AssetBalance asset={asset} error={passedError || error} />
+        )}
         {isSwapsErrorShown && (
           <Text variant={TextVariant.bodySm} color={TextColor.errorDefault}>
             {t(swapQuotesError)}
diff --git a/ui/components/multichain/pages/send/send.js b/ui/components/multichain/pages/send/send.js
index c724a042b1d3..b1b11b2d434a 100644
--- a/ui/components/multichain/pages/send/send.js
+++ b/ui/components/multichain/pages/send/send.js
@@ -58,6 +58,7 @@ import { AssetPickerAmount } from '../..';
 import useUpdateSwapsState from '../../../../hooks/useUpdateSwapsState';
 import { getIsDraftSwapAndSend } from '../../../../ducks/send/helpers';
 import { smartTransactionsListSelector } from '../../../../selectors';
+import { TRANSACTION_ERRORED_EVENT } from '../../../app/transaction-activity-log/transaction-activity-log.constants';
 import {
   SendPageAccountPicker,
   SendPageRecipientContent,
@@ -91,6 +92,7 @@ export const SendPage = () => {
   const sendAnalytics = useSelector(getSendAnalyticProperties);
 
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [error, setError] = useState(undefined);
 
   const handleSelectToken = useCallback(
     (token, isReceived) => {
@@ -151,6 +153,7 @@ export const SendPage = () => {
   const cleanup = useCallback(() => {
     dispatch(resetSendState());
     setIsSubmitting(false);
+    setError(undefined);
   }, [dispatch]);
 
   /**
@@ -229,20 +232,28 @@ export const SendPage = () => {
     event.preventDefault();
 
     setIsSubmitting(true);
-    await dispatch(signTransaction(history));
-    // prevents state update on unmounted component error
-    if (isSubmitting) {
-      setIsSubmitting(false);
+    setError(undefined);
+
+    try {
+      await dispatch(signTransaction(history));
+
+      trackEvent({
+        category: MetaMetricsEventCategory.Transactions,
+        event: 'Complete',
+        properties: {
+          ...sendAnalytics,
+          action: isSwapAndSend ? 'Submit Immediately' : 'Edit Screen',
+          legacy_event: true,
+        },
+      });
+    } catch {
+      setError(TRANSACTION_ERRORED_EVENT);
+    } finally {
+      // prevents state update on unmounted component error
+      if (isSubmitting) {
+        setIsSubmitting(false);
+      }
     }
-    trackEvent({
-      category: MetaMetricsEventCategory.Transactions,
-      event: 'Complete',
-      properties: {
-        ...sendAnalytics,
-        action: isSwapAndSend ? 'Submit Immediately' : 'Edit Screen',
-        legacy_event: true,
-      },
-    });
   };
 
   // Submit button
@@ -285,8 +296,10 @@ export const SendPage = () => {
   useUpdateSwapsState();
 
   const onAmountChange = useCallback(
-    (newAmountRaw, newAmountFormatted) =>
-      dispatch(updateSendAmount(newAmountRaw, newAmountFormatted)),
+    (newAmountRaw, newAmountFormatted) => {
+      dispatch(updateSendAmount(newAmountRaw, newAmountFormatted));
+      setError(undefined);
+    },
     [dispatch],
   );
 
@@ -316,6 +329,7 @@ export const SendPage = () => {
         <SendPageAccountPicker />
         {isSendFormShown && (
           <AssetPickerAmount
+            error={error}
             asset={transactionAsset}
             amount={amount}
             onAssetChange={handleSelectSendToken}
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index 6eac025e8f0a..cae868cd6c47 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -105,14 +105,6 @@ jest.mock('lodash', () => ({
   debounce: (fn) => fn,
 }));
 
-setBackgroundConnection({
-  addPollingTokenToAppState: jest.fn(),
-  addTransaction: jest.fn((_u, _v, cb) => {
-    cb(null, { transactionMeta: null });
-  }),
-  updateTransactionSendFlowHistory: jest.fn((_x, _y, _z, cb) => cb(null)),
-});
-
 const getTestUUIDTx = (state) => state.draftTransactions['test-uuid'];
 
 describe('Send Slice', () => {
@@ -124,6 +116,14 @@ describe('Send Slice', () => {
   let setDefaultHomeActiveTabNameStub;
 
   beforeEach(() => {
+    setBackgroundConnection({
+      addPollingTokenToAppState: jest.fn(),
+      addTransaction: jest.fn((_u, _v, cb) => {
+        cb(null, { transactionMeta: null });
+      }),
+      updateTransactionSendFlowHistory: jest.fn((_x, _y, _z, cb) => cb(null)),
+    });
+
     jest.useFakeTimers();
     getTokenStandardAndDetailsStub = jest
       .spyOn(Actions, 'getTokenStandardAndDetails')
@@ -3026,6 +3026,74 @@ describe('Send Slice', () => {
             addTransactionAndRouteToConfirmationPageStub.mock.calls[0][0].to,
           ).toStrictEqual('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2');
         });
+        it('should rethrow addTransactionAndRouteToConfirmationPage errors', async () => {
+          const tokenTransferTxState = {
+            metamask: {
+              providerConfig: {
+                chainId: CHAIN_IDS.GOERLI,
+              },
+              transactions: [
+                {
+                  id: 1,
+                  chainId: CHAIN_IDS.GOERLI,
+                  status: 'unapproved',
+                  txParams: {
+                    value: 'oldTxValue',
+                  },
+                },
+              ],
+            },
+            send: {
+              ...getInitialSendStateWithExistingTxState({
+                id: 1,
+                sendAsset: {
+                  details: {
+                    address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                  },
+                  type: 'TOKEN',
+                },
+                receiveAsset: {
+                  details: {
+                    address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                  },
+                  type: 'TOKEN',
+                },
+                recipient: {
+                  address: '4F90e18605Fd46F9F9Fab0e225D88e1ACf5F5324',
+                },
+                amount: {
+                  value: '0x1',
+                },
+              }),
+              stage: SEND_STAGES.DRAFT,
+              selectedAccount: {
+                address: '0x6784e8507A1A46443f7bDc8f8cA39bdA92A675A6',
+              },
+            },
+          };
+
+          jest.mock('../../store/actions.ts');
+
+          const store = mockStore(tokenTransferTxState);
+
+          const ERROR = new Error('rejected');
+
+          const history = { push: jest.fn() };
+
+          setBackgroundConnection({
+            addPollingTokenToAppState: jest.fn(),
+            addTransaction: jest.fn((_u, _v) => {
+              throw new Error(ERROR);
+            }),
+            updateTransactionSendFlowHistory: jest.fn((_x, _y, _z, cb) =>
+              cb(null),
+            ),
+          });
+
+          await expect(
+            store.dispatch(signTransaction(history)),
+          ).rejects.toThrow('rejected');
+        });
       });
 
       describe('with swap+send', () => {
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 651bf400ba7b..1ccdb4472441 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -1019,6 +1019,7 @@ export function addTransactionAndRouteToConfirmationPage(
     } catch (error) {
       dispatch(hideLoadingIndication());
       dispatch(displayWarning(error));
+      throw error;
     }
     return null;
   };

From 5c66497a36f8db821276fb8ce9df858e7e612aae Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Thu, 1 Aug 2024 19:20:21 -0400
Subject: [PATCH 154/236] fix: add guard for draft tx in send validation
 (#26295)
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 have discovered a sentry error for the swaps flow in extension:


https://metamask.sentry.io/issues/5659965775/?environment=production&project=273505&query=firstRelease%3A12.0.0&referrer=issue-stream&sort=freq&statsPeriod=90d&stream_index=17

This error is due to the `draftTransaction` not being defined during
validation; this is resolved with an undefined guard. This error appears
in other actions; it is resolved in these cases as well.

<!--
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/26295?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Set `state.draftTransactions[state.currentTransactionUUID]` to
`undefined` in `ducks/send/send.js` for all selectors
2. Go to send flow
3. Ensure it loads without error

## **Screenshots/Recordings**

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

### **Before**


https://github.com/user-attachments/assets/fc79f296-5a13-4b84-bb1c-d1ed8613dcad

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

### **After**


https://github.com/user-attachments/assets/8e45be4a-eaef-4ed5-b206-a56daf4b2927


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

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/ducks/send/send.js      | 17 +++++++++--
 ui/ducks/send/send.test.js | 62 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 9a6a4dd971be..d664b2897396 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -989,6 +989,10 @@ const slice = createSlice({
       const draftTransaction =
         state.draftTransactions[state.currentTransactionUUID];
 
+      if (!draftTransaction) {
+        return;
+      }
+
       // use maxFeePerGas as the multiplier if working with a FEE_MARKET transaction
       // otherwise use gasPrice
       if (
@@ -1080,7 +1084,7 @@ const slice = createSlice({
       const draftTransaction =
         state.draftTransactions[state.currentTransactionUUID];
       let amount = '0x0';
-      if (draftTransaction.sendAsset.type === AssetType.token) {
+      if (draftTransaction?.sendAsset.type === AssetType.token) {
         const decimals = draftTransaction.sendAsset.details?.decimals ?? 0;
 
         const multiplier = Math.pow(10, Number(decimals));
@@ -1292,7 +1296,7 @@ const slice = createSlice({
       state.gasTotalForLayer1 = action.payload;
       if (
         state.amountMode === AMOUNT_MODES.MAX &&
-        draftTransaction.sendAsset.type === AssetType.native
+        draftTransaction?.sendAsset.type === AssetType.native
       ) {
         slice.caseReducers.updateAmountToMax(state);
       }
@@ -1456,6 +1460,10 @@ const slice = createSlice({
       const draftTransaction =
         state.draftTransactions[state.currentTransactionUUID];
 
+      if (!draftTransaction) {
+        return;
+      }
+
       const amountValue = new Numeric(draftTransaction.amount.value, 16);
 
       switch (true) {
@@ -1557,6 +1565,11 @@ const slice = createSlice({
     validateGasField: (state) => {
       const draftTransaction =
         state.draftTransactions[state.currentTransactionUUID];
+
+      if (!draftTransaction) {
+        return;
+      }
+
       const insufficientFunds = !isBalanceSufficient({
         amount:
           draftTransaction.sendAsset.type === AssetType.native
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index cae868cd6c47..6b91fe490958 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -283,7 +283,28 @@ describe('Send Slice', () => {
         expect(draft.amount.value).toStrictEqual('0xadf7');
         expect(draft.status).toStrictEqual(SEND_STATUSES.VALID);
       });
+
+      it('should not error when draft transaction is not defined', () => {
+        const state = getInitialSendStateWithExistingTxState({
+          gas: {
+            gasPrice: '0x1',
+            maxFeePerGas: '0x2',
+            gasLimit: GAS_LIMITS.SIMPLE,
+          },
+        });
+
+        delete state.draftTransactions['test-uuid'];
+
+        const action = {
+          type: 'send/calculateGasTotal',
+        };
+
+        const runAction = () => sendReducer(state, action);
+
+        expect(runAction).not.toThrow();
+      });
     });
+
     describe('resetSendState', () => {
       it('should set the state back to a blank slate matching the initialState object', () => {
         const action = {
@@ -1076,6 +1097,29 @@ describe('Send Slice', () => {
         );
         expect(draftTransaction.status).toBe(SEND_STATUSES.INVALID);
       });
+
+      it('should not throw error when draft transaction does not exist', () => {
+        const tokenAssetState = getInitialSendStateWithExistingTxState({
+          amount: {
+            value: '0x77359400', // 2000000000
+          },
+          sendAsset: {
+            type: AssetType.token,
+            balance: '0x6fc23ac0', // 1875000000
+            details: {
+              decimals: 0,
+            },
+          },
+        });
+
+        const action = {
+          type: 'send/validateAmountField',
+        };
+
+        delete tokenAssetState.draftTransactions['test-uuid'];
+
+        expect(() => sendReducer(tokenAssetState, action)).not.toThrow();
+      });
     });
 
     describe('validateGasField', () => {
@@ -1101,6 +1145,24 @@ describe('Send Slice', () => {
           INSUFFICIENT_FUNDS_ERROR,
         );
       });
+      it('should not throw error when draft transaction does not exist', () => {
+        const gasFieldState = getInitialSendStateWithExistingTxState({
+          account: {
+            balance: '0x0',
+          },
+          gas: {
+            gasTotal: '0x1319718a5000', // 21000000000000
+          },
+        });
+
+        delete gasFieldState.draftTransactions['test-uuid'];
+
+        const action = {
+          type: 'send/validateGasField',
+        };
+
+        expect(() => sendReducer(gasFieldState, action)).not.toThrow();
+      });
     });
 
     // TODO: update this

From cc66b50d164e5015c998bc3c16709c6e5fc9bae3 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 2 Aug 2024 15:10:11 -0230
Subject: [PATCH 155/236] fix: Fix GitHub release description (#26247) (#26279)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a cherry-pick of #26247 for v12.0.1. Original description:

## **Description**

For years our release scripts have been creating GitHub releases with
empty descriptions. GitHub uses the commit message as the description as
a default, which is always a merge commit in our case, whcih isn't very
decsriptive. The release scripts are supposed to be setting the
changelog entries for the current release as the description.

This broke when we last changed our CHANGELOG.md format. Specifically it
was the release header change that broke this. We started surrounding
the version number in square brackets, which the awk script did not
expect.

The script that creates the GitHub release has been updated to pass in a
version surrounded by square brackets to the awk script, so it is again
able to find the relevant changelog entries.


[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26247?quickstart=1)

## **Related issues**

Fixes: #18468

## **Manual testing steps**

Start by checking out `master. Then look at the
`release-create-gh-release.sh` script, and run the exact same awk
command that is shown there. Replace `${tag##v}` with the release
version minus the v (e.g. `12.0.0`).

Before this PR it was `awk -v version="12.0.0" -f
.circleci/scripts/show-changelog.awk CHANGELOG.md`. This produces no
output.

After this PR, its `awk -v version="[12.0.0]" -f
.circleci/scripts/show-changelog.awk CHANGELOG.md`. This produces the
correct output.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .circleci/scripts/release-create-gh-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/scripts/release-create-gh-release.sh b/.circleci/scripts/release-create-gh-release.sh
index 37a654798b9f..29118f57b756 100755
--- a/.circleci/scripts/release-create-gh-release.sh
+++ b/.circleci/scripts/release-create-gh-release.sh
@@ -66,7 +66,7 @@ then
     install_github_cli
 
     printf '%s\n' 'Creating GitHub Release'
-    release_body="$(awk -v version="${tag##v}" -f .circleci/scripts/show-changelog.awk CHANGELOG.md)"
+    release_body="$(awk -v version="[${tag##v}]" -f .circleci/scripts/show-changelog.awk CHANGELOG.md)"
     hub release create \
         --attach builds/metamask-chrome-*.zip \
         --attach builds-mv2/metamask-firefox-*.zip \

From 8acb0a8c4dad9b1cefa5baa74fdd19c94f7cad5b Mon Sep 17 00:00:00 2001
From: Alex Donesky <adonesky@gmail.com>
Date: Fri, 2 Aug 2024 12:55:21 -0500
Subject: [PATCH 156/236] Cherry-Pick: "fix: issue where
 `setNetworkClientIdForDomain` was called without checking whether the origin
 was eligible for setting its own network (#26323)" (#26328)

CherryPicks
https://github.com/MetaMask/metamask-extension/commit/80f538eeef8200221fb18773ff5b9c67533b0008
onto v12.0.1:

> This PR fixes a issue where `setNetworkClientIdForDomain` was
frequently called with origins that had no account permissions yet
(which is the threshhold we currently set for giving site's their own
network) resulting in [a large number of silent errors in the background
that are clogging up
>
sentry](https://metamask.sentry.io/issues/5659582204/?environment=production&project=273505&qu%5B%E2%80%A6%5Derrer=issue-stream&sort=freq&statsPeriod=90d&stream_index=1).
>
> [![Open in GitHub
>
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26323?quickstart=1)
>
> Fixes:
>
https://metamask.sentry.io/issues/5659582204/?environment=production&project=273505&qu%5B%E2%80%A6%5Derrer=issue-stream&sort=freq&statsPeriod=90d&stream_index=1
---
 .../network-list-menu/network-list-menu.js    | 14 ++++--
 .../network-list-menu.test.js                 | 46 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 5 deletions(-)

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 33832a0a9f88..41beac5744bc 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.js
+++ b/ui/components/multichain/network-list-menu/network-list-menu.js
@@ -28,6 +28,7 @@ import {
   getShowNetworkBanner,
   getOriginOfCurrentTab,
   getUseRequestQueue,
+  getAllDomains,
 } from '../../../selectors';
 import ToggleButton from '../../ui/toggle-button';
 import {
@@ -76,6 +77,7 @@ export const NetworkListMenu = ({ onClose }) => {
 
   const selectedTabOrigin = useSelector(getOriginOfCurrentTab);
   const useRequestQueue = useSelector(getUseRequestQueue);
+  const domains = useSelector(getAllDomains);
 
   const dispatch = useDispatch();
   const history = useHistory();
@@ -193,10 +195,14 @@ export const NetworkListMenu = ({ onClose }) => {
             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 (useRequestQueue && selectedTabOrigin) {
+          // If presently on and connected to a dapp, communicate a change to
+          // the dapp via silent switchEthereumChain that the network has
+          // changed due to user action
+          if (
+            useRequestQueue &&
+            selectedTabOrigin &&
+            domains[selectedTabOrigin]
+          ) {
             setNetworkClientIdForDomain(selectedTabOrigin, network.id);
           }
 
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 83ebf8d03250..fa313c373752 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
@@ -7,25 +7,32 @@ import {
   CHAIN_IDS,
   MAINNET_DISPLAY_NAME,
   SEPOLIA_DISPLAY_NAME,
+  NETWORK_TYPES,
 } from '../../../../shared/constants/network';
 import { NetworkListMenu } from '.';
 
 const mockSetShowTestNetworks = jest.fn();
 const mockSetProviderType = jest.fn();
 const mockToggleNetworkMenu = jest.fn();
+const mockSetNetworkClientIdForDomain = jest.fn();
 
 jest.mock('../../../store/actions.ts', () => ({
   setShowTestNetworks: () => mockSetShowTestNetworks,
   setProviderType: () => mockSetProviderType,
   toggleNetworkMenu: () => mockToggleNetworkMenu,
+  setNetworkClientIdForDomain: (network, id) =>
+    mockSetNetworkClientIdForDomain(network, id),
 }));
 
+const MOCK_ORIGIN = 'https://portfolio.metamask.io';
+
 const render = ({
   showTestNetworks = false,
   currentChainId = '0x5',
   providerConfigId = 'chain5',
   isUnlocked = true,
-  origin = 'https://portfolio.metamask.io',
+  origin = MOCK_ORIGIN,
+  selectedTabOriginInDomainsState = true,
 } = {}) => {
   const state = {
     metamask: {
@@ -40,6 +47,11 @@ const render = ({
         showTestNetworks,
       },
       useRequestQueue: true,
+      domains: {
+        ...(selectedTabOriginInDomainsState
+          ? { [origin]: providerConfigId }
+          : {}),
+      },
     },
     activeTab: {
       origin,
@@ -51,6 +63,10 @@ const render = ({
 };
 
 describe('NetworkListMenu', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('displays important controls', () => {
     const { getByText, getByPlaceholderText } = render();
 
@@ -140,4 +156,32 @@ describe('NetworkListMenu', () => {
       document.querySelectorAll('multichain-network-list-item__delete'),
     ).toHaveLength(0);
   });
+
+  describe('selectedTabOrigin is connected to wallet', () => {
+    it('fires setNetworkClientIdForDomain when network item is clicked', () => {
+      const { getByText } = render();
+      fireEvent.click(getByText(MAINNET_DISPLAY_NAME));
+      expect(mockSetNetworkClientIdForDomain).toHaveBeenCalledWith(
+        MOCK_ORIGIN,
+        NETWORK_TYPES.MAINNET,
+      );
+    });
+
+    it('fires setNetworkClientIdForDomain when test network item is clicked', () => {
+      const { getByText } = render({ showTestNetworks: true });
+      fireEvent.click(getByText(SEPOLIA_DISPLAY_NAME));
+      expect(mockSetNetworkClientIdForDomain).toHaveBeenCalledWith(
+        MOCK_ORIGIN,
+        NETWORK_TYPES.SEPOLIA,
+      );
+    });
+  });
+
+  describe('selectedTabOrigin is not connected to wallet', () => {
+    it('does not fire setNetworkClientIdForDomain when network item is clicked', () => {
+      const { getByText } = render({ selectedTabOriginInDomainsState: false });
+      fireEvent.click(getByText(MAINNET_DISPLAY_NAME));
+      expect(mockSetNetworkClientIdForDomain).not.toHaveBeenCalled();
+    });
+  });
 });

From 517409da9840c15e272641295425bee36bca756d Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Fri, 2 Aug 2024 11:15:11 -0700
Subject: [PATCH 157/236] cherry pick: undefined market data selector (#26264)
 (#26329)

Cherry pick https://github.com/MetaMask/metamask-extension/pull/26264
from develop to v12.0.1

This did not cherry pick cleanly, since swaps code was refactored in
https://github.com/MetaMask/metamask-extension/pull/25681 between v12
and develop. But it's just 1 line moved to a different place.

Also some simple conflicts in the imports for confirm-transaction.js
---
 app/scripts/controllers/swaps.js                |  2 +-
 .../import-tokens-modal/import-tokens-modal.js  |  4 ++--
 ui/selectors/confirm-transaction.js             | 17 ++---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
index 9492b7e612de..539dcaf58e72 100644
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@@ -709,7 +709,7 @@ export default class SwapsController {
     const { marketData } = this.getTokenRatesState();
     const chainId = this._getCurrentChainId();
 
-    const tokenConversionRates = marketData[chainId];
+    const tokenConversionRates = marketData?.[chainId] ?? {};
 
     const {
       swapsState: { customGasPrice, customMaxPriorityFeePerGas },
diff --git a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
index 4ec483f13ff8..102977dc02d0 100644
--- a/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
+++ b/ui/components/multichain/import-tokens-modal/import-tokens-modal.js
@@ -26,7 +26,7 @@ import {
   getTokenList,
   getCurrentNetwork,
   getTestNetworkBackgroundColor,
-  contractExchangeRateSelector,
+  getTokenExchangeRates,
 } from '../../../selectors';
 import {
   addImportedTokens,
@@ -137,7 +137,7 @@ export const ImportTokensModal = ({ onClose }) => {
   const accounts = useSelector(getInternalAccounts);
   const tokens = useSelector((state) => state.metamask.tokens);
   const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
-  const contractExchangeRates = useSelector(contractExchangeRateSelector);
+  const contractExchangeRates = useSelector(getTokenExchangeRates);
 
   const [customAddress, setCustomAddress] = useState('');
   const [customAddressError, setCustomAddressError] = useState(null);
diff --git a/ui/selectors/confirm-transaction.js b/ui/selectors/confirm-transaction.js
index 0a86d3cbeeea..8815802bf066 100644
--- a/ui/selectors/confirm-transaction.js
+++ b/ui/selectors/confirm-transaction.js
@@ -29,7 +29,7 @@ import {
   sumHexes,
 } from '../../shared/modules/conversion.utils';
 import { getAveragePriceEstimateInHexWEI } from './custom-gas';
-import { getCurrentChainId } from './selectors';
+import { getCurrentChainId, getTokenExchangeRates } from './selectors';
 import {
   checkNetworkAndAccountSupports1559,
   getUnapprovedTransactions,
@@ -147,19 +147,6 @@ export const txDataSelector = (state) => state.confirmTransaction.txData;
 const tokenDataSelector = (state) => state.confirmTransaction.tokenData;
 const tokenPropsSelector = (state) => state.confirmTransaction.tokenProps;
 
-const contractExchangeRatesSelector = (state) => {
-  const chainId = getCurrentChainId(state);
-  const contractMarketData = state.metamask.marketData?.[chainId];
-
-  return Object.entries(contractMarketData).reduce(
-    (acc, [address, marketData]) => {
-      acc[address] = marketData?.price ?? null;
-      return acc;
-    },
-    {},
-  );
-};
-
 const tokenDecimalsSelector = createSelector(
   tokenPropsSelector,
   (tokenProps) => tokenProps && tokenProps.decimals,
@@ -212,7 +199,7 @@ export const sendTokenTokenAmountAndToAddressSelector = createSelector(
 );
 
 export const contractExchangeRateSelector = createSelector(
-  contractExchangeRatesSelector,
+  (state) => getTokenExchangeRates(state),
   tokenAddressSelector,
   (contractExchangeRates, tokenAddress) => {
     return contractExchangeRates[

From 8a3193b92f1a67c67bb1d3f859db7f9d4961b9f4 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 2 Aug 2024 17:03:45 -0230
Subject: [PATCH 158/236] Cherry pick obsolete state migration (#26330)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Cherry-pick all commits related to migration 120.2, which removes
obsolete/invalid state.

Included PRs:
* https://github.com/MetaMask/metamask-extension/pull/26265
* https://github.com/MetaMask/metamask-extension/pull/26282
* https://github.com/MetaMask/metamask-extension/pull/26298
* https://github.com/MetaMask/metamask-extension/pull/26302
* https://github.com/MetaMask/metamask-extension/pull/26308
* https://github.com/MetaMask/metamask-extension/pull/26310

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

## **Related issues**

N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**


## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Alex Donesky <adonesky@gmail.com>
Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
---
 app/scripts/migrations/120.2.test.ts | 576 +++++++++++++++++++++++++++
 app/scripts/migrations/120.2.ts      | 197 +++++++++
 app/scripts/migrations/index.js      |   1 +
 3 files changed, 774 insertions(+)
 create mode 100644 app/scripts/migrations/120.2.test.ts
 create mode 100644 app/scripts/migrations/120.2.ts

diff --git a/app/scripts/migrations/120.2.test.ts b/app/scripts/migrations/120.2.test.ts
new file mode 100644
index 000000000000..9cd64275580b
--- /dev/null
+++ b/app/scripts/migrations/120.2.test.ts
@@ -0,0 +1,576 @@
+import { cloneDeep } from 'lodash';
+import { migrate, version } from './120.2';
+
+const sentryCaptureExceptionMock = jest.fn();
+
+global.sentry = {
+  captureException: sentryCaptureExceptionMock,
+};
+
+const oldVersion = 120.1;
+
+describe('migration #120.2', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(cloneDeep(oldStorage));
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  describe('SelectedNetworkController', () => {
+    it('does nothing if SelectedNetworkController state is not set', async () => {
+      const oldState = {
+        OtherController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('removes SelectedNetworkController state if SelectedNetworkController state is not itself an object', async () => {
+      const oldState = {
+        SelectedNetworkController: 'foo',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({});
+    });
+
+    it('removes SelectedNetworkController state if "perDomainNetwork" property is present', async () => {
+      const oldState = {
+        SelectedNetworkController: {
+          domains: {
+            'https://metamask.io': {
+              network: 'mainnet',
+            },
+          },
+          perDomainNetwork: true,
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({});
+    });
+
+    it('leaves "domains" state unchanged in SelectedNetworkController if "perDomainNetwork" property is not present in SelectedNetworkController state', async () => {
+      const oldState = {
+        SelectedNetworkController: {
+          domains: {
+            'https://metamask.io': {
+              network: 'mainnet',
+            },
+            'https://test.io': {
+              network: 'linea',
+            },
+            'https://uniswap.io': {
+              network: 'optimism',
+            },
+          },
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('still migrates SelectedNetworkController state if other controllers have invalid state', async () => {
+      const oldState = {
+        NetworkController: 'invalid',
+        SelectedNetworkController: {
+          domains: {
+            'https://metamask.io': {
+              network: 'mainnet',
+            },
+          },
+          perDomainNetwork: true,
+        },
+        SnapController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data.SelectedNetworkController).toBeUndefined();
+    });
+  });
+
+  describe('SnapController', () => {
+    it('does nothing if SnapController state is not set', async () => {
+      const oldState = {
+        PreferencesController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('captures an error and leaves state unchanged if SnapController state is corrupted', async () => {
+      const oldState = {
+        SnapController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid SnapController state of type 'string'`,
+        ),
+      );
+    });
+
+    it('strips SnapController.snapErrors if it exists', async () => {
+      const oldState = {
+        SnapController: {
+          snapErrors: {},
+          snapStates: {},
+          unencryptedSnapStates: {},
+          snaps: {},
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({
+        SnapController: {
+          snapStates: {},
+          unencryptedSnapStates: {},
+          snaps: {},
+        },
+      });
+    });
+
+    it('does nothing if SnapController.snapErrors doesnt exist', async () => {
+      const oldState = {
+        SnapController: {
+          snapStates: {},
+          unencryptedSnapStates: {},
+          snaps: {},
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('still migrates SnapController state if other controllers have invalid state', async () => {
+      const oldState = {
+        NetworkController: 'invalid',
+        SelectedNetworkController: 'invalid',
+        SnapController: {
+          snapErrors: {},
+          snapStates: {},
+          unencryptedSnapStates: {},
+          snaps: {},
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data.SnapController).toEqual({
+        snapStates: {},
+        unencryptedSnapStates: {},
+        snaps: {},
+      });
+    });
+  });
+
+  describe('NetworkController', () => {
+    it('does nothing if NetworkController state is not set', async () => {
+      const oldState = {
+        PreferencesController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('captures an error and leaves state unchanged if NetworkController state is corrupted', async () => {
+      const oldState = {
+        NetworkController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid NetworkController state of type 'string'`,
+        ),
+      );
+    });
+
+    it('captures an error and leaves state unchanged if providerConfig state is corrupted', async () => {
+      const oldState = {
+        NetworkController: {
+          providerConfig: 'invalid',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid NetworkController providerConfig state of type 'string'`,
+        ),
+      );
+    });
+
+    it('captures an error and leaves state unchanged if networkConfigurations state is corrupted', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurations: 'invalid',
+          providerConfig: {},
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid NetworkController networkConfigurations state of type 'string'`,
+        ),
+      );
+    });
+
+    it('does nothing if obsolete properties and providerConfig are not set', async () => {
+      const oldState = {
+        NetworkController: {
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('does nothing if obsolete properties are not set and providerConfig is set to undefined', async () => {
+      const oldState = {
+        NetworkController: {
+          // This should be impossible because `undefined` cannot be returned from persisted state,
+          // it's not valid JSON. But a bug in migration 14 ends up setting this to `undefined`.
+          providerConfig: undefined,
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('does nothing if obsolete properties and providerConfig id are not set', async () => {
+      const oldState = {
+        NetworkController: {
+          providerConfig: {},
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('does not remove a valid providerConfig id', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurations: {
+            'valid-id': {},
+          },
+          providerConfig: {
+            id: 'valid-id',
+          },
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('removes all obsolete properties', async () => {
+      const oldState = {
+        NetworkController: {
+          networkDetails: {},
+          networkId: 'example',
+          networkStatus: 'example',
+          previousProviderStore: 'example',
+          provider: 'example',
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({
+        NetworkController: {
+          selectedNetworkClientId: 'example',
+        },
+      });
+    });
+
+    it('removes providerConfig id if network configuration is missing', async () => {
+      const oldState = {
+        NetworkController: {
+          providerConfig: {
+            id: 'invalid-id',
+          },
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data.NetworkController).toEqual({
+        providerConfig: {},
+        selectedNetworkClientId: 'example',
+      });
+    });
+
+    it('removes providerConfig id that does not match any network configuration', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurations: {
+            'valid-id': {},
+          },
+          providerConfig: {
+            id: 'invalid-id',
+          },
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data.NetworkController).toEqual({
+        networkConfigurations: {
+          'valid-id': {},
+        },
+        providerConfig: {},
+        selectedNetworkClientId: 'example',
+      });
+    });
+
+    it('removes providerConfig id with an invalid type', async () => {
+      const oldState = {
+        NetworkController: {
+          networkConfigurations: {
+            '123': {},
+          },
+          providerConfig: {
+            id: 123,
+          },
+          selectedNetworkClientId: 'example',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data.NetworkController).toEqual({
+        networkConfigurations: {
+          '123': {},
+        },
+        providerConfig: {},
+        selectedNetworkClientId: 'example',
+      });
+    });
+
+    it('still migrates NetworkController state if other controllers have invalid state', async () => {
+      const oldState = {
+        NetworkController: {
+          networkDetails: {},
+          networkId: 'example',
+          networkStatus: 'example',
+          previousProviderStore: 'example',
+          provider: 'example',
+          selectedNetworkClientId: 'example',
+        },
+        SelectedNetworkController: 'invalid',
+        SnapController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data.NetworkController).toEqual({
+        selectedNetworkClientId: 'example',
+      });
+    });
+  });
+
+  describe('PhishingController', () => {
+    it('does nothing if PhishingController state is not set', async () => {
+      const oldState = {
+        PreferencesController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('captures an error and leaves state unchanged if PhishingController state is corrupted', async () => {
+      const oldState = {
+        PhishingController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid PhishingController state of type 'string'`,
+        ),
+      );
+    });
+
+    it('does nothing if obsolete properties are not set', async () => {
+      const oldState = {
+        PhishingController: {
+          phishingLists: [],
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('removes all obsolete properties', async () => {
+      const oldState = {
+        PhishingController: {
+          listState: {},
+          phishingLists: [],
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({
+        PhishingController: {
+          phishingLists: [],
+        },
+      });
+    });
+
+    it('still migrates PhishingController state if other controllers have invalid state', async () => {
+      const oldState = {
+        NetworkController: 'invalid',
+        PhishingController: {
+          listState: {},
+          phishingLists: [],
+        },
+        SelectedNetworkController: 'invalid',
+        SnapController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data.PhishingController).toEqual({
+        phishingLists: [],
+      });
+    });
+  });
+});
diff --git a/app/scripts/migrations/120.2.ts b/app/scripts/migrations/120.2.ts
new file mode 100644
index 000000000000..06e6cc091b9e
--- /dev/null
+++ b/app/scripts/migrations/120.2.ts
@@ -0,0 +1,197 @@
+import { cloneDeep } from 'lodash';
+import { hasProperty, isObject } from '@metamask/utils';
+import log from 'loglevel';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 120.2;
+
+/**
+ * This migration removes any dangling instances of SelectedNetworkController.perDomainNetwork and SnapController.snapErrors
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+/**
+ * Remove obsolete SnapController state
+ *
+ * The `snapErrors` property was never intended to be persisted, but the initial state for this
+ * property was accidentally persisted for some users due to a bug. See #26280 for details.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function removeObsoleteSnapControllerState(
+  state: Record<string, unknown>,
+): void {
+  if (!hasProperty(state, 'SnapController')) {
+    return;
+  } else if (!isObject(state.SnapController)) {
+    global.sentry?.captureException?.(
+      new Error(
+        `Migration ${version}: Invalid SnapController state of type '${typeof state.SnapController}'`,
+      ),
+    );
+    return;
+  }
+
+  delete state.SnapController.snapErrors;
+}
+
+/**
+ * Remove obsolete `perDomainNetwork` property from SelectedNetworkController state.
+ *
+ * We don't know exactly why yet, but we see from Sentry that some users have this property still
+ * in state. It is no longer used.
+ *
+ * If we detect that the state is corrupted or that this property is present, we are fixing it by
+ * erasing the state. The consequences of this state being erased are minimal, and this was easier
+ * than fixing state corruption without resetting it.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function removeObsoleteSelectedNetworkControllerState(
+  state: Record<string, unknown>,
+): void {
+  if (!hasProperty(state, 'SelectedNetworkController')) {
+    return;
+  }
+  if (!isObject(state.SelectedNetworkController)) {
+    console.error(
+      `Migration ${version}: Invalid SelectedNetworkController state of type '${typeof state.SelectedNetworkController}'`,
+    );
+    delete state.SelectedNetworkController;
+  } else if (hasProperty(state.SelectedNetworkController, 'perDomainNetwork')) {
+    delete state.SelectedNetworkController;
+  }
+}
+
+/**
+ * Remove obsolete NetworkController state.
+ *
+ * We don't know exactly why yet, but we see from Sentry that some users have these properties
+ * in state. They should have been removed by migrations long ago. They are no longer used.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function removeObsoleteNetworkControllerState(
+  state: Record<string, unknown>,
+): void {
+  if (!hasProperty(state, 'NetworkController')) {
+    return;
+  } else if (!isObject(state.NetworkController)) {
+    global.sentry?.captureException?.(
+      new Error(
+        `Migration ${version}: Invalid NetworkController state of type '${typeof state.NetworkController}'`,
+      ),
+    );
+    return;
+  }
+
+  const networkControllerState = state.NetworkController;
+
+  // Check for invalid `providerConfig.id`, and remove if found
+  if (
+    hasProperty(networkControllerState, 'providerConfig') &&
+    // This should be impossible because `undefined` cannot be returned from persisted state,
+    // it's not valid JSON. But a bug in migration 14 ends up setting this to `undefined`.
+    networkControllerState.providerConfig !== undefined
+  ) {
+    if (!isObject(networkControllerState.providerConfig)) {
+      global.sentry?.captureException?.(
+        new Error(
+          `Migration ${version}: Invalid NetworkController providerConfig state of type '${typeof state
+            .NetworkController.providerConfig}'`,
+        ),
+      );
+      return;
+    }
+    const { providerConfig } = networkControllerState;
+
+    const validNetworkConfigurationIds = [];
+    if (hasProperty(networkControllerState, 'networkConfigurations')) {
+      if (!isObject(networkControllerState.networkConfigurations)) {
+        global.sentry?.captureException?.(
+          new Error(
+            `Migration ${version}: Invalid NetworkController networkConfigurations state of type '${typeof networkControllerState.networkConfigurations}'`,
+          ),
+        );
+        return;
+      }
+
+      validNetworkConfigurationIds.push(
+        ...Object.keys(networkControllerState.networkConfigurations),
+      );
+    }
+
+    if (hasProperty(providerConfig, 'id')) {
+      if (
+        typeof providerConfig.id !== 'string' ||
+        !validNetworkConfigurationIds.includes(providerConfig.id)
+      ) {
+        log.warn(
+          `Migration ${version}: Removing invalid provider id ${providerConfig.id}`,
+        );
+        delete providerConfig.id;
+      }
+    }
+  }
+
+  delete networkControllerState.networkDetails;
+  delete networkControllerState.networkId;
+  delete networkControllerState.networkStatus;
+  delete networkControllerState.previousProviderStore;
+  delete networkControllerState.provider;
+}
+
+/**
+ * Remove obsolete `listState` property from PhishingController state.
+ *
+ * We don't know exactly why yet, but we see from Sentry that some users have this property still
+ * in state. It is no longer used.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function removeObsoletePhishingControllerState(
+  state: Record<string, unknown>,
+): void {
+  if (!hasProperty(state, 'PhishingController')) {
+    return;
+  } else if (!isObject(state.PhishingController)) {
+    global.sentry.captureException(
+      new Error(
+        `Migration ${version}: Invalid PhishingController state of type '${typeof state.PhishingController}'`,
+      ),
+    );
+    return;
+  }
+  if (hasProperty(state.PhishingController, 'listState')) {
+    delete state.PhishingController.listState;
+  }
+}
+
+/**
+ * Remove obsolete controller state.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function transformState(state: Record<string, unknown>): void {
+  removeObsoleteSnapControllerState(state);
+  removeObsoleteSelectedNetworkControllerState(state);
+  removeObsoleteNetworkControllerState(state);
+  removeObsoletePhishingControllerState(state);
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index a07558c8c4bd..acf731d08d34 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -132,6 +132,7 @@ const migrations = [
   require('./119'),
   require('./120'),
   require('./120.1'),
+  require('./120.2'),
 ];
 
 export default migrations;

From 624572529ff25d4bcff464c5f7ee3b3436e3f782 Mon Sep 17 00:00:00 2001
From: Danica Shen <zhaodanica@gmail.com>
Date: Fri, 2 Aug 2024 23:37:27 +0100
Subject: [PATCH 159/236] fix(2946): disable the 'restore backup' in advanced
 settings (#26338)
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**
Manual Cherry-pick from
https://github.com/MetaMask/metamask-extension/pull/26325.

There were no merge conflicts when picking these commits

<!--
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/26338?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/de/messages.json                 |   9 --
 app/_locales/el/messages.json                 |   9 --
 app/_locales/en/messages.json                 |   9 --
 app/_locales/en_GB/messages.json              |   9 --
 app/_locales/es/messages.json                 |   9 --
 app/_locales/fr/messages.json                 |   9 --
 app/_locales/hi/messages.json                 |   9 --
 app/_locales/id/messages.json                 |   9 --
 app/_locales/it/messages.json                 |   3 -
 app/_locales/ja/messages.json                 |   9 --
 app/_locales/ko/messages.json                 |   9 --
 app/_locales/pt/messages.json                 |   9 --
 app/_locales/ru/messages.json                 |   9 --
 app/_locales/tl/messages.json                 |   9 --
 app/_locales/tr/messages.json                 |   9 --
 app/_locales/vi/messages.json                 |   9 --
 app/_locales/zh_CN/messages.json              |   9 --
 .../e2e/tests/settings/backup-restore.spec.js |  54 ---------
 .../advanced-tab.component.test.js.snap       |  38 ------
 .../advanced-tab/advanced-tab.component.js    | 110 ------------------
 .../advanced-tab.component.test.js            |   6 -
 .../advanced-tab/advanced-tab.container.js    |   2 -
 22 files changed, 357 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 666b5d464fdb..5122ce4c824f 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1263,9 +1263,6 @@
   "data": {
     "message": "Daten"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Ihre Daten konnten nicht wiederhergestellt werden. Die Datei scheint beschädigt zu sein."
-  },
   "dataHex": {
     "message": "Hexadezimal"
   },
@@ -4184,12 +4181,6 @@
   "restore": {
     "message": "Wiederherstellen"
   },
-  "restoreFailed": {
-    "message": "Wiederherstellung Ihrer Daten aus der bereitgestellten Datei nicht möglich"
-  },
-  "restoreSuccessful": {
-    "message": "Ihre Daten wurden erfolgreich wiederhergestellt."
-  },
   "restoreUserData": {
     "message": "Benutzerdaten wiederherstellen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 8875f05c05d2..72ecc4fb2b40 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -1263,9 +1263,6 @@
   "data": {
     "message": "Δεδομένα"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Δεν μπορείτε να επαναφέρετε τα δεδομένα σας. Το αρχείο φαίνεται να είναι κατεστραμμένο."
-  },
   "dataHex": {
     "message": "Δεκαεξαδικός"
   },
@@ -4184,12 +4181,6 @@
   "restore": {
     "message": "Επαναφορά"
   },
-  "restoreFailed": {
-    "message": "Δεν είναι δυνατή η επαναφορά των δεδομένων σας από το αρχείο που δόθηκε"
-  },
-  "restoreSuccessful": {
-    "message": "Επιτυχής επαναφορά των δεδομένων σας"
-  },
   "restoreUserData": {
     "message": "Επαναφορά δεδομένων χρήστη"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 4d510adadc8e..046fdb5423e6 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1282,9 +1282,6 @@
   "data": {
     "message": "Data"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Can not restore your data. The file appears to be corrupt."
-  },
   "dataCollectionForMarketing": {
     "message": "Data collection for marketing"
   },
@@ -4267,12 +4264,6 @@
   "restore": {
     "message": "Restore"
   },
-  "restoreFailed": {
-    "message": "Can not restore your data from the file provided"
-  },
-  "restoreSuccessful": {
-    "message": "Your data has been restored successfully"
-  },
   "restoreUserData": {
     "message": "Restore user data"
   },
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index 551aec93bca3..1787f059bea9 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -1458,9 +1458,6 @@
   "data": {
     "message": "Data"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Can not restore your data. The file appears to be corrupt."
-  },
   "dataCollectionForMarketing": {
     "message": "Data collection for marketing"
   },
@@ -4421,12 +4418,6 @@
   "restore": {
     "message": "Restore"
   },
-  "restoreFailed": {
-    "message": "Can not restore your data from the file provided"
-  },
-  "restoreSuccessful": {
-    "message": "Your data has been restored successfully"
-  },
   "restoreUserData": {
     "message": "Restore user data"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 39d6cde96d57..7c6433de34b5 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1260,9 +1260,6 @@
   "data": {
     "message": "Datos"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "No se pueden restaurar sus datos. El archivo parece estar corrupto."
-  },
   "dataHex": {
     "message": "Hex"
   },
@@ -4181,12 +4178,6 @@
   "restore": {
     "message": "Restaurar"
   },
-  "restoreFailed": {
-    "message": "No se pueden restaurar sus datos desde el archivo proporcionado"
-  },
-  "restoreSuccessful": {
-    "message": "Sus datos se restauraron correctamente"
-  },
   "restoreUserData": {
     "message": "Restaure sus datos de usuario"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 96f9be9a4c8f..4b367851c1c0 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -1263,9 +1263,6 @@
   "data": {
     "message": "Données"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Impossible de restaurer vos données. Le fichier semble corrompu."
-  },
   "dataHex": {
     "message": "Hex"
   },
@@ -4184,12 +4181,6 @@
   "restore": {
     "message": "Restaurer"
   },
-  "restoreFailed": {
-    "message": "Impossible de restaurer vos données à partir du fichier fourni"
-  },
-  "restoreSuccessful": {
-    "message": "Vos données ont été restaurées avec succès"
-  },
   "restoreUserData": {
     "message": "Restaurer les données de l’utilisateur"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index db278acc5b6f..9fa0df97497e 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -1260,9 +1260,6 @@
   "data": {
     "message": "डेटा"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "आपका डेटा रीस्टोर नहीं किया जा सकता। लगता है फाइल करप्ट हुई है।"
-  },
   "dataHex": {
     "message": "हेक्स"
   },
@@ -4181,12 +4178,6 @@
   "restore": {
     "message": "रीस्टोर करें"
   },
-  "restoreFailed": {
-    "message": "प्रदान की गई फाइल से आपके डेटा को रीस्टोर नहीं किया जा सकता"
-  },
-  "restoreSuccessful": {
-    "message": "आपके डेटा को सफलतापूर्वक रीस्टोर किया गया है"
-  },
   "restoreUserData": {
     "message": "यूज़र डेटा रीस्टोर करें"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index f1158182ef5c..8b836b6b1433 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -1263,9 +1263,6 @@
   "data": {
     "message": "Data"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Tidak dapat memulihkan data Anda. File tampaknya rusak."
-  },
   "dataHex": {
     "message": "Hex"
   },
@@ -4184,12 +4181,6 @@
   "restore": {
     "message": "Pulihkan"
   },
-  "restoreFailed": {
-    "message": "Tidak dapat memulihkan data Anda dari berkas yang disediakan"
-  },
-  "restoreSuccessful": {
-    "message": "Data Anda telah berhasil dipulihkan"
-  },
   "restoreUserData": {
     "message": "Pulihkan data pengguna"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 2ca832f39006..cea9dde6fcfb 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -633,9 +633,6 @@
   "darkTheme": {
     "message": "Scuro"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Impossibile ripristinare i tuoi dati. Il file sembra essere corrotto."
-  },
   "decimal": {
     "message": "Precisione Decimali"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 5734f8275e2f..f49fefb0d6ad 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -1260,9 +1260,6 @@
   "data": {
     "message": "データ"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "データを復元できません。ファイルが破損しているようです。"
-  },
   "dataHex": {
     "message": "16進法"
   },
@@ -4181,12 +4178,6 @@
   "restore": {
     "message": "復元"
   },
-  "restoreFailed": {
-    "message": "提供されたファイルからデータを復元できません"
-  },
-  "restoreSuccessful": {
-    "message": "データが復元されました"
-  },
   "restoreUserData": {
     "message": "ユーザーデータの復元"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 6961d688203f..c0a357c26e23 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -1260,9 +1260,6 @@
   "data": {
     "message": "데이터"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "사용자 데이터를 복구할 수 없습니다. 파일이 손상된 것 같습니다."
-  },
   "dataHex": {
     "message": "헥스"
   },
@@ -4181,12 +4178,6 @@
   "restore": {
     "message": "복구"
   },
-  "restoreFailed": {
-    "message": "제공된 파일에서 데이터를 복구할 수 없습니다."
-  },
-  "restoreSuccessful": {
-    "message": "데이터가 성공적으로 복구되었습니다."
-  },
   "restoreUserData": {
     "message": "사용자 데이터 복구"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 70e6a4a6e273..8e29862c5b47 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -1263,9 +1263,6 @@
   "data": {
     "message": "Dados"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Não é possível restaurar seus dados. O arquivo parece estar corrompido."
-  },
   "dataHex": {
     "message": "Hex"
   },
@@ -4184,12 +4181,6 @@
   "restore": {
     "message": "Restaurar"
   },
-  "restoreFailed": {
-    "message": "Não foi possível restaurar seus dados a partir do arquivo fornecido"
-  },
-  "restoreSuccessful": {
-    "message": "Seus dados foram restaurados com sucesso"
-  },
   "restoreUserData": {
     "message": "Restaurar dados do usuário"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index ec49daa88cb1..36dda82f0a49 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -1263,9 +1263,6 @@
   "data": {
     "message": "Данные"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Не удается восстановить ваши данные. Файл, по-видимому, поврежден."
-  },
   "dataHex": {
     "message": "Шестнадцатиричные"
   },
@@ -4184,12 +4181,6 @@
   "restore": {
     "message": "Восстановить"
   },
-  "restoreFailed": {
-    "message": "Не удается восстановить ваши данные из предоставленного файла"
-  },
-  "restoreSuccessful": {
-    "message": "Ваши данные успешно восстановлены"
-  },
   "restoreUserData": {
     "message": "Восстановить пользовательские данные"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index c16626c0caf1..b265f085f5b1 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -1260,9 +1260,6 @@
   "data": {
     "message": "Datos"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Hindi maibalik ang iyong data. Mukhang sira ang file."
-  },
   "dataHex": {
     "message": "Hex"
   },
@@ -4181,12 +4178,6 @@
   "restore": {
     "message": "Ibalik"
   },
-  "restoreFailed": {
-    "message": "Hindi maibalik ang iyong data mula sa file na ibinigay"
-  },
-  "restoreSuccessful": {
-    "message": "Ang iyong data ay matagumpay na naibalik"
-  },
   "restoreUserData": {
     "message": "Ibalik ang data ng user"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index d1b37a3f3e9f..33c52d5800a1 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -1263,9 +1263,6 @@
   "data": {
     "message": "Veri"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Verileriniz geri yüklenemiyor. Dosya bozuk gibi görünüyor."
-  },
   "dataHex": {
     "message": "On Altılı"
   },
@@ -4184,12 +4181,6 @@
   "restore": {
     "message": "Geri Yükle"
   },
-  "restoreFailed": {
-    "message": "Sunulan dosyadan verileriniz geri yüklenemiyor"
-  },
-  "restoreSuccessful": {
-    "message": "Verileriniz başarılı bir şekilde geri yüklendi"
-  },
   "restoreUserData": {
     "message": "Kullanıcı verilerini geri yükle"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index f3c673274ced..58d91c1372d6 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -1260,9 +1260,6 @@
   "data": {
     "message": "Dữ liệu"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "Không thể khôi phục dữ liệu của bạn. Tập tin có vẻ đã bị hỏng."
-  },
   "dataHex": {
     "message": "Thập lục phân"
   },
@@ -4181,12 +4178,6 @@
   "restore": {
     "message": "Khôi phục"
   },
-  "restoreFailed": {
-    "message": "Không thể khôi phục dữ liệu của bạn từ tập tin được cung cấp"
-  },
-  "restoreSuccessful": {
-    "message": "Dữ liệu của bạn đã được khôi phục thành công"
-  },
   "restoreUserData": {
     "message": "Khôi phục dữ liệu người dùng"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 2894a43fc0fb..3c7bcae5e238 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1260,9 +1260,6 @@
   "data": {
     "message": "数据"
   },
-  "dataBackupSeemsCorrupt": {
-    "message": "无法还原数据。文件似乎已损坏。"
-  },
   "dataHex": {
     "message": "十六进制"
   },
@@ -4181,12 +4178,6 @@
   "restore": {
     "message": "恢复"
   },
-  "restoreFailed": {
-    "message": "无法使用所提供的文件恢复数据"
-  },
-  "restoreSuccessful": {
-    "message": "您的数据已成功恢复"
-  },
   "restoreUserData": {
     "message": "恢复用户数据"
   },
diff --git a/test/e2e/tests/settings/backup-restore.spec.js b/test/e2e/tests/settings/backup-restore.spec.js
index 4ad2b9a5b7a8..9385e8c5ada5 100644
--- a/test/e2e/tests/settings/backup-restore.spec.js
+++ b/test/e2e/tests/settings/backup-restore.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const { promises: fs } = require('fs');
-const path = require('path');
 const {
   defaultGanacheOptions,
   withFixtures,
@@ -39,13 +38,6 @@ const getBackupJson = async () => {
   }
 };
 
-const restoreFile = path.join(
-  __dirname,
-  '../..',
-  'restore',
-  'MetaMaskUserData.json',
-);
-
 describe('Backup and Restore', function () {
   it('should backup the account settings', async function () {
     if (process.env.SELENIUM_BROWSER === 'chrome') {
@@ -88,50 +80,4 @@ describe('Backup and Restore', function () {
       },
     );
   });
-
-  it('should restore the account settings', async function () {
-    if (process.env.SELENIUM_BROWSER === 'chrome') {
-      // Chrome shows OS level download prompt which can't be dismissed by Selenium
-      this.skip();
-    }
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        ganacheOptions: defaultGanacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        // Restore
-        await driver.clickElement(
-          '[data-testid="account-options-menu-button"]',
-        );
-        await driver.clickElement({ text: 'Settings', tag: 'div' });
-        await driver.clickElement({ text: 'Advanced', tag: 'div' });
-        const restore = await driver.findElement('#restore-file');
-        await restore.sendKeys(restoreFile);
-
-        // Dismiss success message
-        await driver.waitForSelector({
-          css: '[data-testid="restore-user-data-banner-alert-description"]',
-          text: 'Your data has been restored successfully',
-        });
-        await driver.clickElement({ text: 'Dismiss', tag: 'button' });
-
-        // Verify restore
-        await driver.clickElement({ text: 'Contacts', tag: 'div' });
-
-        const recipientLabel = await driver.findElement(
-          '[data-testid="address-list-item-label"]',
-        );
-        assert.equal('Test Account', await recipientLabel.getText());
-
-        const recipientAddress = await driver.findElement(
-          '[data-testid="address-list-item-address"]',
-        );
-        assert.equal('0x0c54F...7AaFb', await recipientAddress.getText());
-      },
-    );
-  });
 });
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 39f2a38c9f88..d4a405c24735 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
@@ -557,44 +557,6 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         </div>
       </div>
     </div>
-    <div
-      class="mm-box settings-page__content-row mm-box--display-flex mm-box--flex-direction-column"
-      data-testid="advanced-setting-data-restore"
-    >
-      <div
-        class="settings-page__content-item"
-      >
-        <span>
-          Restore user data
-        </span>
-        <span
-          class="settings-page__content-description"
-        >
-          You can restore data like contacts and preferences from a backup file.
-        </span>
-      </div>
-      <div
-        class="settings-page__content-item"
-      >
-        <div
-          class="settings-page__content-item-col"
-        >
-          <label
-            class="button btn btn--rounded btn-secondary btn--large settings-page__button"
-            for="restore-file"
-          >
-            Restore
-          </label>
-          <input
-            accept=".json"
-            data-testid="restore-file"
-            id="restore-file"
-            style="visibility: hidden;"
-            type="file"
-          />
-        </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-dismiss-reminder"
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 2a2a759d5a96..c2b449308cc5 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -8,7 +8,6 @@ import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../../shared/constants/prefe
 import { SMART_TRANSACTIONS_LEARN_MORE_URL } from '../../../../shared/constants/smartTransactions';
 import {
   BannerAlert,
-  BannerAlertSeverity,
   Box,
   ButtonLink,
   ButtonLinkSize,
@@ -33,8 +32,6 @@ import {
   handleSettingsRefs,
 } from '../../../helpers/utils/settings-search';
 
-const CORRUPT_JSON_FILE = 'CORRUPT_JSON_FILE';
-
 export default class AdvancedTab extends PureComponent {
   static contextTypes = {
     t: PropTypes.func,
@@ -61,7 +58,6 @@ export default class AdvancedTab extends PureComponent {
     setDismissSeedBackUpReminder: PropTypes.func.isRequired,
     dismissSeedBackUpReminder: PropTypes.bool.isRequired,
     backupUserData: PropTypes.func.isRequired,
-    restoreUserData: PropTypes.func.isRequired,
     setDisabledRpcMethodPreference: PropTypes.func.isRequired,
     disabledRpcMethodPreferences: PropTypes.shape({
       eth_sign: PropTypes.bool.isRequired,
@@ -74,9 +70,6 @@ export default class AdvancedTab extends PureComponent {
     autoLockTimeLimit: this.props.autoLockTimeLimit,
     autoLockTimeLimitBeforeNormalization: this.props.autoLockTimeLimit,
     lockTimeError: '',
-    showResultMessage: false,
-    restoreSuccessful: true,
-    restoreMessage: null,
   };
 
   settingsRefs = Array(
@@ -113,39 +106,6 @@ export default class AdvancedTab extends PureComponent {
     });
   }
 
-  async handleFileUpload(event) {
-    /**
-     * we need this to be able to access event.target after
-     * the event handler has been called. [Synthetic Event Pooling, pre React 17]
-     *
-     * @see https://fb.me/react-event-pooling
-     */
-    event.persist();
-    const file = event.target.files[0];
-    const jsonString = await this.getTextFromFile(file);
-    /**
-     * so that we can restore same file again if we want to.
-     * chrome blocks uploading same file twice.
-     */
-    event.target.value = '';
-    try {
-      const result = await this.props.restoreUserData(jsonString);
-      this.setState({
-        showResultMessage: true,
-        restoreSuccessful: result,
-        restoreMessage: null,
-      });
-    } catch (e) {
-      if (e.message.match(/Unexpected.+JSON/iu)) {
-        this.setState({
-          showResultMessage: true,
-          restoreSuccessful: false,
-          restoreMessage: CORRUPT_JSON_FILE,
-        });
-      }
-    }
-  }
-
   backupUserData = async () => {
     const { fileName, data } = await this.props.backupUserData();
     exportAsFile(fileName, data, ExportableContentType.JSON);
@@ -677,75 +637,6 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
-  renderRestoreUserData() {
-    const { t } = this.context;
-    const { showResultMessage, restoreSuccessful, restoreMessage } = this.state;
-
-    const defaultRestoreMessage = restoreSuccessful
-      ? t('restoreSuccessful')
-      : t('restoreFailed');
-    const restoreMessageToRender =
-      restoreMessage === CORRUPT_JSON_FILE
-        ? t('dataBackupSeemsCorrupt')
-        : defaultRestoreMessage;
-
-    return (
-      <Box
-        ref={this.settingsRefs[12]}
-        className="settings-page__content-row"
-        data-testid="advanced-setting-data-restore"
-        display={Display.Flex}
-        flexDirection={FlexDirection.Column}
-      >
-        <div className="settings-page__content-item">
-          <span>{t('restoreUserData')}</span>
-          <span className="settings-page__content-description">
-            {t('restoreUserDataDescription')}
-          </span>
-        </div>
-        <div className="settings-page__content-item">
-          <div className="settings-page__content-item-col">
-            <label
-              htmlFor="restore-file"
-              className="button btn btn--rounded btn-secondary btn--large settings-page__button"
-            >
-              {t('restore')}
-            </label>
-            <input
-              id="restore-file"
-              data-testid="restore-file"
-              style={{ visibility: 'hidden' }}
-              type="file"
-              accept=".json"
-              onChange={(e) => this.handleFileUpload(e)}
-            />
-          </div>
-          {showResultMessage && (
-            <BannerAlert
-              severity={
-                restoreSuccessful
-                  ? BannerAlertSeverity.Success
-                  : BannerAlertSeverity.Danger
-              }
-              description={restoreMessageToRender}
-              descriptionProps={{
-                'data-testid': 'restore-user-data-banner-alert-description',
-              }}
-              actionButtonLabel={t('dismiss')}
-              actionButtonOnClick={() => {
-                this.setState({
-                  showResultMessage: false,
-                  restoreSuccessful: true,
-                  restoreMessage: null,
-                });
-              }}
-            />
-          )}
-        </div>
-      </Box>
-    );
-  }
-
   render() {
     const { warning } = this.props;
 
@@ -762,7 +653,6 @@ export default class AdvancedTab extends PureComponent {
         {this.renderUseNonceOptIn()}
         {this.renderAutoLockTimeLimit()}
         {this.renderUserDataBackup()}
-        {this.renderRestoreUserData()}
         {this.renderDismissSeedBackupReminderControl()}
         {this.renderToggleEthSignControl()}
       </div>
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 3982485b5178..cf55a9ac3740 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -33,12 +33,6 @@ describe('AdvancedTab Component', () => {
     expect(backupButton).toBeInTheDocument();
   });
 
-  it('should render restore button', () => {
-    const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
-    const restoreFile = queryByTestId('restore-file');
-    expect(restoreFile).toBeInTheDocument();
-  });
-
   it('should default the auto-lockout time to 0', () => {
     const { queryByTestId } = renderWithProvider(<AdvancedTab />, mockStore);
     const autoLockoutTime = queryByTestId('auto-lockout-time');
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index a0dcd4a7bcc3..ce818363baa1 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -6,7 +6,6 @@ import { getPreferences } from '../../../selectors';
 import {
   backupUserData,
   displayWarning,
-  restoreUserData,
   setAutoLockTimeLimit,
   setDisabledRpcMethodPreference,
   setDismissSeedBackUpReminder,
@@ -56,7 +55,6 @@ export const mapStateToProps = (state) => {
 export const mapDispatchToProps = (dispatch) => {
   return {
     backupUserData: () => backupUserData(),
-    restoreUserData: (jsonString) => restoreUserData(jsonString),
     setHexDataFeatureFlag: (shouldShow) =>
       dispatch(setFeatureFlag('sendHexData', shouldShow)),
     displayWarning: (warning) => dispatch(displayWarning(warning)),

From 219dca57974f42513ac6bd445303dfa4fdba05ea Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 5 Aug 2024 11:13:49 -0230
Subject: [PATCH 160/236] Cherry pick 2456ba3056 (#26336) to v12.0.1 (#26347)

Cherry pick 2456ba3056 (#26336) to v12.0.1
---
 app/scripts/lib/stream-utils.js    | 3 ++-
 app/scripts/metamask-controller.js | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/scripts/lib/stream-utils.js b/app/scripts/lib/stream-utils.js
index db50728669fd..4c9a26a457bc 100644
--- a/app/scripts/lib/stream-utils.js
+++ b/app/scripts/lib/stream-utils.js
@@ -18,7 +18,8 @@ export function setupMultiplex(connectionStream) {
    */
   mux.ignoreStream(EXTENSION_MESSAGES.CONNECTION_READY);
   pipeline(connectionStream, mux, connectionStream, (err) => {
-    if (err) {
+    // For context and todos related to the error message match, see https://github.com/MetaMask/metamask-extension/issues/26337
+    if (err && !err.message?.match('Premature close')) {
       console.error(err);
     }
   });
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index f05a9c79ede2..c31f471cede0 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -5106,7 +5106,8 @@ export default class MetamaskController extends EventEmitter {
           }
         });
         connectionId && this.removeConnection(origin, connectionId);
-        if (err) {
+        // For context and todos related to the error message match, see https://github.com/MetaMask/metamask-extension/issues/26337
+        if (err && !err.message?.match('Premature close')) {
           log.error(err);
         }
       },
@@ -5538,7 +5539,8 @@ export default class MetamaskController extends EventEmitter {
 
     pipeline(configStream, outStream, (err) => {
       configStream.destroy();
-      if (err) {
+      // For context and todos related to the error message match, see https://github.com/MetaMask/metamask-extension/issues/26337
+      if (err && !err.message?.match('Premature close')) {
         log.error(err);
       }
     });

From ce1ed8d88f4aa148d659d0898c6fdcba489a6812 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 5 Aug 2024 15:13:43 -0230
Subject: [PATCH 161/236] fix: Fix `currentNetwork` selector when current
 network config is missing (#26327) (#26331)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a cherry-pick of #26327 for v12.0.1. Original description below:

## **Description**

The `providerConfig` state is not guaranteed to match a built-in or
custom network. It should in the vast majority of cases, but there are
some edge cases where that would not hold true. For example:
* If the wallet crashed partway through removing the current network
* If the user has had the same network selected since before we
introduced the `networkConfigurations` state

The `currentNetwork` selector has been updated to handle this case by
returning a configuration object constructed from the `providerConfig`
state directly.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26327?quickstart=1)

## **Related issues**

Fixes #26320

## **Manual testing steps**

* Create a dev build and proceed through onboarding
* Run this command in the background console to set `providerConfig` to
a custom network that isn't present in the user's tracked network
configurations:
  ```
  chrome.storage.local.get(
    null,
    (state) => {
      state.data.NetworkController.providerConfig = {
        rpcUrl: 'https://mainnet.optimism.io',
        chainId: '0xa',
        ticker: 'ETH',
        type: 'rpc',
      };
      chrome.storage.local.set(state, () => chrome.runtime.reload());
    }
  );
  ```
* See that the UI can be opened and does not crash.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../asset-picker/asset-picker.tsx             |  2 +-
 ui/components/multichain/nft-item/nft-item.js |  2 +-
 .../send/__snapshots__/send.test.js.snap      |  8 +-
 .../pages/send/components/network-picker.tsx  |  2 +-
 .../add-ethereum-chain.test.js.snap           |  6 +-
 .../switch-ethereum-chain.test.js.snap        | 12 ++-
 ui/selectors/selectors.js                     | 25 ++++-
 ui/selectors/selectors.test.js                | 98 +++++++++++++++++++
 8 files changed, 142 insertions(+), 13 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 100c6708fe7e..8f50ba28f9be 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -184,7 +184,7 @@ export function AssetPicker({
               badge={
                 <AvatarNetwork
                   size={AvatarNetworkSize.Xs}
-                  name={currentNetwork?.nickname}
+                  name={currentNetwork?.nickname ?? ''}
                   src={currentNetwork?.rpcPrefs?.imageUrl}
                   backgroundColor={testNetworkBackgroundColor}
                   borderColor={
diff --git a/ui/components/multichain/nft-item/nft-item.js b/ui/components/multichain/nft-item/nft-item.js
index d955db8a32f3..6d87658026ef 100644
--- a/ui/components/multichain/nft-item/nft-item.js
+++ b/ui/components/multichain/nft-item/nft-item.js
@@ -116,7 +116,7 @@ NftItem.propTypes = {
   /**
    * Image that represents the network
    */
-  networkSrc: PropTypes.string.isRequired,
+  networkSrc: PropTypes.string,
   /**
    * Token ID of the NFT
    */
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 05839490b466..d0a0cf9226be 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -466,15 +466,17 @@ exports[`SendPage render and initialization should render correctly even when a
                           >
                             <div
                               class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
-                              title="null USD"
+                              title="0 ETH"
                             >
                               <span
                                 class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                              />
+                              >
+                                0
+                              </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
+                                ETH
                               </span>
                             </div>
                           </div>
diff --git a/ui/components/multichain/pages/send/components/network-picker.tsx b/ui/components/multichain/pages/send/components/network-picker.tsx
index fd2f52f985a7..f4aaa0f16ebf 100644
--- a/ui/components/multichain/pages/send/components/network-picker.tsx
+++ b/ui/components/multichain/pages/send/components/network-picker.tsx
@@ -12,7 +12,7 @@ export const SendPageNetworkPicker = () => {
   return (
     <SendPageRow>
       <PickerNetwork
-        label={currentNetwork?.nickname}
+        label={currentNetwork?.nickname ?? ''}
         src={currentNetwork?.rpcPrefs?.imageUrl}
         onClick={() => dispatch(toggleNetworkMenu())}
         data-testid="send-page-network-picker"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
index 47294c6b5f80..b20b71194b00 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
@@ -17,12 +17,14 @@ exports[`add-ethereum-chain confirmation should match snapshot 1`] = `
           <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"
           >
-            ?
+            T
           </div>
           <span
             class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
             data-testid="network-display"
-          />
+          >
+            Test initial state
+          </span>
           <span
             class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
             style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
index 4671e67ab89c..f00635b4425a 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
@@ -17,12 +17,14 @@ exports[`switch-ethereum-chain confirmation should match snapshot 1`] = `
           <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"
           >
-            ?
+            T
           </div>
           <span
             class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
             data-testid="network-display"
-          />
+          >
+            Test initial state
+          </span>
           <span
             class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
             style="mask-image: url('./images/icons/arrow-down.svg');"
@@ -131,12 +133,14 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi
           <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"
           >
-            ?
+            T
           </div>
           <span
             class="mm-box mm-text mm-text--body-sm mm-text--ellipsis mm-box--color-text-default"
             data-testid="network-display"
-          />
+          >
+            Test initial state
+          </span>
           <span
             class="mm-box mm-picker-network__arrow-down-icon mm-icon mm-icon--size-xs mm-box--margin-left-auto mm-box--display-none mm-box--color-icon-default"
             style="mask-image: url('./images/icons/arrow-down.svg');"
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index b96650bb0328..2c26470701f7 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1800,12 +1800,35 @@ export function getNumberOfAllUnapprovedTransactionsAndMessages(state) {
 export const getCurrentNetwork = createDeepEqualSelector(
   getAllNetworks,
   getProviderConfig,
+  /**
+   * Get the current network configuration.
+   *
+   * @param {Record<string, unknown>[]} allNetworks - All network configurations.
+   * @param {Record<string, unknown>} providerConfig - The configuration for the current network's provider.
+   * @returns {{
+   *   chainId: `0x${string}`;
+   *   id?: string;
+   *   nickname?: string;
+   *   providerType?: string;
+   *   rpcPrefs?: { blockExplorerUrl?: string; imageUrl?: string; };
+   *   rpcUrl: string;
+   *   ticker: string;
+   * }} networkConfiguration - Configuration for the current network.
+   */
   (allNetworks, providerConfig) => {
     const filter =
       providerConfig.type === 'rpc'
         ? (network) => network.id === providerConfig.id
         : (network) => network.id === providerConfig.type;
-    return allNetworks.find(filter);
+    return (
+      allNetworks.find(filter) ?? {
+        chainId: providerConfig.chainId,
+        nickname: providerConfig.nickname,
+        rpcPrefs: providerConfig.rpcPrefs,
+        rpcUrl: providerConfig.rpcUrl,
+        ticker: providerConfig.ticker,
+      }
+    );
   },
 );
 
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index 2ea7ff87d5dc..4a4bc73da930 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -738,6 +738,104 @@ describe('Selectors', () => {
   });
 
   describe('#getCurrentNetwork', () => {
+    it('returns built-in network configuration', () => {
+      const modifiedMockState = {
+        ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          providerConfig: {
+            ...mockState.metamask.providerConfig,
+            chainId: '0x1',
+            type: 'sepolia',
+          },
+        },
+      };
+      const currentNetwork = selectors.getCurrentNetwork(modifiedMockState);
+
+      // Replace rpcUrl by type for consistency between environments because it's determined
+      // by environment variable.
+      currentNetwork.rpcUrl = typeof currentNetwork.rpcUrl;
+      expect(currentNetwork).toMatchInlineSnapshot(`
+        {
+          "chainId": "0xaa36a7",
+          "id": "sepolia",
+          "nickname": "Sepolia",
+          "providerType": "sepolia",
+          "removable": false,
+          "rpcUrl": "string",
+          "ticker": "SepoliaETH",
+        }
+      `);
+    });
+
+    it('returns custom network configuration', () => {
+      const mockNetworkConfigurationId = 'mock-network-config-id';
+      const modifiedMockState = {
+        ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          networkConfigurations: {
+            ...mockState.networkConfigurations,
+            [mockNetworkConfigurationId]: {
+              rpcUrl: 'https://mock-rpc-endpoint.test',
+              chainId: '0x9999',
+              ticker: 'TST',
+              id: mockNetworkConfigurationId,
+            },
+          },
+          providerConfig: {
+            rpcUrl: 'https://mock-rpc-endpoint.test',
+            chainId: '0x9999',
+            ticker: 'TST',
+            id: mockNetworkConfigurationId,
+            type: 'rpc',
+          },
+        },
+      };
+
+      const currentNetwork = selectors.getCurrentNetwork(modifiedMockState);
+
+      expect(currentNetwork).toMatchInlineSnapshot(`
+        {
+          "chainId": "0x9999",
+          "id": "mock-network-config-id",
+          "removable": true,
+          "rpcPrefs": {
+            "imageUrl": undefined,
+          },
+          "rpcUrl": "https://mock-rpc-endpoint.test",
+          "ticker": "TST",
+        }
+      `);
+    });
+
+    it('returns custom network configuration that is missing from networkConfigurations state', () => {
+      const modifiedMockState = {
+        ...mockState,
+        metamask: {
+          ...mockState.metamask,
+          providerConfig: {
+            rpcUrl: 'https://mock-rpc-endpoint.test',
+            chainId: '0x9999',
+            ticker: 'TST',
+            type: 'rpc',
+          },
+        },
+      };
+
+      const currentNetwork = selectors.getCurrentNetwork(modifiedMockState);
+
+      expect(currentNetwork).toMatchInlineSnapshot(`
+        {
+          "chainId": "0x9999",
+          "nickname": undefined,
+          "rpcPrefs": undefined,
+          "rpcUrl": "https://mock-rpc-endpoint.test",
+          "ticker": "TST",
+        }
+      `);
+    });
+
     it('returns the correct custom network when there is a chainId collision', () => {
       const modifiedMockState = {
         ...mockState,

From 014b56c09b8d4876aad5c19d5f5be901b55dd6cc Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 5 Aug 2024 15:26:15 -0230
Subject: [PATCH 162/236] Patch: Compress transaction history (#26236)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Compress transaction history down to 100 entries and truncate any
existing transaction historys to just 100 entries. This should fix
reports we've seen from production of extremely poor performance and
crashes caused by long transaction histories, and will also prevent this
problem from happening again.

Transaction history has been truncated because in the extreme cases, it
would be prohibitively expensive to compress. The downside is that some
state of how the transaction has changed may be lost. But this is
unlikely to impact users because we only show a limited number of events
from the transaction history in our UI, and these events are more likely
to be at the beginning of long transaction histories. Even if a
displayed event is lost, the impact on the UI is minimal (it's only
shown on the transaction details page under "Activity log", and only for
informational purposes).

For details on how the transaction compression works, and how it
prevents history size from growing unbouned, see
https://github.com/MetaMask/core/pull/4555

The transaction controller change has been applied using a patch. The
patch was generated from the core repository branch
`patch/transaction-controller-v32-compress-history`. It will be made on
`develop` at a later date because it is blocked by other controller
updates at the moment.

The truncation is performed by a migration that was added in #26291 and
cherry-picked into this branch

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

## **Related issues**

Relates to #9372

## **Manual testing steps**

To test the migration:
* Checkout v11.15.6 and create a dev build (unfortunately the repro
steps don't work on MV3 due to snow being enabled even in dev builds, so
we're using a pre-MV3 build)
* Install the dev build from the `dist/chrome` directory and proceed
through onboarding
* Make a single transaction
* Any chain, any transaction, as long as it's approved. We don't even
need to wait for it to settle.
* Run this command in the background console to add a huge history to
the transaction controller and restart the extension:
  ```
  chrome.storage.local.get(
    null,
    (state) => {
      state.data.TransactionController.transactions[0].history.push(
        ...[...Array(100000).keys()].map(() => [
          {
value: '[ethjs-rpc] rpc error with payload
{"id":[number],"jsonrpc":"2.0","params":["0x"],"method":"eth_getTransactionReceipt"}
{ "code": -32603, "message": "Internal JSON-RPC error.", "data": {
"code": -32602, "message": "invalid argument 0: hex string has length 0,
want 64 for common.Hash", "cause": null }, "stack": ...',
            path: '/warning/error',
            op: 'replace'
          },
          {
            note: 'transactions/pending-tx-tracker#event: tx:warning',
            value: 'There was a problem loading this transaction.',
            path: '/warning/message',
            op: 'replace'
          },
        ]),
      );
      chrome.storage.local.set(state, () => chrome.runtime.reload());
    }
  );
  ```
  * The extension should become extremely slow
* Disable the extension
* Switch to this branch and create a dev build
* Enable and reload the extension
  * The extension should no longer be slow

To test that the compression is working, we would want to get a
transaction in a "stuck pending" state where an error is captured each
iteration. I am not yet sure how to do that unfortunately.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 ...ion-controller-npm-32.0.0-e23c2c3443.patch | Bin 0 -> 1296502 bytes
 app/scripts/migrations/120.3.test.ts          | 253 ++++++++++++++++++
 app/scripts/migrations/120.3.ts               | 114 ++++++++
 app/scripts/migrations/index.js               |   1 +
 package.json                                  |   4 +-
 yarn.lock                                     |  39 ++-
 6 files changed, 407 insertions(+), 4 deletions(-)
 create mode 100644 .yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch
 create mode 100644 app/scripts/migrations/120.3.test.ts
 create mode 100644 app/scripts/migrations/120.3.ts

diff --git a/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch b/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eb2684b678b7c59cd7e572ba0f09b43f5afa3e95
GIT binary patch
literal 1296502
zcmeFaeRG^Qk|)^SoxAPz#zo8@w-I;$J!WsLDO)VPQIgGWw?$Eu#MT={QgYjBhg7V3
zDAlM~#i=Sv;&AlQF76}USGZrk0SP>KiX~a@+1;@xrp0;yBoc{4W+IVD^alqA)ym4t
z!K~_D=-k?UzB?OF>S{m!{rRYVTOACBb#*xI*VUzq7q6|Zem)rW>vz?~1^?@G_UnTy
z^_7E5m+DKGFCFY3930g3#Y<N%A6)L%``5p@eDPAZS6{vU&F3pCE7gU5{pP~xcsTt0
z>#x5~aJg}#TDf@sV)gZ<>c)-Fzy96te)rkU<Nl@J{q7&}=kM|V^zUc%N8vyETrBzz
zTABX+j9~1)ogVEE$NTvG|NX!JkCy(A{tsdQ55MdGZt%P5?`G);_K${x>FnY~4Cb@{
z@E`x-fBWD6)9?S&@Bhp1f8KpHe!DyC&W@)yyOU@1Yi~Rr?%Utp{ilQa?el;9KR3ps
zS$8n1C){AruTkZ1KY$0uZ*Pu|NBt?c-Iaph|L5QT=jZ?Uf1jSNUc0(_zWU~yEAP)&
zr{7+_c)nV_a_#;5|NQ&^`iBdD+<E?bcsLpd@_q)w^MC(`{%ik8jWDn`yOYsyJbH;@
zYhg8i`}a2r{6>M_DDWEv{@qeQRl@K8%fDL+{5J64DDWEv+9*Ksp~C;uzc=(>F);Ck
zKGOe?Ax;1O1N}??;cwbk(7%=bdqe+K`}H#_!+)PiWBe<PKhq7zX957<E3J1!|1|^H
z?BCD0cR<qKZ8P&3V}S1!H~igaH{{>n{`WTu{6>M40{>Bd{v%ldn^-c%O@G?tw_m?e
z;5Q2VFGhjS{^8c{t(zE>DCg$rNY_^Q{}=dw`j6_FLgrtIDS#g&N&YXYN&lgCrT^a0
ze}6Lvh!DU1_ZtQNjVbW?->Qe>3P%@1xUH-1tg1)-YJ9*48K3w4p+_H{@e6yC?r7TW
z%?9HU`MM|L;jo@`{%MNChq>i?4)X0c{p;5+f7|b^e*5j^tJiw_m-nyK2mNoq{r1vo
z?`r?zLHF9_Ypd74?R2i!*RCIQuUx-YU%q&8{{ZdCOTK^Yo9o|PyL|PVOZ(q;uXew^
zbYSN!bR5z>0|z-InU5zOoUER|vRZx3|BJ(uivMrrO?Of~@4Y%6z23h0<Gs~K5AI>q
z-&K?PpN|KVdil%F1uk5%QV`|KbASANrCDL;$-@VGJGWXZZ0%jy{qf;X*IFyw+q?E;
z{oc)+trd1}UEBEK_O07m;p>R|qsI^L?B3eCTgKf=wOw;?Pw%c?e|&9kx3%Z1_Z~dC
zytTg9TH*TrzizJHyZf}Y!qe-QH&!2P?6g*RynX%Z?hjj!wZhj80zba?cy;yZ>JP0I
ze*Ek1#?2r0o@j;UFdzPSZ)f9&n|E3({IGNN_LbE~)<qM-k54!LdhMs{S6d<M{pG>q
z&AV5xYlSA8Tz_!y@vWck{n%RJ@?Y<5uHSoXNH*!Px3zg?WBays(X6nYa$>VW#)-`e
z87DR?WSrO})UCZ+dygLM880_0Y(Lq=YPfc}l@6Pa_by-E+1+lfaQoJijh(wcw)5oO
z2ak5QuUxU^(wvKoqnZ^mj%v~&TNlj=*}7=b;mS`tcQ>9swWZgr@MLfG!RlYPt|%P}
z74F==xxRX*ed*o0|LF1d-PH#Qp^0R+Hk%bPN;WHGlhv${O;%|X53g_EeDtst$!y^?
zyEt><WOQiauzT(4ok!bGY;86x?5scfapy0W+n4`Ot2giOJq>KnTIbUFtI#_1zxdgZ
zYFP`_O7**=@nkmbtREds#&5bqI;5_lmU2y%R`_FO?KajQZfxFvzO%l!S!(5qW1G9{
zJGX8>+PPP1U}drP?)K*9t>;g+Tl+{V#CAnXqts=w;vYZ%+J;yrjj6hS%4io6aAObM
zx>l|@wz1)t8dzDZos7KHB&iVF6-QiZU#$4Y&#Ma;{!mTF$CF<DpnG&Q7`=S5bN{<y
zWvsH!VfW~hSc!*cnTe>Nc4EDMaOvXeH<wotL(}bFy>h8{?Nax8_nZE=^`+I->%G-$
z-PMaI?R2hO?0<8qd-?L!OW*ds>0Rqy?q2F$=^b3!U;XyV#cNmVZ?AT*>|eTgZDBi+
zkT}y&q)H7-u^JrGVysR-ud2#s`#k+f=8?Y?iT(M?`|4maKCG64G5L7o?)uexw>#)?
z3C5)M5X!IJy7lzwlfP`Vm9O93z4c`4!CqVWz14e<cGvGbXf409`s9bzd#hUhb&lV?
z2iNc3zP4rUjRFC`hYzkj`f+o6yAA%;A2)ZeJiWZrR(^Zu-s3AjUB2H|e)Z0^M|ao%
zy46<x*E>7wcmI0L#{YFrzsq}1ZvF6Z)7m%6pI*EB^!DoJLxtZM-_y;fPjBAczS36y
z6V&aMA0Iz%E5Ci``sz<tZeMLJf3S0Z`|0hUw7fC@4|g6vxw(C1x3&Dy-Oax~zW$?@
zH^#U7VB_lJYd_s>E6@0=(LUp^MtR0x&GMAL8ub0~`sTxj_paOgH_F$4TK!>b=dRJe
zL7$E72YXK*JZPog<Dc$t|M=)m>-xF-c=zGGjduRZ_@~i-#y^emXZ+tN&-lMF{ySHn
zTwA}n^F-&bQNHz;t9PE<+j-Ph{+FxQ)~`R=xToa}{5NjhUVZ%VFY9gmk*&W5{u%um
z<=Ol+%Cq@tjPKF4pMH9}b-R^+v-Qz{|L~0Uk&VC6|C7g$fB0$dn(<Gg{K4kl-AA_{
z+-al#U!QEPUb(+%{Mq!kh)=<bS@X0sOFm5i>bD1%uUzeS_pjAg>WklY>w16x>b2E_
z>)qa^)ob|k;y2%XbI@PCUJO8G-%0^9(v=d9dj9g&tE(K78nortRRzm+(1+#f)Z(Mb
z;N@U+{&QdYZo50_9zs9odMMK~HqWQj`aT?6-8<ds?Yh1_9KUTg&K7af_*Q+;Js!^H
zHE&tt-1noS+2C+6J-pvNsVA4_LP<4Ag2Zl*{A_2#$h1uYW3Qgh9mVZb(<E)X{r=Wy
zFdKA-ci{sZPfm76-J|KN@r-BZ_$Zq>t<)rRi?(4(y{u>JqyFvj<ghz)TrkC#hvQL?
zIHUKvo^X$-`>=jD<L}L0T6C86vO73D9(Kurd8<3?Hk-GoG;ZFnXZ7R|{Nym)J2|SG
zQ0}FQEg|RDs5b_Xmk!9?dU#Y%nqV^hmw<Tyz8v&kA>5d01AuK%GA)@v*@nM2#YHLI
zM5aYqF=cE4!zp|)m>kyq&37Qxs5^9nY(mV`TY{Ldl`NUUiqAA(q3QN`>N)9Vci06V
zIhNgh3of3EU#32jPQZki$VuIu*8T0tpjY39<-Yk23k2lkUIx?6t?f%!uYT+L&;rP!
z2i?i*dZsm=c8ACHR0}a?2FM@z+lZFMaPTj+ki*puC9V$<l4--ecbk*RSeB2?6@WQN
z_I2yPfqH_4PL74T&)}@igTV-^=+MUBoY>5+NC*dMf}U?4<7R{41IaYNs;9wmFJb1J
za9ivRX2H$bt9ml+bw@k(;W$wxyS&wHLTj-;7@AOeo6k3zEnDmgZVAS46!cQtjjp9e
zp{KHiVm%3(WxbXeFUcfeQva#$&F+t1zAVX|%&tkAK7W2R8N9)Kt@nj1!iPJxXoT?L
zK|Oml&MNKJv*su>JLv1rzrJvxnofEx=S?#R1T!D1yWL6uU_5z!zS<Zc9*#$q83#Ae
zdp)U-v3I@ziHjm^p<_EY1-Egc1+`XeIeVA1+GoDq8{fsPo>E80v%xTFa1#O|9+ky5
zhxM#`*qy$<u#XBWy>OW38<Y9+&&T!TggNJ7J$s9BlEUHN=GY1!9_?)1*?RaKM(6s2
z_1$}134q_!lNr$68{evXSZKpY{u=>_*#8QRfSe6RDXgo<goC;!VjGZmg|Ty$Pb<Z8
zV>qZsGeWH}<dKY|Wz;y3j0(Thnu=FuVh|*K*CgXMaQkX{zM35MSmfbPl3=)UGm+l~
zh^V{5ZT+}UD@dw~Zk7YFatfVR4~}P!AG*_%QE%mtz9s0%a@eU~LP<DoBRT>$RtgRl
zq%3K+`398SJRHoRQ3LWdeN55q;kr+KtFDjES8&;>Xs-_I$;%ov81!D>JUI`y-(*Jr
zLOK2Oad#Nt4afcN^i|UDn@d%9TH(OA50{kj`tk9gPqpYskq83YuM5{B%OgyQ9S%>|
z<Wp6_u9;%IYt?LWEPPv4-O+e-ayULlt%L4x3j3+5-ZQ%j9mq2KNC3m`bauO*^<LHe
zo5OMM^~2-CePHn6(6CB$nC8mEFiqBU?vFv0kydc7VAQ$Pxuo9{w_j2cm)pbcA^Gc<
zoHW`<WC0P{R=RojFML(qc>a9*$<F5U=hasis^#UR#^rO>cYhZ8r{A9~$?v+q^fPtZ
zRpm|-TBW^Qezx>*JWH#O#<P|AO?F=oj*ja7(?R!U4VheTAMfKr-K)Ff@oVXEDiv1V
z47w}(TxI1*>a4t?N{q;)o*hp{89pd^e=Z$o^{@Y0oxaB*`_~7@BaTU^pnP@9RwO7B
zaQU3jM!Pwsu~)>*Sb@rU!i*Jo)^qf;pP5Iis-4N+Gb<CWvP7N_Mq&r^B8Du&hlce}
zyTtK`3XdArcr0_c=nm^X_LegOIgOi|%~5xM2y?A^K1+6d1RWcn;*J4DWXR5HFL=*a
z&2P^SMxk!&F2)+RR`5_-w;u+jwSq!<Rrg+FkJzk+-6UpvG9wd?Eb{6(wysC(L)ww_
zUh|jigFu|XdVEv2B7YyUti}aT&~wq60+%<@jj5L{n*+K~HIHd?<UGK7;(!XKXV(mv
zo?Z1kX~(mx2}G<)&sxo9pyt_i0<38CN;~&E)bVyVna5JI@m1<KTo_xrYR^}#MbZ*_
zruRD8GRf}i2|Gow49}<_P{y={H`SQ|XfN})M*%<*%+OB1T3>!^<N6hp&sXEo+zJAP
zW=o7XG4!@D)aJKP_YUrecZa1G#geSu201yj2dS@Lq~2h<ag3#WsNl)ANj{(!1TyJS
zH`=IVp$K~r=u@1DV`cZJRc5iXez@?}SF9$!!X{$`>+QHVn^xU2z>d_^`ZtcqXIYI!
z##bxV-mAKb`rit)QI%Hj;BtNMwJvCF%b!Rykw2_DhWnwKjjJPwxe6+mLisALGOfrq
zYk><#E$InWB!K+GE9gJK11K%4$khiqS-pbDqutS9<n>{&{^s|v3zE|Mi#=_=!zKIP
zU^YAnJz+4${Q<0Xdj@#&;gr#be1gw%3?CG20DARwN`t}vaLR35pVO8;z|b4VlL-v%
z^<EFx_sv^_edZB7i2H-#V0Pj<C+d%973f%Xr9m}4KH>n43XYx?@&%pQm2$B<h8E~*
zB<t`)x-#cnK@ej&8{HvN8}wciFTh5c46xUL8P9$~&jC}}5z?|DPoG8<%ps=8l}&Z`
z(6kl1dWl^JvR+i?7n%bxktktfwNl-wu{>!Wj5s~sj$$~nziOWag(#M`12pBp8U)5B
zP=lr34se@1#@M>`m4|59K+iaY&_vX2w|Y6ij;_Lr!>LF03M9bB2}cK0vJ7cqxA(By
zg?~<HtH5RKQ~F*RH6d~i1~2D8sfTa~0nL7Yg0&)83LvZ`{-mSt$(q3WooX8!Obhga
z$;*?^7#&a88E<lsWtcVa+-CgU*2gsZ!_@}H5ah2a8op;ji7GQfG1*9>)r*bl?Epe|
zAFKTs>IcK<Vda1-a>7veTTnd&dFv7UZa{D^RR*D`rRjL&`4d_YU;qVHEi4?2ZGYOE
zKrTVfVeJOq4_pe74l5rv3AJlmR=U#nqD-DYSp~^(29?bpqvH=hO_#~WgI5}Irqq++
z35{se{7?fZU~=WR&}dqNK_Qs8)$6l^2yKWGB2yLiiKHpv7aJTf=&qmE^VM6`g~;_Y
zn8KGr>I%*ZEKZW|ZQTxDj?l+#+lks>ru5x&O<Q}Onw3gV+H|TgjZ+8<XssF4u(KOl
zpk$jqAY{x7NI;2+N|l0KH~{Ok0gEi4>YI0*G;OiO^mH|(-DnFW+S?NsW$ezMwaEpt
zmms9XxEfEEbzkl+Al-ha#!LD!vp2Fr(){{qA?4nvtIMyXonzfO>NQr%lwmB;F2t@j
zoz^I31r@(Gv`j4W>cM?Y#l04o;C1s$mmE&bA2KLN+3&=MXAla$2)2Y_*s0jlnk8AL
zMI{mBurPt4wObavm16zbpR~mE?`)yi*T~li$A4F?Ueqegvoxaj>PD(a+SP$yt7-(7
z-kMvg<l@uD>}F!0sr!(U1>gwH;IJg$RHxGcyDs3^3Q)NX0}|o`UHOCEWdt)E(m>%a
zlW+;19lup4=i2<*t)7yzn{GF}UEn*~)y!*}Ic?@uUDQD{4+d<X))58|%RB&!`d;S2
z01~aVS_lbnkDt{hu<5++(ORSxJ5tW5*>JJUtKaHfnb+tHm&&}R?aq{Wtpv+x8Ip@-
zUi~vXDD#@qM5TU}Gin$8CkwSvAIiMCnImOx)y&ULwz5CCT0Up3N!E1a7y)LT(==P~
zy?j^YXBz|vXU5A(b3R)`Wh&&ew@_RXYXz+q-0E+}gMM|<fR|b~l~GG$9vGQ>>-#ul
zv#o90m=JkC7wK796`iln#<+MMaCWm?B`(lY+*q;X#(auHdl4*o887C#$BB&{Xpu5v
zLN}*Hl}86^Z!+6DC<wVgaHsz6fVWirwT<RnXJK4J4?)i|vSj;ov9W)-dxGPGLvU`e
zhE&0FwYd7(yhF9@i?57XPJL^)#HZIsGqsSj3f1@Di>;P|QA?-UTnk#7arjiT5r58`
zgmpzLS*cy*(!xiAwJaP!N64uhF^7)H0zSkuqj~u>9R0&u^MeLiy;&@TPQGxbxJAXD
zXJ)^20oi;l;2`8#T%cYYC$_F|{nQ<JUB<&V^>TCE7=S{Yvm=pVon0@ZOtv!-DEUVm
zz3Qao$l^pcr*&g@A}|}DGemaNJ&Mj!`Y~%VXX_=+=T(Rk@a*Sg2rWAdKx`>dtcq+u
z=lr*zsG5eETS8447*tcUXfC8yZPQYal80OzpauS!Gw_Cb$v#xyefJ$4C0OBpPP+&2
zF7HYQy!HCN6F<cXYqXQ#0*zmIG$OAGP*ez|!ZTrQ&{1DgspL@GssTPs8yux{NBhUa
z3L~QY(Ia@z5y2swEHC9e4Fp|{rO5lU&vWpHu)roy4?~ES>ywwqhZH{)fz7ECA!o}%
zBR3)t`w&|+goAg5-9^OFnpznU(8;`yd<+=wvs%#M1D5cnLz*E97B}FxJ2(J@3Wsl2
zo1NO8ICCUaa&V@0M7CdM*A&uXjQW{@e)B{vY0zQWD~!;M2AY&C0YS^~sj3$SJos$a
z=5_hPZTPiogJsmDD5hiw@8n0D!E;^>>vFh=dFCo`^MeplVu2^te}lGuMiC80y8!<w
zjHDn0RjRGw2(l4DVg9^o?%V|E;BzA}9|_$&+3K%V%cE@5mDrmV9fMIs(jqfhoWoMD
ze(vBjN)a$BR+Y`8Maa=y=HSfW38P%p^Rd>puoeaIK~XU0IyjmTXVbY1)uvq4RT$hG
zXP|mE07Lccnk+90s5YfdD^ks>t%9kwqpc>h%kJuoUR&E43au6954@FdXW-M?&hTli
z(1uURb&N$k)Yz<ax2XHYYzx-0!?JoguC=OKGT{*AFMClT;&EiQ6u6dFp>-GAyR|AG
zqf!eB>`vSPwTa(z9o(;=>sGk&5jK>fe>g~E&Ls!vAojfAlzQG>2q(fvz2R}c-W$KJ
zB?t+(G7v3W612doP}c_P4VFS{;as2>2vO4Ht(<AB(psTa#~03zs_HB<mIigy=B++!
zP_683gKDkNI;e(n^`k5y|1#WvB%7~g4xm<?pO*u=-0u__V|7-E!|ZzF{5~2UV(zK&
zwcMX90~wCo&QX>ZOyyH#?|H^kSj+;Ao!e@dxG%AmQD-B_h7ihP&8$i&@U3AB^ECuW
zDz(+f&f+^A7DUIAE6mP9q5_j<fa9<m_C&w~XRPAW5H6u(tWX9}(7G0h1u39j7c$jY
z3U=IXFxp*>*;i^bzK4#+Bld5JQ2j)L+hHCjXziB?Z<T4D+d8j~_dDZJP#Q~)Br9@I
z(2r^&Ol2zU&Nv`gBnH#lQZkjviacA}m2VuB2^NOoIC5c^=(!ZVlJ3@xZ`d$Fyv5sT
z%S*R#?Uq85Y_(_r%hGu<$icSYB#ID?hYX*_NzB4+Ji0j^&o+j2cXS+G_NhOyT<4dO
zE$&!lX88d3pgZtaYT+3S>lG}9z+b+`gy3wx4zbk_XVfA$VH>!0LM<RY`G(Lk&iMV_
zT%d&+VX$imf6<GmdY^Qezefo|%Z+aJED@f#WkN0w`7<~<Qo`kYsvd;p7ys=P7;An>
zIzWHF=7xHkp})XuNhZZ?yg|e$!u(H1dWnbd4it?O<7&`F0H??{PAh{HXtocCl-JoG
zvWY}&3|uradwe#~MPL_hUUBq~P?bWul&tBBQZ989OVagtD&iGe+kDRFN(!3+qwE<o
z0ZVm?yH;^C+w3mIwzMeHOETv=H6n=uZGk{GU!6h!J-J0bsApb2d^0aZf!;?{5|;D<
zt_R;dnbq5q`e5)bTQPRP06xL>Agq?|+b&#*Omi#i42ytNdkhY$<u9zNfC+sB&q82i
z`XVu^QWa|{suSF%>rN2xy^~cr)tD1GqQL5(yu>1uUl#ZQO|J-PB#20a5<rYH9UoU(
zP7yOEvRhOc-nemCKvi*I3}Q(AE-vOE-c>H@FxQLwVH&nrh(kq)`=ka;31N%EfdfWg
zb|?F^VtRC6n?;|GD#LwHNRkt~_vH@%gvRDg%tA|WSu(vbRI*63q1?rq#S4H~1X#t)
zF%*Ok+Hee_BE<^=SNJd*+zd$BPlM#NF@_A53_*25>nVrPdGO<XQkNJ#g4L%-xSB}u
zlAsvHDob23`Q{-LK)nPcJDz1xV1o<Hg&-8*aMrSbKAhI~aXTSh6MQn?>GmWmt}zK+
zcMU8qjCZO8qP}puR9TMgHRV$c2drL?#&1W07^*$uv36e9C(~u20f%FB$kGooqpFs<
z)$MF);}kg~Hyt_@s+#n(0l?RZW$Z9<OE@gzh|aULm!HFkbnV&DY)Pdww6A6P6kzch
z6`i!a%!JDwAN&#8&u%v6XrWu{D?kk@FAOWIf}6ktg!?1V`P8U1!I_+LL-1GdNVC;J
zDz3|m<2WRi@J0vmtl(U2)7qePE7K5VZP_Pq)d+c8;DGt6Ivx$Muo4gm=diHsmvm7N
zv2@e`suX6t{mc0^LOmP}^e87x-B+-fYr4pxyX=0a+B!h+@QXjq-a+;Jc`YLUqQZ8d
z;=9-Z8YwR_R_OqPF3E*Ba0RZ*ex}Kcu;6!bCe%k30}`1wXbMp7jwtAvQyBOm25}(r
zV|;{j95x^9x(mMWtpQL|<s=Ti5V{U&;4~@4Hhc6;9uYh&U;?q#2jC|{<E>jNgX!XV
z)jy_7JRq5gwn8-dw1ekKkr-vea>6{K0O|D+Qj8xT5-_Y-f$^5EKuBf6STe}u_!fq(
ztPQ9;+Z!fu`96gTT)G>Tj=BUzFI`A@vi{J!4xU~L6KdhO_lmB@cdI@Q7(v_VjAA}Z
zps5YggUdN2?#Q@!>=ZAiBWePwrgE+JPZ)VbZBNdFI-H1#6(JpVg7t?8DxpNK*=?%A
zwF7M5H7I@^>Dp&ItRxT&4!YT&oOjY{Sw61PtrLQkU+LPzSn{vn65JeOe8FWU+RP|9
z1c*-m5V_-4hL{75BBj4XT9;lu{E|ZOzoh$HUzPyM#jce~kBitckZ%rlkx{u;2e)qY
zz<BT7oSCA_Iar!uo*eL2tcX*)fcXIbuth-Yn|k%bF15}aL_{wT8$vF>iX<1D2rTJ^
zB3LsYM1`_!z_yueg)YfD3ONBAQpkz3AKd8ZTGA_0gfjFX*qjxCS=)>AxNJf$?9@!I
z==P`~AoRPaEd3!XQh#I%O1~Q8ChQ%`5_Yw(d<oD6l@m8=Sw{0UlW}%7z@*+{WkH4u
z0$xlNW{!(>oVt@G7AZnL3l;okTG($uireehf)(L3P|{kFIidn7L#z7l|GoO6w99Hg
zZos^@06Q0kMjn+3v<R8Do0Mn88Cy%llNr@`_2sMxo;x1Gj|1h3Yf~_iM*Sr-B5Y)8
zB8iol1C<9CV9)1+M#w=JGZq>4YG&2LJyZ;m75{eWVsgpOH;XMK^|G6pu=bNpA-XHw
z4hhuCMkJ%Rv73prr#up-ofEc5HnG^TwIW`SMdD^l_Nf72WT;1c#W3K5Y%Fm{3*;L?
zSq54c2c3Me<%zmkfYx$!1fh-&p+lO*wG~9?PI@2mW%n4FsSqm}E;i~0!ECx)g*stO
z)_3UEcWP7<22*c1=FkRZzQk;z(q`bW$D9<&9j4q_<YbT7L)%7oeb!Y#TagoD1;bnr
zcS2>4G$;l@|4`_SOlVuOLdR1!igV{W)L8cb0>9Q&c21m=@^XZ7B|i*iuh!LMTs9eR
z6dTfQSF(d$0|nLA$@jRDugQ#-Tk4#v+!YyQ3xli;UQe<gX79KUvVkdZi`3Q>Mp~=`
zB{{8e<+l40O3?VxaL=b8{4VikEX?iQP%=P}36>x-DY-==Tp8-jQ(|%}h+V63_rdPf
z_!BPH01FxQaD@mv;~GIWZ(W~_r9tN9CW6CwrSbhfP0AEt@jb~w-G4N?N!bXPDf2qS
zJ~;M?Qf3by0)&jem7kT}ocNK=>>bK~IL4K#8SKa966Y9ak>LBHl|RDvl&T%FP9WXL
z>)dFKj`&P&M;tUxewx5<)+7%LETu&1H*2xOCrBicnx&Bh5>W-g(OA)k{*)UBt3Hk*
z;MPP)ij?T#KA1Q*zF?xXMwBOHDGj5sC!omK#Oxx$^sL|q;VIPKHQwA}%FpbTrl2h~
z?OeWbqc4pHaD@|h$w+ik%S~sgotw<Im4J0jFkQ{SrNjZ40V*~M=s{}s)inl_^2W&F
zsBIeGOR-nNbb9|#8)hdmksE{S%2uD+0iXm)TH4i|L3Eny%zm%Ffd7qiz$LTYV#?{P
zBpG~LbKN8%pQY)F<9J`y$U<jEJW(Yx<T<YyneuwKAHETG0N7TY3|bvof62i$>M?_7
zl<njvEr=X!o_a;`?&f%%v}rtYDN6_I+tAVZGk?7mW5b6SPMv%Vn-Zn0>$r;Z8TN8S
zCz!)(C#+RCCZ$8tR)y{OHsb<UVhY&MbKwbYO%cPb6$PralcNqEG5m?R4b%*!qev0V
zXdd}Vp(_Y;HeMi>&9v9FGeq`=*(;7$zZh!jYG@68l50u9J!;-nmB%_cf$tZxCC?g~
z(J&u?d>6h@8jX+s#~{%-p0Ix!3e6qZ2N4KKHs;VM@PX*ECcjAl9Js&@@k6JZ^ViKo
zg1L#OR1S4SU=~_T8(jVIeD4gnLF>2$lQY;~Abl8B<_vM+>5WH`>u}v4l0%*L4Xj$>
z8*_rEqHMk7+ph+w1fMvZw9|S<IluV}on9bQ2wE>qYC4od5Co&~6(2qD*#On;#?ypw
zkR8tw)Dfr+?Z6-!*X)-kp9>HuII08gnL`l=Ad(eUy@+%m0tW%IqY%QB9YoxRI7j87
zOPYK?{0yKSG^poXj~zY^$R{~+pkt2?+y<OayibYTkZD~<8$R<Ka)zlU?R0?7qe%<a
zsa_v(!zt;Era>)+ezbd4ZeFovUPDqcEH>aAa9x!*)j`md<s-og^X%$|Z&>HS&3K2S
zLWL(>tFT8f?-A;?RZ_*3*-IOgPL%ju*N|I5<N@`Z3^$xXH%q1A;2?DmybCl+r^5gc
z5x#J}P<uxUF@aLeD@{1k5l7{&a_;p+T3o*AX2(r9n8AY({Z26Zlp-<+yz>C!$#Em!
z1BEPZc{3nvE;7VBwq@^tPz))UOD^%S$T}l{bZ+(OWdfN$5OFXyg!q%2cG?`HiPQ|8
zDVYQ!oWIr@pbGE-;tk@~u^FhdM*^rL#y(<$Jk^mr=O~-6`<?V_d;AC8cUaJHQ34BM
zh{#AZ#eq`a<ITEQF@c00G9XxV3rtE0gGJ}TBje_w{0Kzrgm@^)kT5CPkbG6`aL&Xu
zYxBf-m^?Wp5)jX1Bu#L0Z7}(8c+E~0p1?+f1hVwns6%Y|p%dBw@&OauX#0yMxB)F0
zvP^WN4u*^=Y<xa@;>|v4ZygBHLT!~gv~=grbl{Q(miYkpEG&XAvUnaOR%@fc_qJcd
zEkFo6>}FdeLwXtkk)$5a*7~RtiQt3^$BcUPe67YPt#+dzv=RsE(#3a|C1}<ji1AKc
zzAiauY+N28j^|WO4rShu4TwO)i|;P#Y2177T>lj*YC3`G1DOu`=o3BUT=+YVH(|r$
z5rxa)4WrpB1Olktq0xs=d|9i?)`Occ7vNiC?2@9E?zk_vnWC?uhXkhpx0P*a&PqK^
zx<CX&a?hA7Tkmk<PVCZIYDfTmvZHxP+BgywOWs{K#<KA+9`?_I(!OpXqoU%N!`Q}A
zI-!|ex_i7&(OIpQ>8XiC!8OoX2oQeGR7gqSxc-o)*(sf!uz_|TwylK{1N-qAW9vC#
zlMI=sCm^i+*leH$Mcg^sBRS<zkL6wzuD8dN9i#|834Ce;4qY?Hg<l!NmRPjmxmN2x
z%#H1&0?@NY7b<4tX_6zW5E{1Z=_-zh3AN@N@^y!hZkxI>ZT4#nMGGf@6JG-4GOnsh
zOd+d=@XM=)_VYeIm|GH}a(ms9`NP6F?5yjEw_e`UUz{bA8eF^0-Cb~UJFXDdGkLe8
zN_WM?3&^dQA9~Q|KsV!$jH!PCQYtq7?pVnPisu53Cbt_mA&T@#*IG#$eVS_+XLimT
z<g&|cdQ`)^c6^jM-QZTFO*4sYH}0_i<VZ=J<m1S=hp@w6?maU!GItjiryAAb@WSsF
z|Cs^s=w`s?`_2{z@DYA9=7eznKoR-WZZn$6Cm-fHvxTcGITyNw_P-y`S&0LF^PPP<
z-&yiFS1KES^PV|lTMdBV&h&d;ShXMQYzbC;(AQ_qgtz^Fk$WZdoeT=beKx2<hrjvH
zkX!`{I2!tT?hn$ndo>oB+D7YNG{p^Qg{f}T0Uu+^8=n=CIa4ok1Cd*;tpk_;eLQHk
zk&wMQ<|eTGg6=b<8h0jE;#Chrf!*^zf!j>xCh=tb3WEbJz&Aa(&mczb=nw5WVZFqG
zgX!Vz$S-m#*<6>Dm-%$i(XZ@L%D9CNEqA7GY=Ck)zZV?_#8ErDPlFiAng<@U0h9*!
z3!PX-w}uBR6xgID6ByiAp&C|wTwdRMTc1X$ln94XX?G1DK%;twM7t-e#Zo-2)QLr$
z2|VM?lb8%ww7U6hFlnW2Vf($2f4@#D3IoZw8q_-#Zso@pGRD^F4g8&NZbCuPiPY-e
zAs=06n(dz|eNF0Pd`~lR8{wpUa>8CC{>yuuBzV0$+{+`sMQ7k^NeY4$n`Fxku*D8~
zAj}K15Qt%`)ZG#&%}ZFGp&@JYu&(XoCVWWiHEaf}-zYHF(C~m<Fa1hGF(Fb=Paz1}
z@<KFxe9g)FdpY=;JqNNIlPh<90*n^(?tNmEj2#NzP?qP%-gT12`!-P#XhMt3y=G2l
zyyPu+k@ZP9x?irzA)Kf>%Xg-+RIUYuj+rncj~vC2Wv;HwtFAEgD{lJGOYwB2H48#B
zr~#V9?MV6y>d7wkACUp3wOr(uwZDVgjSk^L(lwRae+O-tajo=t8VE?Y-EiwU1h`Y8
zqbWPR#ESDnG7j=Xvu~!+JzrS7SanL%w02gXZ2SBoUgG(|nE}OVTWSKDHaUAlz68Wj
z&k)2Y8A{m7z+Lv*xQB5MUP?F00uOQ~1dd`f3bn9e>_wrt4;lMKR09J_!i7)6&Sgfu
zd3=BboHZ`5Mw1!QIFx0XY4blK^K$M<FfQ*2k%7#@FY)Qu<7HVnG)H_12z?3ZmecMt
z+#(@OZ-`8ZmKz`jRg<klSxoL~K|I5F!p}W(S^$fK@!J7<I+srKOh~n|HrY-=JSLA#
zl5j*QDiZi)uq<r{uAuN!kaW2k`4sRnFyjQN-<{I)fs}58)3*`;T6T`Z><vFJLmN9c
z&ys{ESP?yiNJ$fAWWPGl2vz3fK9QZNt!}KsZUf)kjqOI)i#^AkT=+Rnkq~6Tj;{wt
zdd&=IQn=?}nq51qkO)r_U*i3crpF*8s?TJjumDrm?%q{h%C><S&|7&F7@b6uE4^FU
zf#bZ3G2WR-vL2KC2ab`fyo6E43r!x_E#(gJ+(2>A)<c3pU=EJ1onM9S&$Q+j5RND!
zvR3Z8n!fU>21duj;rvVkj%Rrle!6hu_Hn(~=#J>>m<%rrB%dV+xe+cj$0bCu$CgF}
zDHL9aWQrF?b&nxSQh*mOU(eaCMiE$=doKv}+LLs$7f}ojo^to0gM$4lEsER%mM(wS
zUX&6=LwKh?9KWIbI(W0!(NbTrX7P-~t9*xnvs=-QjBk3-0_n+{$8e=^zTV=(MYtB^
z^FyftOet+Co^T$aPkT`oQuyrvxAb!y(D9`DC%j^hMKH!a3=-I{WCQ(Gqi@Pa^@4H$
zAx0txgw%gEcadk@fei*ZM2Vu%8as^M-~d;;Dbp+xc_rk~jXeiRQ5YF8kxWtCUUO@y
z$fCh8jmq?48;9yR#+WWAbixn>vqV-TRmgMwMP4i6ySeGllEKmCK2<*0|C$kCrm>bJ
z%ST7HAsJ@PuL;kWehF8aWVNMxGY(QGEhF0Bqk@EWL-0pfCr~yT$CNngvWF<76TG|8
zo%LSfIL5dQas3JRAs|<w@ioPC5P<-C`MUuw%mqbZ8galS$Ce_3zABaI&m60DWw!6a
zyitU(d1N>S_xsLle1H75o@`*5k-Eh_V4dT%#38G;+7}UD?I_eyoNQiM!HZ}pvPg4Q
zY<`iu>d-SS;@o!0fXlL}hBuXzmAL<C76LuW(1mG6!n}}9&M!AH>j0Rp6N8MF`Ya04
zqNs6<#L5csD6s{9fusRBeOGznD+gnz?$v`MdLr9_v5$I5Dh$K5%d8NRn88m5U^nrb
z?^z)*hxcP=gL1nfrG`D&<uLQM2Msp4QKV>}=UZL@o50b+s_80af~md-(H7`2FjzCM
zr6Ui_Hwl?d=LR_h1H%eBWgUser>5E2b=kx^s8N?6Byf>L`vsnI0e=vl@03o7v98~&
zQ*#W8m`G+f(36&b8GZK7h6%u65&(e$L5%QXJ?u_iKcviww=BWn^cHe~K+E_^M_%jD
z-mP)ZA~uFL>>T9^CP+K)fvvHs<Dz!c-7v#cM<tKWk`xK4nahMLj%^!B25)wU6!^Hj
zP_wr1%Sf2QxZP+rjB$LPfpX6V(hz@-08OZ;O0$DUE+%eAj(`ql<z8NrG~OfvmEJ|N
zBIt?h2k6vYE@;6a$nc2;0{aku(4+RYsU`Ryw(Gh@f^gpLS|LLw{Zz;9rg=~9ORfL`
zsEGqq44Tc9XG-Z#Cf$<^cvfd`OiU<1vm#{IEGAy`&QqO6uN_DRYM(5FrHWfo*|?JB
zcndF?h=H8dlF`%dFi8f(=m!x(n?qj3i{zha-%Kr0-|5W5ZtdHnsI>X^mb_ziVn0na
z|Ec$gw~T9f2kiPJdIt)SplI9sHui}5AU}3@_(tz(ZXLK;eiHKX2E#N%Itb3CvsgrF
zX%wKvKg&6R?5#{YX1tOl4k9Yf<1{uSGXR>d!x39B(M8|}uXaGHbTjnA@S$;2re3R_
z!CRDlJWn2^>>G3c&n7gZlKoXQ*;$hWA(EkI>b#-OR8y-J&e&ob<mi{m1ey0tP(Kl;
zBrQbp-GT=x`v3&uhe>FYeMR3G349rLCPdMrhIFk|a2Q+fXI7_M8KBcHr;o!aLu6Pg
zVYhc%PoV<ZBO2=vCp(7~(jV``BF3nZzZz*I@CWrkc!V4bEh${(1Ol~XAOxPnj{si&
zHB+0!-LQVy?WMc>Ry<1)Y=SeR+&x6DPGrPZLmsHosSTm5VuW0qQ*tpw{h(xCKhY*+
znzX<_>Yjvj6prFZgvoAfz6$^@!r33+DyDr#Yo~T5@Ps@%l!AEx>%=~SOmFI8^%m%Z
z{JGyGlG^Hr%#>}AH~}?r`1<x1az$$%%U0wxv-6#JKZux(><=x8n9`&Ip;k~9li^?i
z)FV##i4CZYfay994(KpRa{?+xXoNQza2W~XI-&!qKHa^b>a93YA!htO6M3cD)YBoQ
zI+a2I(W4EH^uN?r!T8Z-a_UPyY8C7Sf~!<F0zCmAWS_#U>vvEh{v{`0BGFO6D^W{J
z>naw7rJ$b*6R0IbsB}tPfzg*O<Dlq7&AGMX_qlT<ci3EgDx1ZjKtkf9eAy~y>Q85_
zD3fGX3MDIb_-ZA;6*o6l5?B=3fi}eW<yk^MdA6WWb67)*1A7ExK_|U3*#P`(MHxTh
zbwgcaj*a8ToRN!BVxgN>w!^;KEo{RNd06)z-FmcE?bJuZF5W+Q(H)(<(4+nk5>{2H
zS5J|CZMLHJ`3gORy@D@wbz_E#)7}IQsTHYoVKiQ`JohUAD7~5C)SRsl(}ig}8uVV@
zJn@!^PHCuQ_GuH&yyn&_u_bkZ&3RC(*@*!<!}?Qem3j!1Q`o>a%sm|~<TseoEFJ}x
zoR&m4FZrv_77y))9fF$Q493WU<$C-(S$NhpMvW0~7Z7PP_FT(f$7b^#VC9FU4Ll!o
z-~DPvP}VJE5SvSjb-$pE_fhKFCI?exDej|P?X)$R$jeesI$a1QIr{Hd6FL#Y(xTFh
zdV}C0V^zaYa8<qLbG(!*KR-pe@(S{*tny5E==PG8!@s2xaf9!;5l3ZU2s=Wzw2_)7
z;XhtgIPeDSQ>qIGUY25u?EGYELy}WM$FQrP9ucEVvvj`P9^a;JhY&J!XTfayu?w3w
z>&kv-@qB*Lib@VUb!^UR#58vI@%jUA$>pW0#kAZz4(p)}-iNs_xFg#emb!1%ZS<@Z
zUSpz{))1CJ|Dfto7vTUQ2-7ihww04^Nhvy2wTKHN2{CI0%2qKm9D;a*gJCiEg`&n$
z3VbfZAqp59xwLqe+^{$^R2dDlIJ^05TyBh=37%tGsn{cf{mpdT8{j~fo*~l!SBFFZ
zafZ$e5kA_$or}sUq`e@q-!{)J-gIy(lO|e)E@mzM<u@QiGcB2o^$#8iv44EfrlA_<
z?ID4KiKkDsbxheD!8^aw_R&pIqBK)7XByLxlR5C3vbaZd(?TlJ%>exjvp_$1CUjQl
zcbrE3#ZzelOf{!%h*Gq|KBuX`S}J-0Xt5nC`uC!V25@usIVou43gIT)WaBp%0O5nB
z`L?!=IgvEXB{|2YDePD@jZrBR^UVfX1!)&zgamgBtOxFN*tlsanruwzND+jJy{wDh
zZ+(-+kZjU9%wJ#!!y%ogQcLO_2Q2tUkIUs2fmC&KdB1y7PcGeIuUVvQ<NbDxm~DIy
zm>CtqhiqA`+1Y~YJ0tUAc8zNv`g-w1&K5RJG3&A<Re~pkA)MZSz=k)-vdje7MVyt~
zJTVDQ#sF@ldaqH%s+KxdiX?$JVll|$wkqD42;r{75LfLV9qd^qL_IskM^5(amZ0cA
zQs#IK2`eM_fFqibl=dS{%#0^;gZ|;B6z({sXYbfZLd_pufw|z3r7^j=qo7H|k@ruK
z?+RXjJmE<p8UdD3f=rr>66ULR`b$xDQ#hr|k#xGkXe?*Lr;t7PZYkB4pqb@>!NC1v
z@sdC)OBJMs4nF|IxFe__9P{~suJMz@k@y*Rl3GjAYkLep&DEtPU3n^_MT#I{(+rvR
zI1^tA?%BnkwSm;^jSmkI3>t%x@%k4&Y*28<%VRulij3FG0i4M^lS1Uo%%qw^PafpW
zs#tG%1PPu=9fnh3B&B*Nk*>f+56|gM?!JB1NAhl-Y)Is!4<l(HEM#^8%r1f?__G_Y
za>#4w#QxNAK2lb&76mCmBu1C=WUNmi&UsE8Z{Egz!|~*VV;1+`k?kDG?RZG$DdU!G
zve&1(mSC}ex6ZRL2AU`urEHAEek>qm4S~rWrdxep$`QS+KmU|p3wO?ijcrpqY-KBA
zIJ%u5Wfbk`NLbJ&uf%&oBeI1M(Zc3CLRoEjFx9n{St5FiQDwn*Q7q6)GD(PP=obu~
zw));DMM$=x4w1rE)ZSFjP~wizN$e0E^!pdzEr%~1@^3$6sW}_(B0vY3R4!e^l&rbY
za_s<{COfoui=eR#o^WC`t|~k)e?qMFUe^<FKL2*}fG5E)BM48Y+l96!TtII&gBY3E
z4cnL{yb;<-<v=RHkmcZLIXp3!KS)i1hoY7R2P0Y-G?}-`oXm`r2BH{`X<*FC3xMNz
zXdm-&f`#9=M9}^K+k3)b0d0a1wb-*n^Wc+?tMFttPXR58?>nW}vo&<EZJqaVVv1no
zuu$@)ZvD#em7v+Qa-Gb&Q4^|*a4uXn>qAF*GoWa!fXzlzyOa$Rf{cI<^J~bR3v+A~
zd)9jy5+lK8UNAm_AtP@;(95I`;7IDe4DUYBC+t<^8<YiJ9>p#l(~3Ph?!xsbO4*Hq
zZ|dRnLab!gE?6h-bUN*kv!u$fX-B|6#U+q-)q*gEprf-0KtId@;o|c)Y?_?J^=Dnq
zDZnw5N*T4830M77dL?%G$i2Vk0$T{5$_Y?riH~&!l(6bZ7bkFFIJ+>5$y;(n#+6){
z<HSi}so=^^Btq~MsHs7n>dew@mS-lH7Rl|pB)lrgUxjU5EccRFL0qZ^(O1kNRrPa6
zuY69mZ*KxD9C28tK0CK$L~Gby$zQg?a)z7?RJ6RTsKQM&aU>W`PTz+;oueqbWvq&x
z>hh-G6~aqp5t+F6{8#Ri@8e+E(XEp?Q{b4P4UVPe-NS>M&}PdQu#0>CeEZ4H=JV%B
zm%?5GSdF;ia*hvGQ7zmUa=g(7UIxZ!mgf0v1bNxBnw=aX;PYSVy?2}ZdNaE(_%AOR
z&Kd0#w-4TqC)3n=KwXkskb&W|UrOdP$Tsh^qMpr}yYp3XWw<qA%p}|+ztR<ggYbM4
zw9un{j%}OCdE0Iz7&<lsRna>(H%BjL3T|PgLH|AN&j!<1>C=Jb>NzsZ4*Wmyb`wAH
zLl-LbwLnh&!8a1)qlJDVr{vwA!i^DhDa$D`Vr0|a9Zqo*>{R*|k)h@t7??Q`wz_U7
z!y;1A65^Kk-hIfWJ2z8otGeHbjEEy*K^uS48iz#p?E=maF7`JGeP3rVMR3mK5eULt
zcx65{+sJXWEaTEwj5$<P=!|ES-%SIR)J}vCBzd<{nz{WcqLukR^zN(i+Z}o9R-f>-
znSM{#=W%Oe*=}uo_h*|5GRkSWv7q?A(;N38>M%I|y@6j-9F&Srw?k1uJNojOcI1$a
z=DiM;KB%anKWWhJf(T2hs((z|rN}&<*n#=-TOwr0Xdfls-L1P5#DKaf2`4Tb9eJqt
zEA2K#(ez!+y*A~pHt_Tf?fxO<)<@NNpIlaa?*NZa)9BdVLn!d1IyfHjOWLxWJcb}L
z7=~U&7M};*AN4~JFIUshM3Mv9QQs#YqL`WvE<+P6JGiub&_%Wp{zhKFa7hK4D0=*Y
z2|U$ntb5}Pxd5W>AM_G@iR7LURLMWc&y6;~s|zaY9~VwbqZx7ps*D4{A6ZOwJ~G+;
zbSk{tB@Gd=sv)2OxYU`_)bQ<_%+WeUte)JrWzVQGJ1#zpV^zVhG=qfNi)P@|yy+Pe
z;AWp0Ic{py>=9};C@S6!t-~XsrJFfJKTK*OyrDn9s;{B7k$-~(C${fTIVgWQMHx9U
zLhW={Z`*a8GC)j)N@80XGcQ%&yP~zq`4Jb58T>R+gCu2^-|z^Kq!L0bAZ&s#hz<Kg
zC9#{;z42|~=-{j3m4!!8#A(56#q*&`B7r3H3pwr}g7VYxWQIsZL!%kEIJIsu7Y=wj
z8zQM&Sg1u&k>^YmRZ&*U1I=ZL?R3?%*Y(NyNY9^X5j|o-*U>v^k%g4uytzd)Ls|w<
zXj|?^7>>X)?4*8}Ku?s=gpk5>zBJR#XQrvk;BVq$H%KaSs)?2wzY<M27W+K2D_tqg
zj$AkHPg_|2+P!-Yd5MxjX3@)pn+Q3Y(>LQmzw$2>3;(g}iPm~)ud<7<8e@EOxz5<6
za)}do(#h950F)9t+o{M(b?J|&^yg}Y{#{u~CQ#SaJK8d|z<D;X;}Dt+X>cn3Oi3%m
zjl*QS*&|APAtR*&F7c$6*iGw9u{EmxBpM>Yk~-Ep<N@bDBY~*2`Fc2g1+qw?kz`Cr
z_{mK)=-WYh;8%l#89b*%j@Ut{X58>@s-x5rV=5L%sZimHTulP5EG|4f=yeNCT(hcT
zR3hjvRnQxHth2@*bpXtcdsrm}`YFHZIgvKSREJ}K5d(atalU#^p7^vb9tUlFdwwuV
zGd-EaTo6Sa5N1dYrlfhW7L_ZbY*zL>wQkIVodgghlnbCkR~c&BrB0;uh!771<=&=?
z%bZnTCW(FrmEdNIkP6UcYZTf~1-$W)fVZFlPyIU!hS1?yZ2m)30h4(ol>u&q(?U8+
z12!%_HRf7I9j-K(`Gh5yGDbFOx(Ff-$=4#Vf(eEz5IT;4ZV9DOm{B|Fkr!3m35QHS
zY#wraM0JV7-w*I?8c9nsr6tdy1M5Nu)r90uLL2}cT49N)#csc3?+{E^F~zme=WZ94
zY?}M7SK3CHP-sKFr6Zkb1s@&${GIY0ArBD^+7DNA2jP}KvPwlSfMu|=F=SJnbkVik
zMLpvP%O8rN=q@<#*PG`d^0XB4;&4sYvyN3cBSVj-Eccn)Zunys+jb+uDeEvWXnC>e
zQjleZRj?N&S!v8w)d=VL1YtfwSjGdtdEzn%Oj%?>Px`DnGIMR`fi^{+-((JhGGdEB
z>~lEL!)NlKq<8N>?1ks>n6|g)b?woSu(@61G)SShRu$7kA5hd5_-8QP+}gf$_3F27
z9$|zi)MlUOu+b{MB8rn{e&Ca=KD`+H)rF+TrYA5ABg`jmv(M=~uqGiNen86JryV<T
zP`Bev@x`G<%Gn8$r*gzi+uk;Olllt<&}e_D#<T|;9O2Qa`&9@HG5&2sEsPM!z9h0o
zt+=#nIq-2^p<|~fsd%}7-g%}?3MxJH1)RdmpOH07K_@CuQb0`OObc3qJ?9*qMbJLa
zo|nkIA^c-cqWjjh$eqCnH1!CR^S<_K&pcAWYC>YQa6UxY)bs~!kd`8<O}DPhrBRaw
zhfM3IN+srpW8HX(7wwDP+4zXH8qGZWLdD<9riD|94x*{;JrZsduqfVIoOU0}J9?RJ
zR;tLE^^`8b!fjVN_jY}peUAY_1V<J@;U~Sj4`;_-oa$W}mzRm|D7MWc7rQr6aTx>^
z1tR)mcf7@l-tAlgSjrW~($GIU^gPU=aE@TjFg6e|vyW&TEWe<D)`<jGz!xs(;GRI4
zqq<D~;2=m-i#EpK<`2pRB6)_?2M9-m51I^B<*>Ho9|<DCQP4Ih4O4Ml+6@8OmG=8I
z6BI1#$DYj2udwc(MJiEpmWBWcLK>z)$}`sR=P=dshm2-=GU};P!qx+JoI2}U$0i&S
zG(18(k8m19cZw2m4<k-(0IM+=4ra-nW+E9v%s4lxZPCwV=Tcn9Hm@BvFIWcBtKaQL
z0lY0KSfqN=RG95~oo!%zo_qLE0ANrp`~JZ+sfZLG>4$vBpJ8N^A-&or&v$p{@4C_b
zx3vDnN)SB-CXD-MBTHazvzU#iGn$8b;*d(Lcj6>z7Q7}|zwl)Ez6VES!6MYrj9Fvk
zVYCt(2*My#hX@`k5K$k$1oXl_Kllu+vN-@kfp4>mICgq$fe?)i{MXJtVv5-_buKjg
za9TJW_xIX;B{Rd4X*{|)9?v#lXpN4KqERJMn*&(n{5|y^s&vncyxU{Ev5V|4^dhz0
zI!JCe#3%sfu;c=OG%I&z>R8pL+-LCnn_uHt-;UH-0NM{6=?e`_u&}#Z@X8bd9dTGQ
zH`V@po@@`M^nMLEwGRH#XbVTO4b9+GyPoVTbO$_dgmj|wkM7wQ-8@#;@Ky<6YCT|Y
zo~x6)L+z@#Q73{qEeH{q#v`P9Gz2C<Am}ra5Z8PzqHB$OK?9>!cc@<*F$`!$A>UeT
zQK*beAZ26XI4x^7kufJLhp_V@bui9!v;ydq0|i(|L0?lCuD)<UX)^{>H&G<yxZKZ}
z89*{AGrGCJAvrJ?D7G2{f*`hr*vsp81PNmX-_*;8ki8T&&MZZS8y2MN)549)T@o)6
z0M4lGXiw28uG>I5GJsBOVbY-n0m!DNA|s-7w5AKW*Q<|aJ4{dv&h28=-6sp8JM<Wn
zf(blA{nCGp$(Kbcg^nfZgG3pG38ao49z;yUIE3QB&D2!U)|e(f3(uQ#tVW?xbJtHT
zJtSnk=JTDTF%h-d)J+1R)r|V5Flbt~j+5oevGvHe(6D|_J)sCvkD`VTAJQd&(v3U`
zhLv(2f6#x_nEpHBOUK2wW?-g$X49jxO$P0_H|*J^n^L4)0~a5ayAci-{*Xx^IFX-l
z+_+xLPHB`P8>Jhe!BS1|aetaDaI1#Qo4t2&?Xr3Np+bQ=B7VSfbg(jBNLjSBwq$rd
z?Y>`LQ3lDls6!)&K_l-7J(hyZ%PVgN-4)SZD;oZ|@@hPO%}R4u>O38EZ?b;dKHkTL
zkXLt6uAy<+V#~(TSgW1sF_!8Sk$}k}akRHJ+FUavH?ZWySWNu_=@h#)v(@)SX{QY6
z><CbzVj<Mkb+WGJjK2g&tr|<ywV}b3mKY01k23-Cs*irle+kk2&_Y3Ls%9hdsn<t;
zKNcsJ{50W)Dr<U_IeX}3jUzQ(lQ0T;G7%NUIRtUSch)%~5vTRdD948ETB3=1(4D@n
zaHo(QT)5~lfxxA}PXwTiD0!m8fjuu=r4y16%PgiCm7@)qQ^{ZFM|j9;l*!mOzQ71h
z(CIh*M}!T`l<trQL>i6Ej@)q3#X7~k0LuIw>VL0cv~Jn+g_~k<_F81?Olo|uIl}{7
z`Rz#~6E!*N=^R<4bi_s4Xh?S*+X_OmIe|IHaxMIV6q|=uNm_-F45b+bpu7swOk)on
zP$9A5%jkp5g^@(^K;X2o*XZ?V{B}f#q3|Rf(&dc5>^^#kX`m?D!9k2L6YdHW<tI9#
zou0|Xc(o&5?jQgy^OOuGQrebNQmm9=e&hd%j&GHl@LwlOg&uws>5r7NvoELS(+^Lh
z(IYpsBp|%l!zu2HuYfHXv~Ja5U7!L)1578p3xo?jFY6HnWg|wNud=zi1dQCHwP=j5
zkO7hHFL=`FGg*%DQZ~__{C|ju!!bCfL-Zo8c|7HWCj2rTZ;{Pazh1rg)9f8~B7cs7
z`qiuB{R*j5>48k_tg$7+bBYHP_p6M@5yM#b5G@LanIyyzIQ-9c*Q?o(c<R}!sRdrR
zB!I)}7FMP+9k?3yApB_8PFGFVDXD$X>Aphe=y>{S*=-CC5gYKX)9vvN5cg)3KWJm-
zI#pp*(DjcdeCScOc#;hbTUrc(CNK<w__`=i{rbyLN$k>ix2F9pIl{65%5s8|7*$Jf
z%daTWMIJpI>m>;=KsdLB(2g;Q{(b=wCnN*#Rz`7H`A~SmSPU%_{^sw6;6i@RerG96
z$wy&q11I7$Ix<cyr9Cfw<TATM4OVM1Ls(!w?*kj6v>pW<Zm!~jAWbWMgJ3}Qmk?G{
zY=}~zK`@6%(8Z~5W0^Y+3L9+cvbhcnBBGQzuy-!x;`xd}h-@W`@)^sy^N@j9om0uR
z@pDk;@S{GoE9%aaad;C?IWD)1ZH#4b>@VtR=glW4elv85mq00+BG(HRVq^;D>dg5c
zn>X%y(|pFElFy?_ZeJr3Eb9|Q3IhZVpZcZBI0V-(Ow#xr(g22I%TBi`n<-){QY|<r
zgIP%rT=pkWBYP5TT6|*+xr_9UeR|^K8oHI^zJ_~K)lwqC?1vX$$YUJw2w}XS_h}rw
zyxMNK`0v8d{!4zSK}>~n1Pwp20VS~}R0YR?@P;+xY^(tvr6nkVFA?IxAvKrTUPPeZ
z1H4@X9cA8Q0_?16{2A!w+#$Ta+g}KB96{V4Sya|E1!Yho5vM&#<hj{jXf0>Ggo!ZH
z#%`m=6o-Ir_q}{$JQtGGY7?;$<@lA}iQ-2E*~t+5R;9eietiCJT#-h<>b*#}<ry`M
z2)W%Wiu#xPNFrBQPfTQ<+Jua{t@v>5B)nn=Y+jlzDy}yh5x|XzT)3p;9F`=tlV`e2
zn@zO92;tTVS%0{7vG-0N!3tE9!HIKNTzuQE8U~xAMGIFhCr#gWk7TolKfG9?321|u
zOi5;gSR62MG>~0!UE}pLe!MFr1|Z?!2NYH@Vtywl%QjoM#thZ0gNE($%xFXH9ek#^
z$t%vA6D$54*N|@N8{Xu&Bs|d6R!X{vAZccj*Ou>Mx4R~ZFvth$WRouVg=7-*zl|aG
zMpHxEX`aEx1(!;?Ep@sVxziC>R#{-CGst6`u7l$tNJD5u#Im{Ys|<wupUq|n?vF){
z2Cv6uewaRivZ<!mXtTM=7uuTsl8g(qXck`FDazSe^*<e^jfG{W4sGIqFU$q07TL*J
z4o(WPwa}&j=PSKkqZ?igKDBk#5Fu8uXrEU9EC={)J?8Y9Hd`?UD$*br-A+vf&k^}V
zrsp~};t-ZGat92F9-{*#+3k@8i{L-j^fEnc1}&?Qb@lK^HPY%@=YDfvt;3(N%-%fw
z(5>lva?c{@&>h|;dmlt1Y<B6c{|qh~*=OR9=xd3-I0?H~!M)ciLt{bEk4h#H{|%)^
z8Jc&JOmU>#NE}B{s<$$qAOaiV$<JMa!DyrhwQwB;m%I_h$_J$MC5E>yO*A`!NVcyK
z8jI&V!9`rRJJ$#I%ROvz3}GI>8+?!&jvn-;i=9N^m~~2)Fy*AHo^0{@kj=&7hZ(li
z#Y)PUjEo~XplpUf;#NO`pKL`Uf*Kb|amfYI)A)n#(mF`yD7J;g)~hS$MQ3;zBdf?%
zeal#gL$?@Q-N2r_ibbrGC$-^2NinBT1&5ho?k)Q!RHIVslh6)g$fg(Mr=Tul^U+L1
z6+jM>7+X*Whed#qUw9XL&A_=7u4zBQe$%#>Ow2YNVKC?Gil($K4?v*V#4jwa9TM4?
z;r#Zp+bS;7``lsAAFkyq@tQG1?978$TeO05n105peS2RXm=H7*dwY11oDUB4DLzD=
zIUJEt<5d>{dAM~)!TU%VOJ@wi%+<!Ly7yXcg?>fm4;7_P(azq5*K%>pFdUCwN)q4^
z4l1X7=zy~fPTd39%R|H^BF@4=(vuH302il%Xg#S9k%^cPs;lu3?K#hhK5UK%^T4<`
z>rhbJPzJPTLTS8_kq(cKXDC=5M>Ns{KRrkERUmZS!pU?x6=I^QY4@O>olt-tOfP5~
z74I<Jp%pDHMVj9*2wC)?jTj&u;n3-eCT5YNBE|(tkzd2V)}16r6Y*IEMJ?tXhA$0m
zC}zy2h#r;fcPViKNUqLJN>+l&?Dgo;MIsFJwSr3KoOpnynP8}Qm;VMlR%;55?i%gG
zkB>_ra$E<0xPpUtI*?;5kZgZ4evP9lJhg>PH8p0M9(3d$o@||^`YeTEf}h+bft|!J
z1?s_<Fs1f?L#%|Up0y1Q4?!BrD4J(r(f&Cyb1_M5vQ;E7ljosCq9exvMDJPI4^-*A
zL)wjdb$x^u^uDVf-_IS&*|EF~Yi*yEW4A*&8IbN^U;g+Wc@Ge)cj=sF$)UukTrr4!
z=>)gIB&Oa{*@5HC;aM?A4kmi1T2uBgRwEc(w7C&@ltSY>3Q5sSvsP7-uAY0p^50HT
z@ePhAk%xG1e5>vakQ^@Pdj{k$$I}OHMF(4)&5n>d*O`s!hjw!A{fmH~V3^UI^DqFl
z^ccr10xb6=S%N#+%He3PhLXN<({mSGgv`zC`#nd8+h4FS9!#O#y2D+%_EAWSNJGv0
zqXQhm+YPT3YvyafP|GIN^GQFVb};5bL?UKm8dC$R@r=w6!hPIzrV-5BM9WkJfg3$Z
zVl3XSYy?yj$fC2QC&s5(7ixNX08(HgIxN(X)(L{gS8wl6vb+_@ZYxv=tC)~^*=p+0
zJo<WIW6><U2@Ahq6y-Hb=@Uy-Z5tn)8Wl7w9Vn4Pv(R5`vY;<}P$cjLQrsHEbx~IS
z-RO){weGOV;~BA^8KW)*qBTeuJhsJPomgrbodMVnOhK#>-AN>N!>?ewx~z;sCuai5
z4zv+1%tu#nWi;c08`tq^&%!F4vO>s4y*u2(p=^?C1$4m7p27$jyu`{8iA#pKE_*4T
z$+c{QvWK6Yy|`sf>MG8Vk!<Qirf>D(^X6V*>4pQLWT(tRDmULTqftCBS?3!e+;t5i
zYDcm~ECs5c+7v??`_n`j;F=8-E9%kC)}5_~&mU~=tv^`by%!+JDVO`{M&!Pd!O)vc
zcQ~q=ochONBa#>l)mp;0-9%$@93}mc5{~|jeQlPU=$Xn~g`KR<fr-#KIdnA`+uCeX
z*x1gtqErklQBTbSEPdph-ku;xf==YhhqX)DID{7*ceWEiM<u&!J+}=roZn!LGY=zx
z0{|2J-mg(MJV!zpn8z^WIjJugGk2%8-3B!hGdheQtEl2CvkBBT!7`y0hQ;8BzR)EK
z1E;GpPV$EnGqw%06V$fc_OQJF$*m8~pBYxMYJ5S+#f2L}gJ~|A-2~{Nxlp0eyQ`R>
zpnV(BH^gRJ&O#)@s06i_!!gdHv@VbfW)x<^9aCTu@A#UWiYfV$UduGpeJ5&f+l|x(
zI?GzPPP3A7=e#<y;gcbdf1))nbjZL4T7@}C$fb)=r`p(`B+p!lU3e-5<W0K1iQMDS
zIiBGw%Ne)4e1xIJcg1ywJu7Uw`pJl50O~#tZTH?Shn<CO0>Tg#eJ64X87-`pJ2W_$
z)b+n0_QBuRqMZjlOatjp)WGO)5u))>jpCw_I%)<pF=NQ*iyL4=WDhz%{HN)K*}E6?
z&h)fOzDidwD8LKp*F8-TTsa=P-SQNQ2_dhvg~oL^1ST^E;bjjx!<+Q6xyB|Q;tvrZ
zoS2l}w#UZK!AZhTJJrn-Y@`o><fuoW**lQnfv{4*>tdgA@-I>YX`lx6uy4)^L5xDc
zX@?#5dg<87hUX_Hv2*Uz3zLWRKDG=5xUO8je(4)#jjs|}J|hzaO+dJ!C91QaCcpiX
z1~g{g@h8J+YyxBkGTKXGDnZC{q0ZxiRD{c=qzw{b+kCwU(jw?LMRJX99!=}5(JZnx
zUQr1)hK5$()k$5e?ym3Ly8US9o-82qkSgN~ZhG5kxzWGVNMqdA#E>zQZn1<5&ak~|
zv#->lNBza5P`o6hWR80~IYY;#WX-(mdt^h03}k!H%{Kf^KO%X^pUJRkOAF71M^ir)
zx{&u<#6-jkRbDry38CA&M$d{*dW=AwvP+)Nhvhgyj*20T3q5k!d>n%J(i0$^#pci}
z<Y6s<Q`t>T?V$iXkr2KzSrhjT#=$e!>TYUwo%{b;wv9(m<m%adY#ndcxF1pXZ(`5*
z`r+~6K6d?fNq<-_R_^9_acS{k+$95R0gf@Ylqg}MucD;o@_>$lpB+z7<ST~<zf<?>
z0WRT3rI(G+=3A{BiORnPXX5Vh%a`yfhx_~CwW0Gm?Lot_IUuY+R)GFR%0JujgcgCV
zB(%hcAY2HU$U8(t6v|Vo$d()*az9VM@EyI(PLNk%yPhDy04x}&DcMYlTvM2Yn*nmc
zEEJ~dp*D*eU1U|LKN?~qI7Syt`^fqQ;(|d=O>QPA(^*=hixLEiwq$Yvl>KRRjnV7L
zm?LbOwh~$S*70K9Cy*(@b(}Iq1A!iekwX$TrxRl+eYWukpD3L^07srPqD~4(XRL%B
zSIkT&T-F`nQZURVwm$ku=#7x>dIB?qyi;_6ExmFEoiEaX@%~Ew*U~Z0qU@(V8q9@<
zw2%QG=j8_0RU(sv9>gJSNPm0CRd65f!EH!hWY<uw3pN?hy7=5zic46owj#}l;dPeQ
zRf<|o*Kdp8Kx(>&;4tT|714sOam!-<-ak<%E$Ia2Hoa#T-a_1q7?E0bz?#X*T%p8e
z#I~VR?vvNJ$Fe24H;Dozk8o$YQ3KB6K*g&Pz->PA(C5hkyZ6yFu%-F8Cw4+F4Ig6(
zrz1HI{8cduK1jwW{0bgPqZ01=^P1W)I+fT{2GIzn3U+B2K86%N#!;4NfHmUSh8G}S
z7joP|pE}UVbjCpz&$FM;S=Mcu@{63~f$f*U^sZF9HJH+NqK~u^SZ9=g1P{Dv*)B5h
z!9~|hNkX|MA`eopx}wgqYGwVqw#@rvMYI}J&y0|4ur>h%+EMgzP9JOgvrSzvT~v%V
zo0Nno4hQiJ2W>&sQ>*6<kg5=BecbB9mH2Sr!k#afi8vXc1A_e;=ci$|`ICZ*B(yD{
z9<3$>;^%eKBi-T_&NbTVLo(w|G0R*?cpMlX;Mkj;*y-`Mm$QestMHItfjq|HEIk1+
zy(L5QJl62Lx_*@<nG3Mp--`pxASk=AEta(pa@@==t;>4NHW+*wmx@j1{V0ODhBgK9
zVWV-#R3d4!CR8D55sqNRR*R!?951j*L^A2zkOONsdG>>3CVa1r7$sWBj&3blptY8g
z4<bSS%AlF%bZVjjiu?(L){@!sEHmv#Lu9s-2~X6jj%g5(_no$cJqI=P%0Lq~*fJ-^
zD$YqF4$ok<vxFJBMeIqY$Qu--(42ACl|~yEIEG&91qFx42$1o^C0BR?Akiu~Cq5c>
zd)PnH0l(u4;?nQad*-y!bv0a5h>SwxL0=aH?~rXObSVZ|+D-^2;aqC8&D1<v<jhDN
zz^Y(&EFI}4v=fvP;k3)`3$o7GDIDGN$TJHYWQL2Jty{#9IO?jBa4O;~xlJ=hF1W}|
z{3Q+RB6zT=Nm@g|L&2#2@uD2@UJgj>_y~F+jx5op|AJ9)ez!E>g-U}8mWe=AqN2ny
zLH`aS!FG;35xI-poCgJ`fupQW)knnU2@40#bxYjQD+Ilii4lfdKF|BZ9O9>wYcr?!
zDU90~sZSCgcqd~>KFbTcJ_}DQa-|iLAu$>tRGR{*!Ff1O;LHPkvk~BP;};3cgbBMk
zGFj{$7{4rd3M6JZwGn<8%wDbYGiNx5xBdfrs=+49m)xC+UoQ13df~~s!l31nBYY=S
zXFr5TWHxxMOSHkliPg+S9ZgKj*tU#BX`Hf+kvcVb8cy3VU-s@vey4%#viWx!EOa5e
zxvM=|X^`h(4d@@4R1^24L~KqFf+nXIZ^&nWNI-sX4q~a>lvVt=lgzQ49dl+h&Ge1D
z)O-x(`Ju>uZn3lck%!&f8s)G0WFFX3R;q$BZ-w-Q%dpZKCo>4qp=X}ye1;4dQd|_Q
z<9g$QDcS3I37zu<_|eN)LN_wQ5~!%MqJ<#Zg#8&(GaJj!?o-dTELN3Rdx#HIUJ)7X
z(4~5`Zg!@4xeRyN$0NMqULWP4Otd&nP4R%3!DmbK8vGKaKv;US^mFLRENvb!8E8Cj
zd++!`tH4C0y|o4wkoexnJr}=?5L@ejGFXJKy0AWGyv#6h!{QEs0CuMr-$`ePG1O22
z9Q4@G6pV?9RD~*u7;m?vA%BWll(VDOfWMGmPe}BrcFQh_<LIa@Rdf0d;zC_2iIX1J
zCHVIPdej!h9*uBHv9m{oU4m9>M<k~(v5n*OoG)WcYoIX%Op?L_0C>H|2?eX#KF`J=
zWU}WE_>h~-S#m5C55P_GW-G~#&x3}ye!NP61x;|_9VYi_a{Na|EBG`YWe8=lMP-YL
z*qRe(k@s_3vV8^}L0LJ75~;2b{Rg6a-w9?4aw7WU{eV3%RhJ}t2i<qF;b;(80PFoe
zd_H3ee+AU_$;;zIx<!|dA!gD*%X(yrEFc*~LO?J}W)G{#A)FIF2}YAFCo*~juDq=@
z?+hVGyub<PVf*4f7tXUM$US58Y5WkBTN^gbEGZ;%+(fZ!!saP3XX7eo$S@;S&E$tw
zK7zL!_>vFCv92L#&JC5BN<EcfMJZ42W6q$sfS70GdFY%Mis+Wlr-6fNXDp#)+$gzi
zLr=BOUw~#4QMClS{egOO0)fm+J_xl8RwxeFizBgep+E^Hi4&B<x&aLL{jwwxD&g7>
zx!epn&4bl>YU8m5)1V2}FX-+-kVxLJ{K76tuoq`DPeOT*)aWzJLmBVTQOo{BB$rPF
znr%xIuY%BP-<6b6u^AMO=8N^9YT>z=ccoWmitB(?xu!TdtS2w)Wjvef*O;3@7ofy_
z%ZO6p@L|-Yjz5aN>AhAt5zF>{%BGBI)T0ZNJS<;cydSr*7Egh!NSwk){?Dd2AtXyJ
zXcF_^^<LMLy(sghdZPk62u<Z=XHTZ0(RM?_6r&JQYLJE+^>5Q7QQoC7#TVaSSQ6^H
z40B|C+CrAa7m7tcG`5qT^?7*X(S{xNxS{1jHB3P!ub|rX8h|?pa3m#*CK4>uL^7QV
z`R0o)IS3iTa`y!B5r@dE$H{mD!RC8f!l+|NMuw>;m6}G2v#jbpr*5{#Q_F19pl)0g
zvLlzJJFkT?a3jNCHVF6hNuB^E%qeYAgeev4;1x8p4vxUbl&A%KUE0zgBELA|4Y94<
zo8aLeOv&APh|TmlGQ(iAa$5`hq297>NaN5gf88Z;H4u{Z)NG;!wj6>iv@x7ooEC5#
zO~oZbY=zaUNz1bWJ{u7$HqM8uqiJgL$#k-%@CYX|bR{0l7((hGmtNzr^x&?Vwr$9H
z*StWDxkA+H7c*QOfrDN5I{qM2W82gCXX2G7a-Vs(nE0b*Mj}|XCoO6U42uh&oQs#^
z{~c>*0*ei9iYmpsLrgd_wrF5pPKESESz-$AmH($LQ3Qnd4rN`<lkPOcV8Ae0z+x9j
zm|!85kRyKHf!QOrl6^j!R@#s?&Fqj|LRcT-(r*7G2uRtZ2wel(JWIU8V*qx%AD0$z
zC3V?>W2RU0ootVNoXG}*#G*JR62IBAmAHHIW-!L#$Sn5BA;f}xR7WlcRp1(d#zRt(
z7pFD`XK#+CNHj~HLL7K=W$r+a76;R*-u%fziKM1_<|Y#gF{ZSlxRuUBL$X>Cw$sXP
z-=PX!uqMCqyl&XXcHu&`_vqH6wQ5HW$Ep|I(a8&ONRsQ1`aqrCG2N1u8^DN=!cBSU
zl-NBSmuqKo>lv|Bbbk_I+X|wd4&kd^=}R2N$_QalEBI1ZH>jU!Z!$QVtw^N{qwxyv
zMd56HfK0BV6N0cXPnjwc1cd_MTi)vL<GCSH!NFAwVvcbK@hvVF!5zmV_`XB9FVe*H
zES=OmPaV-vZL}f(0e9RVbn$MG)M!L=J~|?o0v+r&YB$%woXU=C@4BnICAfp>?f@E=
zFXwNLB&Ma%J%Sqa5omfwyNF?%o-Xw&H}}0I>S`fugelalgqtd;XUPLZ=R*W@I(gRO
z9QUfifj<PjZ6V~!2Si`rz1a_80o=ybGv-8IR>btbkYm{g5;5g<bYnIp&W5*YMOKR}
zzO3)YpjgdsYh+gxPzZDn_7jw0dI8A~w$M~who>c=)GO5CdqVt_m(WDa)?hsaQj_$y
ziv+YsDeM5;Lt!2<^liq|RP2mmPjl|sN_}>0v5m%SQ5b2f89gnAWGm~nwkYvoW0o)j
zh)74K2ztzQ=KTh{<723;GJlGawtx^vkObFO%#4p4*f7tiLtXvQ(K_5ka^D_;QQ_2t
zO0u{*%w0>E{hH6HOk2ac(-Qiw+(B$$rnT}3BIm?mX}=>nTGd&a3I>^FMMODHzvB=8
z+9c{ZN=hqD6%-C%CnuYT@S4;rB0n5v6NUn(tSW^WU#k}4iNt8pe7j*`yW!5_YVlIu
zmR`eh_wvDkDe#)AmUEpZ3|e5i`w2Lu!UnE`R`$FPZA6a((7EU$)zYhpxUku_hQ*pw
z;oe#cYS#&brifG7*D4TNTa*OC2P!66_+Sv*3$q8`wzmdM#wm5<q5{IUiaumjvB4s+
zjvCq|rA6z=P2e=WqiYDVp=VtE7M7wQ{oN;*(6k94YslDw`E-r7NH~!)S_c%`R0^8N
zG6KgMPR3$|xK!~X*xV{J!8qXi`Sfh#TyfN-X;@bc2oW8*7mWMOuML^7&fKDHGq%pz
zV-KuW2?{oiDo^j#CpKHo(-FC7Ib0@HY?`SGRYo@pnzEV>6F|>X)8LZin)hl=W>UCw
z>omKl5YUAkV7)EAxde!QbBzQM*^0?B3WRM4uqKAO98v*xcC}o9HF-h-CjzXsRuEvc
z;ls=}5rEeh-ss6}dpyK;>ZKE9VdFtBiLVdoLLz(9Totptvl^Ln({1`0TXTY;kCe2~
zS#pmxhtMSTqBV1B&qq;6E-s2Ty@F%{iw$EDl_$eEyJm41tx7H9<%NVqHo-hktQi+Y
zvA{HoHqE%HeOw|tTFX0l&j*pXlpzn?92VyC(k$9VQ}xe$Fc1+IOJe`@Tg+fSh$8Yc
z=@v3*3Uphj-6tj5c%;V|DXCQI^MWW})6S%+aNc~{#=g#=W!n3bxz~IPcsTAoTcQ+Z
zK^W=mrrAUswb@N7BwNcD;ocS4W}1>qNd3#8S#<HIfTi)`p8}Nf1+P?FNN3MOVG6O3
z&TjWf=Pxq1lR0kIQl8$h*@S{KH%Eb!;V5cjDrTB;r#891%Q+F%pR8YH1m7)v`Zb1V
zjN<!}Z}WR&rh=L4JxxtU@jgwngU)W0v6Jq?!kN8F0oh|=KQZbfpGLWF7Q0!8Zd_9n
z+2MX=<F=*J1<SxWaTFucXR=rY7rS*l9~ZlzS*WGxoY9$X$SK?BoY9}BoEmd5`q@-0
z$aAMVMM8kw3GF7#RmdhsCxgzVf<<~KdXF*}cO#_Y8Ewe-5<mFzIYLbjv~8?Z?LJO2
zx)GD*bCf3s`9AA|E>5$3fgjub?nynl6iZuJvQe!(PLB_5Jn<&_Vcygb+wD!TUuc#F
z>>BF~iDTq8d^{|$NocK`;dx4=n?+fu?{wj?N_?aA9*{b=U}7QNFJjL3v1ieFq{mWJ
zB)D}F65c$Mso`ZM)d~q?WHBI<T}_GRnj3z;AF)NnA@Jj@ly_n|%37<C<1#t>r8DZw
z#h#uq5`uF=6>DOn_g)b$J4aWR9U1u}vt<)bxbaBplY)bWgMaa!X`x;iYYsIuPX~#x
zb-viWr(v@V6hk{B%ba-&OB3U8M;Ls>xpmN(=_g_+(!*-l61P_X?;+_II7n}b<U=#e
zNIE#i(>tWcwK5%@ZRAZsOBs(tPWd)ave`<dH31}!r%CjIhsN5Cs7^g*Zt|*f5U|M+
z6dC2ke^!Iqypp(PHwH!C)s-y&0*DCJHjQ>&^v~7BK)058O@f|;{lb*Cmz^=2=Z$)9
zGy+?2XBw(}bi<>S16sYu|35#2ooM|)pwoe_iM=ygWWo=v9dgvOQc6S;J+=UURw5ij
zSo#|Et%8oybTnb{j0+??kJtL;nNB)77jtqj9GdAbGB7wD$BD{6A0yRuTEdD>X&vU?
zRFQ}`roJF|Wa-Hs@%^U`Zr4mHbX@_sVJNF@$9q)YQ3kW_VV3t}nLo0ZIly_w-+tz`
zoMNjbB+i60;AeN&C`8O9%aTD+0=X%IVBX;EVM<e=$XUMFgqpg}8~E$@6d(N<Fpr2S
z2^(NQBIeijwNhZ!_R1NTx{(lzhIO^gl-Kzs{&==D8}nVL?(n##KPYHoiL$yM)+$Hb
z%-ASo{@_56yW28#Jm$bU>4YpjA#qQB&1r~QK*k}&mh^Ge5|J<tVPOxNDxIGYtJ5Ni
z1gjVhaSL#5#Oc>F#7_`1JToP*g*hozli84Clo0jchPas62%D0b>gU$H3?_RHaA^WT
zW#jX5BkjD9xRH5_jGH(QL@tc$R2B`#GdTBuZ``LhJ~iG)9%2qjR9t>*3BabRk>piq
zC9v%XXhv@=XrLg@I7Uciwua;_REa1r83V#(J5#?9^x}+zX!(b>AhfeZWUBU@a8_g3
zxTR2(vrLkr5SDM{j1Cg~U}t(;R`Y5nhi01fx<UE$qJ}VG)tn$XbHi3D5}2m0aWoVR
z6y^q@Jj|GJ_|CT#!!KHeIz55^EjkvtqLT!O#J6CTlFi|`8;6Bq7QZNgXb}>I>e5Dc
zM3HYYU5*gK&bVykI^!5QPTg!$JTcjHZ$j2uN_XkZh%Hi@v1TpzYci1Z?1m6<BzqDI
z$Z_FDNN@g!lAMXxiQ?dxNNjzU`LK-(BLw0qA%&2qB+7BmD>jfWlW10689~$&M1rLn
zPj<?5(v{qtcp^8Wnikr4G`B^j`%a0#P4d2E2gK$S8){1R!~CCpyFcz)8q=ZM(gSbh
z*k6+^GL#pVE2PD<afI~+I!LDdtOC|>_J!wL9U>xsvkF2RHpLn_2g{vki$+)Sz1g8B
zd2<B56zKb(9#jk-gP_za%P#je479}dZ&oTXQ{!TS=77lHGfM@(o$-w5<|KtS@NeNH
z;3IJaP>X{REu#EOs*hxW`Ytk@7U(K#;kwL9N?jB8m8lV?P%YqcEuK3Txx8CZ>QNA{
z{Yj}R66)oEr7*)a!qx6sXXUrV+?x`G{N(gfLI(EciB62&4^k{i<OBg1rYviWxhU|T
z%y(8b<3b&>A4=rhU5evdK8G8H5)7Du0wq}N2CQ@h^RUq>AA<#y1qaJQa~%v`+6{9<
z0&fBw;|%*yaV+4F)yPm7N$k3<Xr;@)G5>#&VMW}Ve~MhJL(hf~ZfKZorPXY5GqO^I
zGiSflYJ2$InH=>#1=~l?5*&S6{%lyx_8pKPQ+=#2&*i8I5JphuUU}j3uMt5_DdtZJ
zie)Kh8M?9laAWiS^PTm*P5!;Ry}5bo`IGJVWnC|4F?qO7(P$FZzi{CX)s#bb5lTb%
zsGscI|E~Ayc=USZ-h=CRZ(rMb&_SksO278`-{@5ktWv(xKo>la!yaivkl3gGygxWN
zs8&{9;*G!V1#E3*7s^1Y{duLIlMEnu)giW4)uoFUudS|rF0Sm03;x&XT)KGa>gCmI
zSHJyswf=T>_2M_*UazlT{^s(*#s0M`t4IQWQ1|-X-s<NoD=XE7e*NYGWhVLj>#x5)
z1G^hHs+Ei9FIHb)s&3r){Oi*tdXx*78<y6toL>?uPM6l6Ep<8<rjy=<BH25$>C(@k
zHY5RJM`zS%a40igS$g{O71D^{jRe?^#L+BwL~>xSOZ%7VOaC4K!h})z%Rl~Yq>#AP
zX+_-SUluJkp1pGo(I##K_05MxTDiO2#p=hi!O(Rh`2B5ERfyfLk7hgkKG239h)mCO
zNxyIGyd$}#?6cIyuRx1KY`_ljOz{PYy6g_=(0WE^K=q{9EfHUe?_lFdnqr+(PH`8p
zkV`;)Y{fSz-xU|5d!#9)`0`ls0m95{)S48rqKpJ(j83bYD2s3+@xqYiG$t}}&^F`c
zWFG%E>Jb<4hb*%>f9o|L`@{DpVNp*BwnB3`byT&GRAbD5Ih+hDjGn6;XP(pD-$`~K
z8c)iINr?!u5<;-UR}ShHvc_I+QZ{|?G+nP_xJo6{Gs(9w#`4!9Hz+(qw4wwqaxI2t
z$9fBpZ_hEF91AwuflcijUd$ZLNc)8P&FLD6LD0r@2`J)^0^gkl!d<Q@wWi{gnGn7>
z{~@B6iS5J=B{TG~4Xy}P3uA5R>QpYgZ9ttMJ|9-VCfzT@pJp`3?*j6uD;JnNn+s1>
zcowtJB3~1ylBjB-nh%a=4kmj?R}Sf$Bim^O9}`@5JM~K_Sllf)GSC{sf<w{DM9Y$9
zEVef34RiR7LnD%9er!l_YdOQ{t%9Sc<n{)oII{)_Ht4;+iFat}O;h?;k4gf(;ke(O
zzDoLibBU%Ax}*<fW&Iu>5BgLq=&93Y2tlaaxxh=DuIF871R5lLWzh*m2w9z^eOoj^
z5l~y@1Y$Y<pa`#AHG!4}X%wNPRg%`5XWZLz@Lq8ug6V~`nk4W=P>a{90LvG<cDkCj
znt{ry1PY)EmE{(hgL_)F*7|6O4_Y!d6acnWO)zYRAE|;W0Bo(BK!ik#$9%N#hU1qG
z7=FPtaV?^LyakIXe>H^#@_py&qwpmDxQipgzRai?X}dLY!QoL8Q+nP~+r=h<T59aT
zCJcy^T-M9MTmBWYuA6`3M`4b{0{a1mVm-TsJMFl3NNU#5Scknw#^e!h9ZQKI8wZg1
zUb(H*hz?MK7h5@CCdE1zh<u6oq&7}XZQ=ptArfTnndRlmO5ezMI97rN1X(+g@&cA~
zx~3zoGoK-Fyuh03f<>p1hPK$vWJILDK!uyf*fAmXB}`uS595;^3gOQN*q7ZDh&bm_
z6ESYZ+GN6|O~@Y;V&Y02tQ>%+950^|@qumm(E^@gLBmagvSdP8Aq>Js=-GrEKCp7l
z{n{vZkkyFuC%uT9b_L{O8@4ne^tedIBkmq`A7Vz?Xex|pL<W){5qVE{1EbL?M1#=r
z6vH<pQVTID-HxM(o?1F$?7qdT5w1o7FUql#PJVdG&NZY3(?D+)*>;6iV~!*S2t9z*
z9C-bJUl^iHY@6>ex$tu^mhItUTnrOuYx~mGtKT|Iv;e&PfU<5|(oi*)h&F>Mc$fR*
zkKDl4CrVsR`<g^}J;6&GWSrv7ID%$%9v}nl;qjpjh|41S?^sZzA7urF?sE2PSgXD_
zH{eJ7R78Tyo}RhmV-8i(g;RuP<8LG61_9i!$a3w{X=->t(DmSUzEj$T<7l3fW#C%=
z%j(q_j{%LVzb$pa!6%0Z?fcsjL!{gvT%BJtl2;EAY=PG~<SAiFjE;;-Q%rZ=?@*Hq
ze}kbx&p*Ic7G!X;Pos8>M7R6s69ueuTRFGp;X}eO4#=TmuUk^p_gpCUH!Y)&h0t=_
z{NupAXX>jLQATZUL^zhs#nib!hHXAdW=f)#Bs~hb;~a6moHFU;`6${!A^euoq);Af
znk$M`c~ujseJf6^LocFCkKyN;P7jWUJRMx`2B1(9X?ihp3KI*bwlE`_aJzgw;BaB6
z83<QQ{03P3&tQZLl{nZ0Q&PUrW6B$Yr!%v`5iD>BCCi{v&UJEtw-l<k&~cJ&0cl40
zZl<)~+{J!kR!xrKuB19pKg?)=0FH)h5dDmi7W)OsrWf>(C%FH3h6Fj-UHua>*r@jq
z#Q4BW95kQA*2pzOuvg&HgmmCED}O`M8TKPa{9(NiVVSLk$ZJO9Kamq_^zzSOfMgXA
z+19)<LmyD-Jum71<tUWMYa!H272#`;F+`&Obq8P8WI_f17@ng<Rea>mRS-Ujq92|K
ziBB>2L?!9kY0YJ8*lK{|sMQLxHmSGcP`)51rp`&$62c#f-m15@m!1(@4R@TTbsu$+
z`UzeNl5W&#*D@bd50DAEq-d?F3x>@l)gCFvjtbBr1(enR6#xCJ=^6S#2qX>ZBh=00
zCFvvf|66hO9+v<F1XND}7G%i}^_LJb$DG{$1t+^2K<yz#86DTWz)S8VFYvS`D`T7+
zaIW&f5L-AA`!D`79gkjEC!EzslK5<lCle%95&1{tNb3B8WI_=Rk>Y!#Ss0y!Q8EJm
zGmnYpF&h)<XVKASA?-zLmU&Z7Cd9-6dGdAQblnuIWW5?fBhdUhI9LN+U1?JSfyWR`
z+X|;M8?RKV^4*HS-nx1{8owRclIWA|<`iiLuEll%Vsy>8I*?awE6#6GjpSWhv&sDG
za>zr6>R|)B)nT=q5|{XKH&m1^jW{?;`qmpy`l{&8yX7lNuLW^hb@bYRt-7BPp3Yb!
z2s58JcK0BY8^z@6J8NMJ1C{R(hW#|K4G9Gqfi5+Id`Z9HA`tdxL&;f2#EoKywEe7d
z=e{7trOqYb;mm9DPW@sW@ai~X*N%@${U_(l1q_f}55@(#l*tCHUKD3?jrN>m;=j-r
zRu<-gJIM(h`j7097X68t1fmH`ff!nr(L+cTHq(n}F-m_M5l2Ll?qL*cMA7r8lKd1l
z-W%KlwKvykoJDvGk4g@2=t^7>PCBv#I}AU@6;xx*u?IVsso&}_q?x7vcaorywgrpU
z(k#xLOw#-)#H;k~{4pX`U{X_*5ZUf9lHxAQujnQ!=G)Z;-RK{ZQWDnekH^EhOS_X+
zNg26-CL5;OaSxswqX*AJHe8=#2P36f7O8}>()nOm!$&wcW(7(61g?VTwIBr<sH308
zajQ4U6A#ZpN+w7Maa@U@%`9Xzy~jy!J37)rUh#gk1$5>^MHiczITEC|E=usMzc#q!
zdMP7}y^OvDLEAh_SdIM?yK6l1(;PUKc$$)}^x}x?)ur<6%A+ROC?3%sW?G@?3i)5!
z`_Mzo#rx0`&4v1yb5$4vut){k<;eoT)tMu?=AKYU&cw~zs^K;zx{1doc%j?+FwJ59
z*b*qEi=1$qO$>k#DI%ba4n00e#sI|1E>K!Qi57McrX<M8;vhK~zy*<8fV5pt_z)6@
z*1hpDsR{-M>8d|DZ)~@EiHF}u_8dFCn+gvBTmlqo1D!dZ6hQk!2|vs!9aaQg3mHLy
zcbP~4$7aa_Jp?QTC^o$LDg)JLZ?N(#rqIyO!9vyNFWb|A+a<R(@XTX;+5kR{r%aaO
z6mo&n0al0Mtg5|vbp6KWCiXMW$P~K*$U=I&JCXY89#*;UL?VTfav%(bO9B>TS3L}K
zQj78djYpo(B-{qg*N1fWi(%|j`ds!1V!1WBP3&X}jHMehIdEN-dr{`jpNYaMZlff`
zBS(7ZP{U6%1;um3YlJplli>*|0vxVNN<7+_k>!_TJT0H85k*3-Sk_K(BH=+_f|;0_
z=aI1+n_1{HMC3tV)2-+pXMYxX+vpFEjsW=W;}M5I1uaPLe|UaukXEF?3Qk=4xoDjS
z%+VAVsh}{})fO2b@7Jj<)u5allBgLc%k&ubIFKJX2u{kT<c}S}ag1DT#k!sF5)P3w
zYC4>d4tgZb>vy0&WE<DRT@HO}$kU;NjRjnJqw1hLgb$Q>61Q@M{dls8E|hEAp8hFg
zBK|}P(yAYgh=^z4q#j6s$IE*(>u@V-z-L8ANX!%oE7%T$U4(Qwo;{(>0nlYFM%~TH
zJghh9a(dIeTMU1`SWNgAmfEz5n>{s2s%C$Jt0+C%R;ox|5MRxnw-|oT+D(Z0sZoRO
zi5$2KP7AMY0Z(Bu_AHw<7F<)%*#CTtM6dGNEUnTM&rHY3YS2*;35J~N0!$vb-U^#=
z;$D<pU~XkXnW<#Yta@)|uT?i)03OWw%B)sh@@rKz^+Q=^^_J_91)G*EWPXM%#<rX_
z{7L&4pFjkmDyd{$+9st9!W`R?dM6_Ai8a|4=4H@RCP)#w--2r5d*;u4`<oAULH_Jn
z9d&yE@63XXJ?Rc{tvVy(lDn}n3AA0Z^8#g*B&lJ!){Jp{_9f6MR{rv5W`S7D9T+{e
z34gPC4Z9JQ<&JrvQG&OS?b*)(X>T18O_aiG6v)RdeFeB?gNxKK$m~NyHk=LM)VE;m
zp{uRtXI&`_deAiEQg$xf>ZJiN(tgndyDIUC#pM}dleycHu?48)LZnQ__!Iht?pylV
z;6CYoTlj-v6>KYD*whPt*k&d1K@^)$464QG0XU280cUb`4Kb2d5Pn1xSyE0JfE4fp
z`Pg?|U=%!`EUv_@NM2LGb5f4J#6@VUBL^<r#)KmRkbdqC|Kz~L*<kLL`nYcCVqM5h
z?5EX@#+ygxjpXrLQd$)$2N3L}NFqrZqbm=N1QOXgpxC=s(lr>*^3^6b4E60$C;Bz|
zY=zWfSA4{HTDwqF;3Lt5<Z98`AB*F%;}Rm47eVL3d5<dSkL|?xHo2vL7cslG6sq^a
zl1&#kZQ|%)#w@PW8^giqwO=BUx8JkP2$P}5erx=%^TEQ?`K23cY?VffP=CQ+(&~F%
z2n+9v<jo{r1mG<Wysorj{*`tB!o1y~iWT{8$}0@u?6CcohIcYe7~}S_fK!ii7&Skw
zUT`>n?4UUYoIK5qVX-jUi1%9(oECHIv(OU|FDk~|n81_2IPrP!iEBSE{AAAk#fDYT
z>1@ez7%KcqA3D~8F_6IHIRXJriI2$CUaRmVAN|od%y_?cCUUGCj=Cp9Y?qKige~%i
ze28W0gAB3MwZ0f#=09upfecU%B9wdw{STtZe6%uh5Q(dJ27i{e`v2Mc7VbE1Bi+9;
ziSJoa3B}l(&5McSrACy@=xLFPZ&vYHkI0e4h~zMwp&rrtzu)hx7YgX^;gFKNyZ0pL
zL>_iGfI_`dC={eMTliu-F>}AeU@bH|?5dcS9l0l`X)tK3%QN0CH}=ju-CPR00!p`!
z?;E^cgvhI6BK2#o#-+tCW6@G9FNJ|V5SrOvnXAMkr8VD2;hqFAEUi{uzO2qlNQ*wM
zinZwAzkz9PA@c!?fe)Cz^>Ee6I{*#GRNh#xqdfZIBgo8c>|1}(?6rfdPTq!Z=H5t)
zI(l6p80i^4cT-I?E?(7qY#D<8cQ}9fVOX>-u8c<qp}}O5^j;qN2psfa`iANJ?kazP
zAT>Q*6&Fo6txoxo1k0fKaCCei8vc8y{}H(YcfDW_{R6RqQ#0)4zX>T8UcmOoF7{MD
z%<6RdT6KMpR6?hZ7BA`BPo+K{PkA`;gOsOtaaG>%_U-H&GjtI$!u|}|s}FPe)9_sW
zp3iM5^Z^>C>gTH1t2+5ODExScI_Je@AI4p~-p7>@<Q;q*<Y1}!Nfrg?alUM??66;H
zRas7|wLM)5g-ZbXU@wP(#7N?tO2vb24(FvqYH7M9f+=&3pknVQE5(1PjsB}Yw0d!<
zWJ%*?F@R;wxDk}1gG)Y5bM_^=AZ4{Cu{gX$o4h1jZIrZ(S+PO(*jH=PIHs4FkF~sf
z3-fm_(XitatTs2dp_dq`G8~s_=lb-bHW%n2D3LnG9($#i+RnHzk{w&D@X#J(S8uR9
z)K#L`zGs2$3TDK`CWdTFCc*3Iqi7&lw5nQF7f-J-!hG#J>B@T7kNr)X8V@}*KYWH`
zk8>)ANR6CmP%WoP;fv{MvllSMNs5s#7|0w`4a2(50Q#<3R|nSws0Xt}eu+%08}$d~
zX8-wcax-6^`886&*c&sO;Dz6KeK@(H`BOJe^?J=4+&twV)rmFi*GM81&PnlVo2-oI
z1;ILdnH*#XDfLJKMn>3NQXW@sij6X_g3c59w{*x}iVCjQu2(y$1)PLQ1;m5f$8xBR
zM}2UrMP05cc7pVir%HTW?Six_$q<<y$j*fB7w{08Hv9p?RH3SjkAx&Cxgm_fg9vu1
zlP0O*Y~AE!@`8UXirb<2c_qDQAL9dm<%85ccg9W*=1r}%tH_dIYFKbWj=}bd!_VA>
zP_Y0@o#0G>{9#p<aM>ia3{L!=9lj<<qv`+-RwGOJaBds-xAZIkwqnW#|3C{Vn{b)$
zff!adx$H<PM4(B+_|5^Sjq5-BXs}IIF9aEwqtuo_A52R^&PXZ>HiQ*VH{Y}aS)QRj
z^u3hAGEk&c)-b}69giceL<c6K8BF{`cF}wB4XMlNKS*7;OnT5zmpO9=T}moKel|2y
zKy&f&3GdLi^i%rU5IokYfiRHK#>O~}S{IT<zJax>>gCCdE&)K3nuaOpXdfdpZD`UT
zk~lWh=S8VtL+zF%1O_f9de*=r-J+x7T5HhZGWmeLaA?h$A{7vkT&1QGlu%(%f1Q&I
zmd$lRf?F>PJ-ulKuinn|)sVDYC1Z?0mAQ4(*J5hRa@cxj*6k~lVz)1QH8?Y5Vr@Oc
zDJVZ?1X7_yZyaP*jly)iKe}F=@NQ~V(Vs1f4IM}v;|xCQNiTHWQd_Cdnmn}&tytvP
z2XiNodV`F{?H8n=H91|qbm+;dzZ?{+4>FLf_Nj)mRU5j$2%D=+!JOdB0Sn=oykUl5
ztBl+hR2whMFAK$`31+<{gV{q2%Cg+6Jow8&C)2(-oi4-hyuRACn@75gTc<21x;ZN4
zmwLi>!q_Os&O!b57&wqn0A6*CBS4C!(&idm?d&7--MTl9t<bjg)0zNs-DC)foDw>&
zmI`!x&vCPu>;$tu;64-dtOf3dQ1GP2I#<Zztna?V0`7Rj7-bFFNNAMu`F_|;d}y1z
z30RL{23UqJ`Ok)qqUW-Snbeh{yo;n>XgihNjD+-LS}X@7{b`7wHO!!gMRfmJ&aO>f
zXr&OIZc-fch>zk_7puJNAfd9lmP|>Y(KKEO*RVj<aEJ!l_lTKc%V^;n#WCUTaQ3Pi
zwOQ(HOc7TPbTS#OX4;LzgC90od`R}iR~<`MkY%l;cY*nm;2u`w=cjA9w&?8UyT$a;
z8H$yJw!z}p)eKk!wOY8WwN;vnmUpBdK&<p~C}C`Ww{g@rieo~q+wf1dn-Jf)jKIX1
zj9Y)YIlAVYz?Z!>U{GFy`Lvtmqyes1mTE6?^uX$hu?w!c<-htLk=x#WG1+>WGB_?F
z(Zjtq73<BT1P%D8^xIRl#$YhYeO6AGf`#{AVF~FjTsf9nzrmn{UaOsq5H2zD_&G_M
z{j334umqnWHlSJQCF?n{;9#2ir_1oKCo%S-1IX0vk6SQ4gn8({I3vsJ0lhu}v<o*V
ziWvI~Yt($cAt{`KR-Eg+YV88zz6N8%Y6zI4h@Sl*FjSk@7q~<TgW(aHGhG<z3Y83&
zbpO!`8uW~@(!xC9Zq>R5ONUyrT<;&s*6w~<xh|p5Kh%<iDaP>S2hAKb2FiR~y2?TS
zuuVK*Xs8!fCZ{TP(BESfrFiUR!&1cpM@~=8gQY#vY)=8;9WS0h%O8g!qSx?@2E-Q}
z)CovvuU<lcr5SLs%4!u5`a#a2tP13TLI?xB*nLUx$))%~n!Cj)eD7p=J%pa#dzSyp
z5951-Y#p4x2Qb}ptPZ$XS{<Pe()q_OlF%~<-Mm$5CG<4yJH>}-UcF>O&lug1#&TlW
z_m`m6>BlRe&;$QKfQV@NXmu3&hNU;NYB`0z_NH-mR<Eki(@PVx0YJ&H!|~G7{?M#Z
zAmuqC<pVO6+^!r^LZ|RZd?DMd)X)Q#99U$#+V_#iHn_Nb;^%5br#17ovj=3WjoNvs
zA2$9*^OD|zJzB}QcfK`)(-%xH-!3t)<)g+JmKVJ?t@Bz8RC(I5GUZh^59w*G?(Kyu
z-b7y>Ad5Z3J}vvD7R2x#x*F8pgxa&e`*fMT>Qg}p3fCX@^?<<pTgavVq=?z?Mo|1|
z;p>Xyza0JB=k|&4to;6=inU-}P}fC>^&@IqP0yU2z4B*S0YsrXuJ?`+`eDg28;lRi
z4O9F;<2+bKnt1TZ#>NJ?d4+xC=vCT?OB0WLn^?j^vUbshWfPQ;n3aKKt4dja0sv!N
zb)9faW&I?7j2LwP{v~=h;ch+{ef5>HS>25h>6UG@mgc^&>2Fr;ww6ZnxOb$!s5#p8
z#M0S(O(XTZ{o3OTDAD@wi}?*?lprNmFBwu*j64k1hC^hdz0Zd=d~o43Gc2&hOz)HR
zYD=YaY+0i4(Lo}WFZux)LO;zu>)LzPb<@H{b?6U-$~pqA+b1%o|Fk_)iMK|~!YAlV
zaPdy29>OKxVwe>^F9?04r8_p@pQ8Nu6ajG{cmRMUin<SgC7)-G1H_Hqt~zVq;pR)@
zg%<SpKQJ7t-;2O>=F!pUN|(;#2E1mk(ui3r`=-efb5+f5*>{CVPrs`uGN7CR*T9<$
z+>&ibbkJw4s@7dIVjF#E+<iB%+79_X2)Fgyh}>EtTbLnCPk!9)r~!<|49O*?WNS1_
zf*m_+Xd(9Jt5ndcpgt=ck;k50vC>1|%M1G&*!(JdV&G}#LtlUOl}?VqL8v*DLwk09
zGy=9}C}NG;+Y5^VQc3hE(=<2R9cyRhkC)5`qCBwu)S1kZPs;!e-`oC4r!RkA8g^7e
z#bHvcA++u22hkIWHF6>j`RV21eB(2%K$o*}iu>V4APj$xgPnW;@yKyO>+s#r7`2-|
z^WF(;A!mWBaV0ibNj7#Gu)X1)Z+KGNXIOIQw2u+_5-}%NK@6iOWDN$fF$b}jQAH6B
zaEfsk?DaUnF=z*~nKrmogrv!jqG69Bi;RSxcfNudEhS6z4(@ft#ubv-VZ~<D;?3;r
zm1p>LQhvnF2OVP*WED#G(y|YZ?*mGTdIM2<=k&zJ$aNY{pHOg0xAqh(ZdisZ`))_~
zU||e$Ha*4-JUiXI7v1K#XN8jHR?MG$s<5rva08_*57yYG?AdDDM{tJglssX->Dfht
zUfi&6(5`kc=IqfM!|ew#)j^PsH~9VV5QEbj7-I1Iz9IUSpAZW#h}Cj`FWY;K(rMCS
zqtUevcW%m3OE-b@Mj^6qjje(W%U-fyGen+;8Y>Jpv=g_1O<5M8!i7nZ734dlQW$iO
zit~@b=8Gx#%i}k@aus;7Q`Cdo3zQLE@^#UNQU&ek{9w8_do?|gZgFuO5|{e)769Du
zej8IyR!6Yi(}l`nW9J4rtAN>K<B(Tz!7L517Oc}DX>Gt7<i-M4$71xr*$)4rB)i6d
zP;R=EkQ`Vcey~d?|1Y;{GXduv#?j&InoqToI+Q*tb6IApgTx7V(>du$`O2qLVk+Bq
z5g|BBcq3*UFLG<RRI<>8Jlmpmy)`bB@8Um5pM%~3qbuHJnJ_UtY_YmN3FSBgnPd>N
zvXB9N1W^_niz1@M;CF~==;%C;fo3PNyj0!uk@Q=Fyin+4=r|=vX1R@*=g&4~C!t@j
zCA8eoEFe2E5)A*@>?Ct&0#=XJc8vkms}7AY4T>n&SqWu|lKz9ud#yMfE%sRzSBmhO
zYRC>evIH2lVeQ@#?-$^42qc?O^&p_b|DU|mo>sIl{aH-?*jKg|_-@b6x(bPB$Osu_
z8GsqnROr}yc<UjGI^$Bb*Z<0hlq9V2XvZs@1>(hK90MQlN{DlugdzF@GhQ#<4Wjs;
zI|nre`wX!y`ojA}#oD!Nx26j@PwrA@-CRTN9K{Ag3NB|E)wKwwn2$E7vMFn4i=F3P
z)TkyTQ&}Iglbf^IV$AC)kgMbtxz*17UtN+8*1Kiil>C|9#SFJMI2Vzx)PKaizwVuK
z&mNVNk#nM3J^SGy3xmFxoIPVc+dc>mT%x-Eh7e1WZg2-9LfG%1iVX1zH}XJEvBL;K
zk|og)bYBA?91x@bfGBpl|LgC#Q(Q`TV`E51^K6tl<IDDktTASREHDGFK53P^*Sozi
zAzV|%!$@?bi3A9kT`IsR4ALNhkg7}BZ_+$8$TJ|nFF-T9?1M7Vz##MKy%{t@m4+tA
zSvDs7Qo%XchgZ4>lY>^+mwRv6BOti{)Ry$%(*=V<%8>e{+}5N}<1@X{X#+PH&DRt`
z?BV(b?Q*D3gj1x|?JCtyeBFi?Uw-+eUI$fw8g|7601n`D>r_Dr<{_xI`Y-T2t%qTe
z8l4iDJ<lzLvU_s*dJ_f<M8dXe9M-g~ZR^boI+2a)`GhT4z^6k{AS?sew3<(FF)HHq
zyc{P;dWOKOu|v>YX4;W$#G;S{Lg6Wg<Fg$hPb<`{GmAt*)O;<sH29UV2goTj5j#IQ
zgy2<O93I5A4lh{r7c9jF&?7Lp{$IJqHoilMX8#;lRM|cQqIJ)u?7exe2OFcE=h#>O
z{tt_{NDTesW&!^D5lpuh28`aAT8ggJo*=74?~&-Jg@s)<3x%+Y*x<qB?0^}HK53pb
zL=F6Hv7tCvnp}cV7m;+w+=UY7^K3g}(^R8gHw$f%x}l-V;JLn<oi65(Vd_m-u^Xc&
zisPMIrgm9v0JZmVE7v~vYgn%xs!xtQ)|=w<jRU#GeC##a9x``e3;RGkDGT5rwA#lT
zW(VoVgjg%OiFQly_DtKD8@)b$G<Jn7sYV7B%gEQW?(0QsZljkyd~1JnYw-I_*WnWE
zzhr=BGGc{Q;C8-X)@xtagag&=@fo~zT)34|6>7MocYKLn{o7~n1b8Gg;F5AXcq=zA
zFa!<>I>N3g%E^)thYJX#Z7Ry8z%3<wAELTMo_MqS<n=Be|H^M?)+=eceO1RY4R6Ty
z$%i#TWG2-Kyx_7v-0*ld8}mOzcUcRNInbzJ`kG!NcMa6Rv1cSWT<hzQFDMGW0V1b$
z<yq>xmr<qV2Cn2$LQVJHqMJx6X(+{;d-C-Zsq;ao$f<sDFSowMQQ@e0+I_8?#g`!)
zO3oP6-j6Kzk5i^)=<QZD`n>O6L~fgQZzpbKCvH4e77fLgybMrnuh7v<va7l(l|U4{
zFZ#lkxZVj9+)*L%Mh#p1sd5{CHi8$=oy99bNN+19F3*LFQg#OXWw33$Z>Y5Cx}sSV
z*!Re(=u9{c6NM@6%p9M53(LzSh}Vbv#Zgj3bUSFS5{Ql))S#iAiOc1=<Lh38q0O${
z<WnIswW<&)-&aqzp&s5v32-EQ5X1QFy}L*wa$AUF0WyZrJQBPBC$%N%??c+O=r{c>
zKWCssLyN?s)IQN=Lq>er5YWD)$7<<9>Es4<DYjPP)P^kQws82Xt_{GIoSA<5S~^{S
zf_}>hs3J!yD{KCh`)G7Z9bIPd8hA(l@-P0uPjsC#7*_?haiBtMdDF>t?IQWSi<f7(
zkw=24JSP@FAS_H1+MrQ%U8|H}=g*H0#LdD5TyU6AQi#JRXbz;uciVoy^ttuJ%`6q2
zGy`czvuBf|W@h59YA3qdIGi_0Z&>S9D;)IHd?EJ>2L>7tP2dZm-G|*X76_WI!yRjS
zK9a;51&^dwc}`@|MMHF1_~qf*AxcsNP&m8yW`Y}-1Q`tTwfEI|*P+iW9Dr||RExC|
z-NQFFi47i0No^ZdJV4C@SdrcH7r538-m(U>n1*LSs^@;I=bM<84<92};})DNX)Q)t
zMu<R4Lo)|gn_>0z&G{57Sl@OY6d<yOeO%(FP2T~kL1TZX0E>>AT#7xqN5Sa}{>5!|
zrD$Bp+i0}JRz892*EiTWRE|yWErKf0P^mq2r_UC1N^ibBT)fnRJqSO!r7n0zToLP}
ziQ7JN;_x8N2CJmSOVAi`HF(TX3XW?LtE&Q+eewbkF09!^!_<v&Umq_dgUZkiw*yfw
zdU+Z&J&dESX%f^npK1S0U4?uF4{CNYy)~Vlt_^%@dT=zVtd!j14K-ip0_Sz{Rz~Fl
zOyZ^x-|l>;h{4KK9R}JeM{95jAJ*K$C%8_kM>MKN9si+vdx(N9P#6cZ<4UAQw*INU
z?R5d_FA%voM}R+}9gA8X%Pni=_Gqq7V{ypif{5Zwkv8zAfu$qiY{T`?HjY$_(vVyA
zHml@Z?N{y(#NE9QPj2#(F2P{mca#b2FBILmhX>W%hD2EX3Z-4ruNsnpKEq}TQeqca
z1FgX;uI}q0b5wF8IYh{Wr1&IQMw25}ba;nV9>kQ95D1T-qH#_s2I40}j9a`a$S6wQ
zL|R(Omej!FJZ`?H!8wNRm>s}}P^Ii_fQjYHijqNcL*4ySN+>n9wELBKAEDn#$Ue+f
z)KM7IBUj%;tv9;EI&fJIhrSA5F?<sZ4yt=KnDbj9sc%vMtMZSbf!ilg`^jO(_{!;2
zyLOxc3qQGs`Sg7L(qEI14&2xJ-ZP0W1PVX^R_omw?;=|l`MHZhrdFsDdith|o>fqG
z>GvnKk*MF-E)hD(Nh7nemPlW|cU%xOkcdM%4s36+d72u7r{xO!1f#X-JnwG0DJ~+t
z-5NG2VrekXPuBzq2U}bsV1sId!Gl56djrzES>=s>f>^g)>RC}8%rl*1TWoQ|qDMEF
znRo+FrpV=nD&+OFr%2|OkA877yMd!LxM=g_#SM!X=z(ULs5;w5*F!i;aw8`r^n(y9
zf_@lHdE02BlPsR3{2iB1b|Wt$k`i|F02w_2o94l_BKL{)1fmArQT4&G)mw9**sVnP
zExDv5(Q7G-Iz$1FMbu-O(79MJ8dCtBypLR0ypy9|jHMD3WaMpgX>bvxUMWB5xg?Mq
zzDRG}pv0rJm7j!-T)4SRG3#>MW{q$@_8z+lXSN&LCg{P3cu=S8J^c>40(qy-9pvrC
zB+oaFaMTc{k^4EH$CtK<8O*TJebLym@QobP@PMDpsXRUC^j|bR=dl)I!?ChRplWvd
zKNeH7vK@RyL@k}%W$}cq+9jw877*$!V}LZR3n?ud#LGq%&M{)@rmO10o;LFi4}Vm~
zPyXoe>=n2R_&@bDoI12*nwKGLNdnly4%#vHp}2-rGut@E&#>XhEjC;OJ|AIg3VS6e
zT_ZO~^9jTfix0N`>rc<DLjPZXDzN-a_5fv*j;3W&w)L>FY4@PSrk+LQt)Z2dNV-rq
z$Qbeh2t7MS0eutM$4=y*Cr8*evv59lCK1Nr12o|YR*mChl`Fo78q&NnXgb869gL%Q
z=YL(TlaI3ZM`$(>**QGsw(3n#3&ksKw()pGDvqAxMHhEA!L+r&42@)q%~7m~Q5Ek(
zI<%u1fm~UTA!;soN1z+v+@GAiig2FN!_;zE=m6Db5T>!Qm5k`ak*cSQQMH!X?_*UT
zk0j~AL&$F0G=P$3#IT5jMui_z1YvZD&9MW!oE=L<o||()N$nMhlDr_=ZIy6N=+3U1
zS6QY34$P*n0X+&Dk6z5MWIRP0%>vjaI|DqFRhEmqWy6}A`lDy(2uDK1XJ?bML+o8n
zSn*Hg@dyQj@C7ns(1-6p!V<@r@CPDD4zhxhO1uP>+3=BXWKQwj&_|}Q5j<l4)tJ~M
zAf|Q_HW|4uae^ICAV8uWSL}4+cXXEkaS#4;t-GBA_ZD@%R>oobgk|+1ZGHi|Hp236
zgP2aAw~_j550GI&VjSz*9^1-r^$#|}eU2_cPE1b|CDx9nFDCo%fOcdg>^%D7SHJq5
z1;cc@$A`>D)NkcrB`hAvK0T0Uw-Fw8Up3Zu36-4U#=?WiK5EF?c<aG<``&*(-rCzv
zZc|3LH{n1^W?=kq?l8%t#2t)ipoxCD;f)&-Vt2#am+&h)i7DAgWs9Y-+kKdl<MU%j
zLr=5yQ9|1F>!bhrFP#u}wF)u=BoO0x@)n$q&^@3Ut@TmCqd)iam*BjbmjcmWZR9SE
zqk^7IC(s-|nI$ysgWv)((#N(z6WC5f$H^h3yhmRT5_NEDAZtA}A7U*xxddsu&4jdh
zkczyqM$2E2BSH84sHhYrKG+WX8;f_VGeNh-mp<90Jke>_!yBD%AaIxFkxnO<;gwF~
zkHIsYPOGUa?{vON>H*Bqd3_09a`I3phPw(Z$!Eefok7z#gWT6?RJgG7s&JzUD^Rg#
z3cHH>>rQpSNGopO^8qZDxqs#U5a-ALY1O+So^5v@*#c_Xb_NDp;gf_UHUh>&xNwzl
ztth(Rc5vivIxm{G469X0+dg?cJ;G+e9$subcSYB<l0%h<6%A-}J#^W$S<IF+Xf|z$
zf!ADvpw8pxZ$Gb3aKS6!d;YK4{QA+T<Ca&j3>ye6@7EhOIH|%M{v}hE_n!<$VXaj}
za8Lk_*7N|I!bm4G575%qpX7IgE>XMfmxRtH(Tb&xD8r?NJD<iN6<C3bLAFX<(her|
zk}<Jo=g)B*Zg2MW^zE7hfb9&F^UzazZ97Z@a)yR!K9w)R4etETN#7uNc66}3A7@&m
zfecAamU;ht2?KQ?(Kxl<=rg!#c<((c#DR20MEvO<uyD9*S9{yZ5b$k%XRP7i49qfE
zP?8u1^AfsKZUUA8r1508LCvfJFV%(00+Ndmoy}<|Rw7`p5a#ym>@f;4z6(zEDaP2s
zaPe0|Q+wVrTW6ET)?-1FW+e}Z^?c1mGwhs;>oyp|VH+rjDG^QaNAC{3rnpRwpa8cm
z+|V7@8Hr1q=uSgomEGCZE&7yrQ5Vlf^m}M`e$m>nJ=!i0)pfcFS0RbDLDp0+$lF}K
zv?~OLU);omm@)_>P*SKZF${^sv(X#GNapi%WSubmgjodgxo@!}odWyX-Gp(KU0J>l
zZ6qx(S*<%dxFIy{-ZZ?sY0-ux4P?`xUBjaxTps|{uHQoTk-=I4U9Jt6qwTgwV*?Al
z>|k%n6;wBZk&jdC`{Lm&R?;7~o}W&^Oy{Rf;2Pn0Mn-5W5)+hA3zPnl7lh1_ePqyE
z6jbIG<&9Iji{sA@hV|r!JfInDU81KR@b^Fj+B?YLHl2CA*$z-xEZU>bt9NjP$a9Su
z1LR`|o=M3kKYHxB5qccuZ{o|YKpA`Xk0ZeR`_AX_>Qls?q1Q*lg#Kp)dU1sabRRx{
zoEY>)1*@(Uqh77k|4(DsyN|ZFZ~f<!NB@jsml(_c$|&{_A<J4PFDXApOfq6p=Hf&E
z?tY3_m5AFv<Jgnqx$JFp;&2rLHQe6$2CLMM7{^|TTRJd&46f;PT1_728r;+Qrskr~
zYlCZ*4KMfcDHafjfv&=}m(TutBH6xJu2#mMB#ey;#>sWBHa#mu{C^m}UKT(8#Aw0F
z2HeN6Fqr;MU);DvAU;*#)_E)~R#iZBKo6SM5wcGdwQX3CXL=sbUwar)Gr9IkRE})=
zc=yi{lxvy?<N6%Z6pKmx;7G9}uoEVZ7fxoVxs2L~5yywwJiC_a1c(hQu~%M=>#aJ0
zw@#}LP;Iz)z{P(*vPdy`7WTg!8Pzg*d4?V(bqfA75UkiKaY7X`=9)Ep4V1liVs^EV
zQ8PGvVEK(i?7pK^gOSrJ#_P-W806~l-9>Li7U@DbyNKY9AfYqNo-}G?TFwdDr>$-T
zKX#DlC{(8++*R%->!XhK_ZFj3XRjA@=%G{qPMv}%U&NDxe)>X6{&%KhUpJjxZo{|V
zjahZex18%BoEKQbA8r1wo`y{$V6CuL*g*oVIauH2j3R-I)OUht|9gY=-KhqW8i7vR
zcAq>}|M8)6G3^P|3pvkoOtd*0GYE}F>N}xx-_4rGi5|wpCGXV_JSMrmC@yZ9#;FA}
zQC)+3&rKM+*{-ub?5P)6LFJVuMcaFg-ZVvXF4crM2d_PKN;lNLN_oxR{tgN-D8>`m
zJ*yJqwFX*5cOTRTXXLv`1yv*Xah(N&B(|e;jFbqCDPij^PJ;0w-MK`cH94U>bEx*>
zdWKLr)b^n06~#2d-$3(bke9^-dWMw+@CWjp&=OjY$Diy{XJIByfhdRDUmT)J)<{kb
zp*+*{><auUxzchTz|l0owq+FK*z}-bRiMeTHG)}X7})8mO!^gBzn`gZN_xoD>+>Z7
z4>Na}0&LUy@iSDwQqgDt{h!43Qq~x(Cy8h47ja{(^_;qB*|*5LSO`?=NLo3qi+&X2
zYu>ZULjzvHa95mM@1xHczL8>kPJclB8UCm2gFZRMF;$i_L#;PEqnHI7h2N~qpN!Ph
z%S;R+xf;5w2zyd>0nX-GXSr91sSU1JeS;HcLwVk03+Vv(fvQ-#vX#>a$YMux?8LH8
zH-TY7KpNI>d&|1IvoOxt`-HP%W<EeQW(@6TKpI8-URDihOzh-J9n7Ns*ay(7#L#{1
z4iGyhI81?ZjKMk8CG|X_Kp3D5Umc#>`E9IPxyN!ix4-=$bn^7HOf&9M>Mn{(dFKH;
zuA~=?`Vo3mF+d#zVBXHzb7QzFb8wM%lwI!L6IP8H^AW3>RH4kULuoau`XFj}piBGR
zzJga>i@k%@pdR}%8Sz0Ypa$w^Nt0j|*=Fl)9-lDdVXzjHvP&=AfU$2ne)AT%hBa1B
z&X0~tBB)Y4mM^Mz5(|s8e!P<|!xQ^{JUJnRI=`4nOI2t@<N_rCdFVwB(CeY9axX{k
z%(VAh&dw$nYtF8C6m{8$-AZX%u8NMbSHwO<xqti^p~orL7X5_15ooIT&~S+4B-Jwm
zQq2n$UQ?l?{!T(D{BxYRQC+@nWk;npESIoyJd;voSLwQw(JSr9P=zu#4;B*3GT3L>
zqQRIbwvAp;)(|ONhp2wk!hnI#Mt?g;Rbf;s!FfVz_m^77<Y%3+S)u5A*3U%RQ`?bL
zD(4VwwMsa9P+mM;iPl*8>>oZyWf_dig5VW8EPNve$OJXiwR9Gx{hLFe@0o)pBN5tu
z{D?EfZxV0J*D5^0`?1P>n2e4QNgkmgR@rv1dS%?^C)Qo`QgQ3jdczeycyeD{1POb%
zm~~GU^0n#{L&jK>Fg>V=EjfD<$CdT-dYKvZ!_*_lprAzb5m+ju3)amuRwJAQ<Aw_p
zN=(pU!hJ}S#r{j=Y&nDCbXmo)xC766lNto|B*KVumZH-;9VR^UBU{(l9cg^R|Jm9_
z|Iq1|j<$@)zEnBZkDQD+T^5s+;}TzOEN1s+Z>DEs2rA7z3MUxJ>o*nb2G&nHqZSe;
zHIf_`RZP8X)1{Qt9OYw=Gw&lmm<g*>oSe@w$hmWsEkipiJYa@pa@A4tf=5`z7nMuZ
zB5+us)awtIFM4%W>Om|69M#f7o}gb~H4oKRpG|!{p6*XkYK87f>Bb-00qK}VYS;Kc
zRJ|nzdt-DHf6Ezbq!h{u^5U-2Iu2|`Y-}6)5@cP^hg0r)!NvxiDOF$EG>v<zDQu2#
zu0URdkRY7+`257r_DWS4l=mj4`|uOgRYaMdshP+uyLiUvr*FCm<NTUj=Tl3y&{Ztc
zxA0x{phH0bo1>0+bRZSv?#Epd<V4gifZZ_U!;&(Dq(^m0!Y4GY@NTejIa8*wsky@H
zcO3x8`=TA-ymWD31fcd%Fe)lh{7}*@fz|FSz)ZX~T2{MbHGQGVLSs-LR`d=k6Nvta
z$PPi_ahyQOJRe;reF=_vB5P7D!zbr}aNZk*-z(uHQV&qJ4K6@NIj)*Gn(U*D!8@uC
zE9w>~7p6HzErAC-eRRtUqt9<?M|qv7r@Wm81*l+Krl239R$PWkqe_Mek>J-_DuPT=
zXrc6~q0&ZOp&dqTVt^h8(?;tN4`?mu*<Sf`*D_!FB{-YuRazP{SKfk=$92DJ{bVm9
zClbT8?+MFZfQTAzJH=WTPw@A_IqLpXF+kZ_VWq$f(EhPXUdc2R*heS=e{*ugavdvx
zuRH^va)LUoFLvLd1nTi>b*YkS8GEJtg5e>F39^Q<#EApAG^4dC3-~6P1Br3(@N`3-
zuU%uvmh31u3D6Ssk{DU3+K<T|Brn{R5*5Nh2-LXao*>pD_<>4dZ#>k(5iS=KxJ5&`
ztn!M|Madqy^X8fD*2VVjY56Ga&}vDUnRMs8Eyg!FJDa>~I&Z$&n^7dR)8^Gsb^N?_
zU_y{pfmjYvA9|OKev;(7nOE0F@7!vl6Uz|N#9o^@$n+S;sOlD4U2iqmmGuxCYX*o~
zUu0mFf{DX{fNLDQ<|CL*t7NC8Ve<ks$qp5#-DKYz;7}b+VZgGoHr?)@Voj1TU#a<9
zMOBHv-}I2gZFp{-AV)jXD}^_7UN9hsjL_~pPcwL;*RbOVR4kGjxI>FvyNK}|rv(p+
z%7%rA${M+yGMKsOC2_foUu7B73}L0=63P`4ldd#>;m_7ZYQPH&z(1<_eslB`9#!*j
zoe|XLnTXAI(NXb)k}*k81uZUA?fqp8#p_A^?bcvJJvH#T&sB^{*bMi0eR;|_@=__F
zKb6KNhQ&g3)@V=EIis+0Bf}gVsNl=l1lP8`v0|DSrFx^bF`{L*-e8$1AN|75dAt(%
z+m%Ar*r_X=%r~+PG&E9tfc8klJ!Y{O+vuXpf@_UX#0)<;0^x{?U{G&)9JK|$=Yg+v
zBJ5t09?`x2*B5_`y<0J#)K9xAEgkjc?kdaz^5htW`*G)=EiC~mJu!l8Du$tcE>w7!
z4Q~eVk+bra_J2BgCrJThl{5pC&zJ2SIah~Q*lU++DO~vu4(c0ZvYz67FNg4m{2|bU
zstlty03YaYLxKfE{(Y3P2l%}`$-P7bd+X5-ik(~G`$6FB!k;_kps$yAvo{4&5)}Xq
zcGZ(q1|T2GB>`}jeFlQpW&HpTXLaRmbhBqNdvu6<uQ0DuZg?NCARj*;go!V)gu5q5
zzA@Uivu%cTzJ+4q^?eETAL<<eml)EwSrhkk_H4{eL6vn>Aw!MUOodS0j<+XZkIutj
zhj;_b=HI$atoB$kzC}>ui$1~2FJt)|4|}K_?}*Qua@8v*ggwmn)AS%9V$A04my?Oa
z#PHidN%s@rruU&BsrQXwtNW%8ZM|Ow{<?2_5ZV2xi&1=I(fGg%KXTl*U1(w*u8-L(
zb|bsUSM@!mkessB$MQXsq)?k*epBsJd7UQEU2l{3KqRQ`yBq-PO(D%9T25hvsPu?w
ze_Cj2kquisE=iR=;uT+AQor=DZFJS;*6Nk>XgoxWgm>a@;(j;@eT}}y4Zh!7eiL$r
zU2R=Hmg4u--H0oJe;`lcFG!7ci%w-{O`SFD|KV~#F6*>Zp?=dPZsh8N%BP3>uWr7}
zOETkt_{e?QZa>SKm*os#luLr$Th4Cl8{X2;oA+`I2Uy{+79qCskPg>S6g0Cg-&GH6
zCIyrW)(y7Mk$#+PJ)u4QY_I4dmzf)RYSx*r4GIt|E(s2<Uu8*vqDik0XNZYIKHWS2
zk=6!2G_V0*=TQ$JL(7EJ^3!<xd4Q~C0O$S5+X46d!`<g*SlD4Go?Mo2+3+i_4zA?r
zIdMQLJ-*iy{c3Y_!p{R|)ec$4XsAUz?9A6*W}nGBYfXNA;-L3!r~CG+f4U8FGi?f1
zB^9p9(xOuxevlfsS^cJ#>ErArBxbMb-Z_PXGiuV-k2^Gt*ToO`-(+wTt~L^ais5uK
z(~sZW#xPOrNXM@F09p5cS_7M=SK#`XMm7y#=ZyO;%O^LsdPe~wc(QZJ>)cIcVhfxJ
zOU+inin-UgkP}H^hx6$lqT9%+$!@~ZgNo5K;-3an$W8-I;-sFfrze(>%<#(;nfsGx
zxY$ur-}Q>|)x3$fl8DNH$K?WyGLT1a`i39$A$T7+uF>X&!N`f@fAHxk%9xd-21&@8
zV2ch*=OeiUnoYkv$XG?z20MjXLxK0J1sDx9Ns*JCW66)h+!&0O<l!_eNiysQ11&CY
zzL@nlmMAmYOUx90>3p_-h)ogRA8&UQCLp4V3w)EvF|`IMmqz88VHmRCBcZMPC}6Ed
z+QKy<^@Hm{%=}wu5D!wVP9$Q?;<-%J{>pv|dv5&;S>yITl(D*RIB56jV%B{oV6>0T
zpYhC;OGQ0^G-_yOGkmO2M=hOLmwvi%M`EtZZ>bri<Fq)0%0Jmz=?!UA+@r;MgD)y3
zvFg9+W#+Y>(1$xOvVI3NLw7JMfoia09o}^s20k>n+V!JiAwmb$vU;y9W--i?)pb3j
zvy}E_898U@L41IvRttttZbmG1RxK;EN`@k}H$3^&eWk{nbsIDvxH#9)`bjxJ%QTB^
zulwq=sK3Tx5yW!RfxN-%WF1O#NfKs*lEF9*gHy~Tw67^g2VU`?prD=%)Q{6J_a^VA
zXJ6cr0Di&lQF?kC*(C5-gh-v|0h}Wu9yC(8=>eTIwtd^4<?X;2u1a^RG2Hi0bf<IM
zoe&daZsGi&_X}vWA98SosxA9W?QUymz|M~9E)tX(Ry(lv*f)gVf<hcQxP(h&;ZksH
z!%Llbb}A-nbc9<Y&6)`xL^2IuJbb=q$LnE9=^F7N-HU`+^|WLs)2gh7HI*TFa)3U{
zL#rJ5Z1SS#gAG(p5VsIte(PrfFkl)86SfOeUrw+Mi3^08k{5kt)7@agH_wu}Hc%5I
z%vlnG+r0vYk-J91=4dT7Fyj6TPN;?=KsGD#%<Wb?<BRt^3$JsNn}qx?7)#qysA@JA
z4_gl!;W{Jz@$|d!w58IBmY!{DjhgQ$w+RV;kiGTZ1w12jQ)pQT+?4}b-Fp5*H}M%0
zU%O`7AaXNR%c9mR&4&~&uRDDDxgQ|VFZXB1$H?m|$Bf4EV9Z>&7nb$67Tvj;rQXvi
zVuATBZ>ZO#w&}_I9A^ko8W@r#5+WGE)}?PGQ)+}VAnX1s>`LnK5~U|fTj{xg=$oIr
z9p1pbtfG%3*$6qF97iJC!kxwuxcUe=cCsMhG5{x+<!&T9!7>88d3bO*;C(fHr(3Lz
zQP>#m;gHPi?A7E9`|@<8578eBAM1T;Ts`2vpMwCGS8UfOe`S|irp3$1FdGANW3+{_
zd4uTDGav#XX}o)JG<zoJeSE7nI<{`F%`52PS<49+*-^)iJ<=X0wzDo*cQ?Rvj<kc(
zF)iH(Fh*i|li=Q_y>m%hw;5@_<-{b?W*!(0A|-5-Nb;xH&OTY}Ao+K!XHr~0i`(gZ
z>x>qP-YxA9DbX?|A&GcCkK{^@*CB<hjtu>pVHuq|H#gF=HHXC)AxcW<HWF-SXYb_P
z$KKmp(D+3@lH{vkWf|uLI|J-`UH=0rvby+xh@HXFe+dAUhFED;un@Ea?9RcQdcHuo
zHLpg*WhO!G9-Tsvm-dY)!f@ZAB)EOZnpMStgcyltV34Gb^CEr+VZ-gn=SO-T0hhAL
z{qK-FxsV*k#kiZ*Ie8`uff6NJSqN|O4wWb;1mA4=NgoK1X-%Q6f#sjtJ+Ed~zAP4o
z7XjPJBJVt=27*@Y`~w#1Nf$~~A)^EnkW{M^yCsZdfoGLO*E?4JlJPNiz~QfD+=GM9
z->$_goLYFR0V|wT+QlKElNW1W{Q7z|QbCL~3%cq$F}g~;WVgRP5xp-T=+Q>~xlr8?
zA(X!pFX*)^IIYOi7A~F<fa1IxKEf;&kytA*NVZYyqT2YO?AYnrn%k51a2gL=sE46Y
zI0AzaWccag{7lV|+zr>0yB`CD5{r(@j4-F`mr`!qOf1LdE%L|Z#<>-|5af`T0U=TM
zd8iZDdS(}oCM+&2_=RcEXH)pF@NSVXq@~qywBwcY5IO>v;Yj8=483g43S^>K{Tofg
z#rTH1A801Uvc30Df@{9o&~c^`Ff9Nt)jJ0O4M*34F<Z6f<LYRp*&5c7Z#s^?EhwOA
zfUVg9Pd|WNPv&~8!hB!pHvIPV{)!RJy5f89$aWl9ynbB}g&!VHzupo`a@?1*5OG7O
zP)N--{HYnwqU$A+aC>m-X`g4>(k$$-lC9mu%MsH$Fd_`hOIxjQl`Ma1Ft8qKpt+v3
zNgddOC0)p}La{J*GVK*Ac@(fb84d@^K?_4y2qdQve<(O^$<w}7ZraA-MuLX!Q|%1T
z6S%u_4$N6r1`1WG3O&(=(GF-Pk&brxn&(SFQttm)vAlk^{D6pFA7C3g$~%N2i)Yei
z^<PWKLscMXH8ONaEYx$sME5364(nRTSgn-c{mD~*HR_URBQ#|&NAFjN6{Hl#zE4!q
zMlauOSoM_onnGmecL@#(n9a$Celm%s*1k6p8PQ)68!2bWnuVmwSWnRg4gWb1cJnR`
zWJ0}!Vf_=!A(Ex}OH@$NQ<-4|+dw4SRvg?93GbZe=}sQFPE4_@Co6+o36Del`28(=
zxT1%aABqgVJq~kAN<JRON%=q#8EL4yWnd}sFNR6<i+CYt$8z`A-rH?za-P^8>94GU
zuDk6F07XeCgb6vp{Qa;8Qx0Y|^{HH_?|7Vfz~g_u%B$6qGsn{eUQ4_69>OXHlhk-e
ze$KW@i_$)0W_{9yvls2U*6!2_eD$6PN&J2r?#TQlZzd|>T!3RInJu%H-n1jb_xFe6
z&p&XHebwQ?G2vvF1BP;UGpm%yRZbJsnqz2_i>>oG+mvZN=fQ<J;+2tOE_Rwunnuph
z1&SlQSL~=|v-NngXciU-antY0h<k4@Q<fr;hyH#cOnR|giIkC1$)mr0OafZSf9G$1
zk_S8FdGoV}K$RS+HC`!lK^(7{*?%k69?{<d1g0M-G_FCgc_03s;~47?(Y%gmYGqwR
z@4lS9c|865IWl248G4$R3m<>Dj@!l%d|UGqtaafIsyfj%U*WhqihNPu%HL!BHAf1H
zZq#frG4}EFZ*tDSMoQ2U67|KQ+W80nC%mUWIqP&-R#Y6%9&@b|td%(~SX1LUIC&c#
zM-|0>-rk)~&Tu*<5hiw;h08q>=_gCgcNMV1@n0>@K9`}!$m(OP2a0kF=cu0%N3xKb
zKt3=(@pf@Y>1_1;{6uoHRNOLzKr_&=IAkc1kw;cw$y3l!bl1&Bc`^-c+~a0~?kl8z
zr8k9g1C@g0goZqmc;)%o83J}<uuJGamK<{{1hY3A>xUNR!zi(-P(VdQ2AK&s0MhB+
z0v*lxC@j=B8$BDN^FR(^bK0w&nR46)BBuzz^H2@W(pa8&bgtjbNg6qc-0Zl_BQh;<
zT4Q%qWYQfL>qfL)?UT=abFE<loQw4R-b5PH1xnZsMm5Z2-^fhlcgaAApxM$ab9{Bl
z^ZMN!^LjQ|&1k+kr8rHeUgc0HMfIZoDWXAr<U?kOr<!FWvdyY~?|<l?^S}<!B@GJ@
zQO|=}@hGuqvZ;~#!xt|XSju7d%LG&dju44!IHz}pt!}7I%il+b$Jni%A?8Zv$E|as
z7Af7p&u9j5I@4}+qZqzERU5)zT9R`#UF=`y{(>q;bVr4V`V|mz*1dufKf~|{ZPP~l
z^`{mKg;42I8Ie%zWXMbQ4E+LK565xwE;@`<oM2&T`q!VzRtJVd&&N8Nqd}qtvdv<X
zs~|)~?ax|1W9?{mfMxS_gp;UP8JERjG;Aj*aJJ85y%N)gEcrA5bU~arC#Y;$;5-lx
zW+I-!3jx4dP0aPtT6|qc`g8~(0W52LBsT4uE8lAh5jpy+@=bZT$(^K?&UCN~eEY#N
z$9_hmwbvqSG9%nF0W%yEFw>Xz)y<12i{bg+?6z7BRNP7?0jI)ct-#gPG~cQ+N2fs>
zYz;m`2{~N;dA3097BZr)>S&Eb>k9YG&T-a|9l0bOp5Q$M%Qb6s7)G{M*%H!6{E_46
zz8tInSB#+gW11JHWCn#S9QN+Hl|TU4BMn+Jh=#TMRTQharG_5j9dQ@HT)$q2N8K$W
z5eb>x9&iVJ1Hl+12BhGDTT?C0>5yzOnkw}0$M{u(q_8Hs%NvfhSd`C_pZOG>ua_ae
zqxE|z9?Awx{~7#^B1;BO-Z<iPFzB~5?h+jr*K!262lf0AADYh~{P-{Sa$cRFMv3T#
z85oIa4VXog04%^shYI;<-#w>;8TJbnI=OcG&|g%MKpQGWFXl~8+@C&ziwt-Kf1;AH
zj)|^O6!Anhb}iq*;KX*V4c>IfU1P%X92Gs^VV7xfIA;w*=zZ?+PWN9yeKG0Lb2%t0
zoGL3THC>rT1b%|%RO2WG1(88qYl;}VAN(bz@jrUw)buR1TZB7OhZ+VHT&}FDKBlr#
zNMl;qdg+0doB{KAolN*01QCKH{L`6*uN^v~M3f|P;-6s0|CSm5Fq&djB?Ri9_R6!(
zqLkD|HB(HwFq4}#_{{Nrgx5x+Yt*6nWGB%?MpB=c`YSdR6Y5p2J-<WKfFL-DkWyH|
z?-bDeJ@Do1Ox%_ktH<ETqj?}gm=n}kL!~Bo2FQ=&KA-S0gyYGM$Pd<#sum9aVJd>Y
z54Ww*o7XY*c>_MkE+vHGEAZhyV2Gf~n@-N19cEb|SSVR4Q~~PC9UZ04+KI`8M0I(6
zYtOkrYPEnwu?FPchuU0grg6mG=^~;TzMZ^~C`S0hf*9CTTbF1$NP<Pvz%WC#O1ha!
zv{WW?w6!}9KqvyZqd_xrWTtL3V+{rteU6BYU>h+-gavBCx+f~oxrvh9bksV4UkrjA
zO`k7VECTC(snVKYCSCCbz6YY9>X{t##?b`mwB(Z{x%pXJV;fcE=n}<qG=B#(&ogmg
z--e=>{={rzMzEcM1~GF?Ksbbd;278|dT8z`RyRgp{2m|uadd<Ky>TN6K_MEfA9r8+
z`gwZjnN^f5WrO#+!L6mpB`On2I%HI(@F&VKlB^*=TLVi`wQuGWj6djNwt|ua+c!+i
z(0<ZDP#&tE-a8rCLV%V1-1^h<O;WDF^P_WY_a!<jnZ>$IQGQLL86Y>^K=t^*1VOxH
z{m|7Cx(5NdEkEBlKbgNge7>;QRtobtl&=2X(q-kO3~1M*;`Y`KqkL#ORL}1C5%D@P
zHqBM@18fa${+|8Sq-tzJ$|TZe0g<ugJvD3gPT$qepblpfvf;2CMyilKYX-%;W;mTA
zmdlUq5Rp!e*}adgfPCaQn(C@kPQdN5H2923D)lRmZGh?O7fa_Z45z7IhPh=c78AJl
zPG<M0s)X)}Dq!cT_YQPEDot@x1RM$2(t*I6cg~Tni<*eAB>0f*ZOU1W&OM((7qj4=
zyV`9IlJT$N6siBH2|%O+oj_zELabF1BM=e;(jvU2y&qSR{j$<c0IuV~AbxYswYL*b
zuBQ;ZV8;8eVEn$G9wC;<&8=<EY7Zng<P2D9#CFK0P>v(*kGXMxpiXpBn76GyO~l6r
zsZ;{vCdmaC1YWyK-T2f4=su|8Wk1#}c5JGlY=|H)Nvo&}J4jai=!?P*2+EL6w0LIf
zIh~ACu4r!PFhya3S^rDd1=hezQrXMAL|5kTMs?GuG}NxzhCm+}$VhJ8mvegZoURuZ
zLY#D-u6sz+x2W1*HiOzZG+b5<G4Vy=zUvmhFbY$FJ4X+)9oJ@%QqI92_tKFD*H;PF
zN^{ig-GC=7Q(~>1K0dYHW_oB!*KL%xdAL_SR?|1vrFz<AQAHbQ-YX7OAI6amnCS4a
zj+TVJqKlxETxJ%!hCz;6CD4=NtyRG3+2L!3XVgpJ-K>3ie`-36i%OksKv%HiV5U(M
z4<<XUvEd*y-M^n`j1HqGudkCEgKZ81=+RXeEyU~&HoAE*X6_O2mE?jPOH+`__0_mc
z!ZHxrndBwCwsPN0yI<&;q{I34&Z94W^{d~ddBZ;)96HiZzse?h`vfKAum!e<PB&nI
z@1siebm6W+C4tqaTA>d%Qg~X5kaqXcea^m(Aa`Fb0kPN+Koft!+T7zN6ZR~IXU8+d
z(W2HmtY4Yoe6LGA?s^P?T+M5x^Bgv0O(}TTlDCv7ghA6^J&Es*`XSI_k~pxV2Tgp}
zs~)>=<m5K+^;!>n>w=u(At=k$X`Yya-X^y<g9=^ijMOI8lSNFs)g1|%J1&9W<We^1
zv$W?6U9x%FM`G>SlSraSNbV#^EQ-WkChy^W$*|%b9E`^!^1&!i8cfq-u(r|+kH}eb
z;)uRc+J3CdCh~NAm|E8scWZYsI~5~OqA_0MhM#Nt<RPR!-HX}dEl#qVCs_)JrKTfD
z1*47^I2DMrT8v4Pi@c|QKjo>tOw@~We33YO>Pgy}?2~5**JS+bys{20iK?OFO_3I;
zZA~Q9scmoFQxOcc9(51VKi3%bomZYwDDe73xC&ZcsxIhRt1#(hjP(%@Izb%6ifs`c
z{z6LME``79X9@JKl#nlF7h84akvN8%zKrC*nc(mTc#OPd{8sX~Iy0+ak>H+=Iy5)S
zS5M>mS$oqc;b9ycki0xdnvub0m3`xbz`-Yw)29WCthwCT7Yxl_c{hYA-h3BW(;w|j
z=kHGT&8T4&hxml$wyZvHm5lH$us?Z<ofy_4`O?8(OJ)SJVqS=UdC1N2c08Pjsm|~r
z5?7MB5(PQg2<OQq->rV_cS002g&hIHda!kmUTDm)7TLx(IGjt$<?#dU!bR(|<~h<u
z>-jX@_=-8&|0uzNAA7~3e4xe*?B;7h6kE0MNAPX!kRd!<qdC6QG`niWk@#PXnv%L1
z8j+wp{NXA6;!O<GFy~S6DmyU3fwX{<pV3cG0zxo6riu?E++qj%yDxH^U8KA4l2Za&
z8sw)N$OAZ#Q-|dc)0NPXjNy;9ZnT-!PKT@C*~!h>Y%zv=c5;4Na#dBWONzK=S=NDM
z+ui9nhqq^EDCwhF=$5L;eW@bUC8JiDt~xdEAZhddVSTNl%EZ06gw)Hpj0rBuhe&@f
z&ye+T4YSnt%J{PP((k@-KS<JwYfOeo(_In4yPiff1Ux+1LEcKMvg^$fX=S}9T(pgl
zG`&3O7294vgIF#mC(q80?1nn%YaBe+>q59x;Qu(oPTH!S)YD@H;=FopbY_5V-YPaO
z+-}Am1{h0z^FPiO8j3KFSdkO=)+WkPBXt}HBh-7P5;femUn^{z@1YJDa6CMl`T+5~
zlTb|SfvxBGK+ntJ%3K|!M9%VXorFKGy{ZAr7diR`4pY>3z$o9xHx3D2X;8)9SgEA4
zHPVD!I*coKk2Sc}i^m9z9CDWA)^KSzM_c>*)6)fZT9ES^k9%gKW4)IgWNfF->7ek0
zqupZ6n;{P8iI?MjW@>jSl_Qayf)p>FM}TX^qp_e+>ew;(mG2DU7$&&*^>po+uBE>=
z{ZH>0+AKlfhaI{AXj3jZ*ppm;nHY?>VJ0w=z*nUQRQ?-g5dW$#IYiMnNyx@zljmn)
zbLZj=vzTnxqsml0>GHwW{2~b`|J01;LS2lU03lj4@xgqKTQ)Yx?SzG-QWEssf#y$6
zVym0YM&P0MxgUL~HW-Ya2*nA8Ea+#USp3fvSnh?d8{Z+28ED*qDf`<^b8<nqaU!}x
zAmtmLu#^uqWfCzxVeBJGeI2OG&dlY^+wlWdr|GLWq=yRiy`Z=vCqa-!KAfE{tl{A|
zZIXZISWL^Xg#Xy#^Uu0tG+iTEC$%5Pe%fb^w#SZ%;0#(q@_HLI)$CD>3gHloq5zrK
zqJOv^N)k%Xbnk5_9Ii`p&ob#%byI055s9kfhAC>nPz_oOwN5wR=bPoaC_|kY2Q0($
znWM}5Mr>@$Sek*c>BcT@dB@d-e?FYtlmqdP&Yz*4z{{^^vsY<FsNFYGo=0jX)=?NZ
zRSI#RBl1^?X(ExUi7w|*xPcWRLK6zgAXJO=u*nMfz{yK}$$zEui_gaK)1D)PNthM8
z_4zoq>WFh{!wL3@rKs(CilC^Rn`!0;X0PNcV>#g%JN_$X4C2d=kj$M6+04!?sXJlf
z6H6lT&i`E~hx|Zds2_at%Qy*Xt^3oXq~L0)#nszJMG~r}u*NApav;aUkQvlHa@Ghs
z^eNfp{$&1Yglay!h`J&geg;#)lXyt$IN=RDiRmN&D4%S2#-w7aoRikS`_rjJU>HTt
zlRO3lcCBMQMen&)$~J;xAe6MS1w6aS5$6;dvGMf+b#qt--b)!RzOuDk(n?bPA;D_f
z0vZS3EF@@j+*fv~Wpu57XZccsot^F*t&k8nJp<?k9BpGqZ>O2$15m}8?qz`WY1Bvr
zGt@EF?j?iTu_*AFTAoiDK(X%7%VdE0o_To}B;NN!On1WUaycD@P~|a?<Ns;*;RDcx
zr-2TiziZex@H^tQ<0W{|=(+3ZG{5p`0cL=5)r7iqt6qbnI4RMX#*JmC#xy$*^&|l0
zgoxTK<bp0xyo_;VY(pVGn7^i|=*ANOh`?JAUT^dG88_gNyp+0v$Y^F`lstPeJ&_|5
z$hqHZ@=ws2Zu1GqKTFl;_?RwtscpwSCB~g`{sCz$Ad1>}>I0l<LC4Qn`$nQOwv#j3
z8h!tV#ak@={#cG&k6xZX<8dcsx?*%(?1~O1&v`u4SWymkLM1@$SU(2bRrZ(EbMcNO
z;iV1>*au0bYbEO|;ZOp~;M|r(+-nbtl7S<Z8Q9{ztbgE@_J16`o?*`6rR0xs*Y5mf
z4z(X6@8|8tWM9_uYf_m&`G>3IL|4;cJ^stXGugwd;V$~2S}ckYlRik`m=yW7R~IWN
zd|f$41g3HohyW4xwQGY}6{$g%Ak#J~7?UG)C?Cx1ApDfKmFxKF#K2D)#Q5Q&izn1H
zWZkd~xka>@z-YN3R|B=!V`5xTtDFYCm3YmI&LybejaRdf1)uoWT<~cpsI)|Ftb3x=
z5fIH6&|Gt@`0B0#d9hW$0-hb=OTlK^^uSnMeiy0mZjIH3@X@;g7`#*X+FkvplDxeR
zO~@KtS|Rnju=a5EA9&feWGxcp4KJ@*`MV<cxfX)KzO)vzEUu+QSD7(6*gB4>C|5U-
zv|DP`*JTSKqXAyFRQCDcdSw}d3`TY7n7_y%G?M`Kg?BzvleU*EvAZ<|HSf#MO2;%t
z8#~W%LkE`o%1e2H%N)rvY(&trlbRPhYX@gALVFUJ5e;5Jr8*x)t1Wk~-g-<;A#Qm#
z=}qhlWU$PAH0X<_BWL8cJ}&TD!6k`T{<7i}JKfMcYxnDv1F;`wiCErMm35^bVQYI0
zvB_>~nz!NBZwnphiHxr*##U|gKKI152F`RCi=&sDit`G!;y;FcXD5l`irO*GfWMe#
zJw<8HEtRy)Ut&$s6bPkuP5rH;I~IlGI8HYpmPan8ShsB~X3_z6i8U}6tc?Wn=p-sG
zoQz%~{u0@Y#H2{&Dglb+;Ryp3<67XS<bTL0H5w9eIe&h^|MlAaC4r=98Y?_olMC@G
zEcJHX>rxbXRYvgb<IrH2+u`rz=6CkIm*{ts&Tf-dY^#7O-9(&D+k1O+a>RIn+pV6h
z6StVU6{G>tN2zHJS9VxgvQz7%xIHG9&fiQ<liDL!5A|QsNc<W<CO{6xByOZpaR6B6
zldhp4*W{^&z~c1K*}FBT-TLSntiGWG9?{dnbCrRqL{tjdCQkjXuxjEr0lIL1cD8EQ
ztLi&TJ;?<_QY7SStgSb-5+qYslLj*BUP<$a3<UUjKoUgO?>sKtcWzbdFZK?-SHMiz
zRe9?Z$BZ6d&f(lQP(uhZR0#n@RfyaF7>6N(Cs*?rvh`N%3km{hWaaz~7x^sC*W(=o
zB*TqYugJ%7Rc)>$r2II8*+^ghvx3fx8q1XvsC_XY+EPg&G*^*04lCgk{#a`Bhiut$
z`?c!``@Y&CYnU>`snWMAn$YC{+_wGZY&VBSFKAJpI$}*yzF}jE6#6xcmYU-#j}mXG
zR)mzbN(?XUHz`GW4Xmy#(}I1~je?J{O|X2EKrq+FnG?o{7YjKTboWlO>qY#)?18#s
zbG2|nYR@)~*`uTbf<>AxgdZB|5$>jWG8<FJrpy5BB`vI`%q`t!+_Pi6O4VGxc2_`N
z4j-7Yd8*~<m{Q)0_PFYnCbb^OjHOMY1Ur#bj17!7)*0^UA&Q&foE(abVd*OS*?eNE
z5JAPi{`AZW<o)%hGVz~DoRl0dUr&~X7e73BsQWJ-%(U>M@446^y!exM<H75eGyhL^
z6x=G_c)@N?5G!_dA`2({CiPJpzIEG4yww$nP;d^phsrXjhxC4Qh$I=|K>VOPka~*M
zw)4L(PYN@M>L?35Wg1iZrmIED)PnaOg6M!xgVzf-%k>4|9nke2fv7YdpyxfOZnusn
z>>V5@A(<mtXP2nU3$G}sFRGtXs<7+i^7$|GUfw&Fu})4{6}{rG2+}z+C(_^?_<WAU
z7p()ysGbaD;_M6Gm2A#sEl&SjY-HzxVUy#ts!b0kJWyhF_3^G|)V-Kyw&@KiF5Dh>
zX?FZqXc&$!^iNG2ca-8D_)qprCdarcr@gU?XLWf`2a9@PsbIC>l$%Fm)=SdtCZt<x
zNvNag$qUp^vI0?yw<DNz-nzowm7^J=A9B?C1QG4I?6qJEM+(nEGYbiSW~Cmj?$QbS
zMde4dKARrTUfW$fvm>;ZDxBD{Ic9X>4DXF=vBhIuJ%X{|S`Kf^QK_tESa%aeaS+Vo
zF(Mt|fEIv^W}R@C3F%F<lZ_E%6D6abPZy{OC<W+PN`?dAJ|L+l<wfY~y9ZEZ#`-#&
z!uMn&>5w~D+;p<Cp$QgL!g+-tA?^}vq16jHt-Eq{6+(b$!?Z&u5pL%~))lLR0p)g(
zfTc7+%>8{*nsCDzu&xqoN?joCpylr6H~JHkXWc<L96y^$xhvhLMC{+XgW7nm2e*K-
zXJ@ll*r7u;O4L!Eg3_{)$Pv8!PIIol0;a#}DeK0co}x5I?Dr{C+W7yj1_5;<WQ+0e
zm`uVuMT9ep8R<>j9#qNFc}0;*eNx*z{m$K+q*wKYTPxMwvQ1zIKz1Qob;ThaNxwuD
zmA%>B>GTxeJgpV_{5$;+kyjQJT3dtL_)JXd8p3@ni2ldXGyU-u%H!bfnJ=)N0|)ok
zbiQxGA)iUrr|3(o<nY3kHu$U%#Vu}L4j!Bwv1sX!v4aI`op_(R%JZ+ng;4)pdu3s?
zFPVw7EBoo?HWoqE^&f8hpZE9>b@moG54tzIHQhhN+2&-I#V|G{MEFdaa$`;E!V|vh
zxH5--*htucuRv8`8wyE<AHZ1ehp~V2SnVz$KGFZB9m0YJzG{26x<G2(67zqpx>Lg8
z$RVgZ(L?2jb1dF$o3g%wKw)Sw-5r}7XPlM!PTFe8oC*+TO0<RHKyrMetF%%LCWdzb
z63$tbpNzOQ$cK(q=YHw6W4=6ON1f6stw^(h?MP^6;>dhEnLwj()E6=zIuXFUf43*0
zRZt`r>PxGJ<j;r4t9<VsqE(7S{V*(%{L;hsigiOtu)Kjy-#KX;ZC$*$!Z=I6hisWK
zU9o|t87X7~&czU(5QD;1e8{|?h!yvgd6wcq)&@vr3A3<KhI^%&S0b^AbWFo1qZjs1
zCr2GgyA08uDx&)C6ba0mpV#+|B74aP?*1(KBtm!gO}d6b5n55PUi`O-_&OUuI+nOE
ztub(vU2cHeE!FEsa;<0QapCmN*^aG)gU6DH9~Cv!T5!!M{u7G{X{={*w1Xr7-83~F
zq~E@`dS$7cTlJpXg6PeAk&T2jrRrNl1gr<c#N34C$!{GMOAXl_ROGm{rWks=lmJr|
z19r{FA4lT&CbaWotwvS?zwe!sV5a<(4wbOhWZU$)BIoSk<DEM@5B~H1_TJY0t=+r9
z8oCjh{!EifPwBAjFXoDV?gOP$LS?tQLrm)db`nzl$f}nWG72_Lk2{a`W<V#!S`ODs
z=g^FgabYHFTmK=^iLCd>ywOy9T-83uTzLWhw`_%b<xMv_*+Z1D#YN$YUeT$i<%v-y
zI%SAvb~xFZZUTFRQjdq+4DQc0P_|f#5aSmW1!dGEIthO{<WREkHS%Jq2*G=8<$=PJ
zaNxS|L+p`=l_-j(2X=q-_yeS-4H%b5v^yr?7&5sN$j_{FVwHW`pwiRilJJVGyYM*q
z5>nht%~j4yc-RaCF;pF+$H8+w)oG1fLH`GDZd5DGvMT8mT}r&tIwl^N)T3(%MfjzZ
z)hRZ+Z6tCY!sk=C68sL=;k>n#iRzxh3>{FB(}75zR$$opU9EwPio+9V{pO@R5N=B=
zuiglPun<=z3wmp>b>Z-{T;d(M&e!{P4%8`Yqo((6<K_cNzDy)(;DvMVYjg)#BBH&6
zb!k{l1h}Q31f^VJsOpy5pPuV~fs1M)H*vjN5zS^2uJ>`#Ov=;sTu1?{As~Vwh;dAx
zSOKGL-q~x;ttA;$#kitWSkhUK<Z5=e3bfog9P0Eo9He$VHIaOAnl|B{pG~L#Kn{Z}
zYixcDzVhmA7(}8JD8dmd{5{UIUNiVTMa}}ZHvh6E@%_KcLSlM;{I~fp7H_}jh0ya+
z^;Adup2ie6<>f(;={!41F&r(&{*Hki9Ad`d0Re(JrBX(M+ummf2>Bqi1l5b=DMa^p
ziRkGmVh5?8Di?fXgzCmpZWxgpb}cch3J&CWqrVB3SnvL!U$ETq^yt7tXi+DgtFeOS
zdhT4T`R(6PE!rjmSa1C6Z@&1gu=dX?JF=kfhG_tCy-NingstuTFKxg%V?L<-p3&M_
z?I{K7kL-#B1*lrwEoTT}XecA)8Rt)o&xH_g#5^8Tr72tEgfl{bxXJVn@^CCr{t?Q?
z)EHP%_1`AXLC&W;Ckto1^%3p@4vw{h5nmhq0mRnhTelxRc9*aeFEdF|@a*{IS_iOR
z`#8f1f1nB+kmM{1X26q;GF29!7VygXa`~cTs-x1jH5&Q=J4uEW5lj7g$-YnR4Q>MY
za$QmeU0g)2jNCgM-gn{F(Nk5tRKAGP<@ws9o+0#NW3Q&125$pz!$V_aLruNG#zAGT
zN)kSFqfK)^5H9E$QI6FF$FMD_T;>!WgN>Ge9pM_1o*vPh-SB@Yh4Q=9s~|V;P!W$p
zzrh%6cl365tT8gPlP8+@aSy?U+qkI*2kUPl%JAxeT;3B5der~gFe0Z(v_-?V1MR{A
z9F2HEf;)!aRd*r*F@~hnfAz)cY^}H)fCgwCcw^(o&Z1zy^%L6MFZlRSS&OsT(b4qm
z0k#@`*hH26R`vzUk8x?hA<EJew;@f{klU+H{G8A&#QAs6U%bGEPZYN?C&5igr4y1z
z;A`U8x|Z>vef#?CTR4jQtej03&3-Z7)-0_<`4lN}f7%i3vZT8HJ*y8t!d*|(byT8$
zi;6vure`SKBY)vJhFZK!Pw}-yFLZt(L<G_0%)1odF&z4I<T;PD?4u3<gC7&FDwR)R
zximfwdZ;`=Cz!utuQ>gf_Rw7zeVsF@T<{Ok@Sjeqau<kWwnAJrOp43nqb}mAk2}ce
zg{&Hk7iAUpFbI(b*Mlz@lO6!1gAQCiRp&~>qZH~0&Pi149Z!f)?6tj_7tz;9KJECy
zDDH5GA`<X@#g#n34PiJYBS%gd3x18e)arx2bX;kfdwsq|S@3c}58v+rbrU{6DBY%y
z=s$8pkuHk3#Hr^|1pT>{$X%q=&_=KPKlIX9V>q=UOqI&wgTS@x2X|FvE3KZ8q1(Sq
zT@Qq{^h+iKZ5<q7uU5=#-6!jSsA~C2l8>t~xchsXtxpbYJ-Am|H=X&#lA)DyScz_p
z%T$&99HYzNqEa%rrH)_S%8^7BWWOt$;%*ZVpqm?ea(&D4`M{5=GJe_#R2)DqWU6fM
z9!w0|3)HFZ!2Y-(wVMFN$wRpsk-@R!s*jDGc!}r8y*58VcOW_*mWd`jXiwMzygzxx
zT5Cu#2}uvxPs1={nLDSW>G3HNFtGNPyb`&oMEg=MhlnQT6#4(sq0W@#n+@*;4(!wK
zuKSHLB<ANlK;(O@U+ZAE4(D8<9(Z@WVi4la!e&^c*+;u5%8QtIx71l_)j3lEVbix4
ztzE9*Fh4EhVp-DdAgILCA}#9T<#+0%(UT8gP0M#%iSFp=cw{*swM6$#C46hUbx``y
zzXv$Zjo?k};_4TYeMG`Pn<9fG#7TI;x=M;jW{OlK1Q{glBXaWQXn>nQ`LrapTx2?S
z4q!M?XhKW^3=mRgo+I%GHz>(&a$?OsGjNO&=MPxd=+-&XRCw3u{FY8JGhqq+H~K&I
zt}Lv}A_Nx_bJsmNg~VxX+DGs1p9+a2O33AzNe;o~0<54^grpb-NnEg|+C~ygmo?!B
zRf|X-QGd1`3tuX`YVRbLATdo^%njtWhm|i<+(i=76uD{FN#RUBb8T=O7qywX_;bOW
zSPA`g34=D=IYVCrJz-}L&v0q9uEmnJEmZEqDGq*v?tO0%GoG9dn)1vlz+)OuQB79t
z@73}IMbj=}PVMF*t;jH*-@IP<iK$*)b(aRSlP5hq#)I&7ZQMKy8MlV24r=B=IQwX_
zkMM%r-%}u=6n!P}6_W%~W2h<APDh@;!oaC1RIB!2Kax%!Mui}8DLzOo?-`}^E{T^x
zHszRuCG2w&2_jA&!xQv~kXH(CSGwxaqptfxqX}j@CJ2PU?Ze{YBjqkB0W(F(5M5*)
zL@QUPy5$KIUkl;c9~Kt01u!EpV`k<03<mORlN=Aul%rg<c<9E+1hy16uG0wlHY~l8
zs~SRq*>Dq$d5C(pCLY3C8ae8T7$rOzMX#PKU5Br9{t27G*8P}?x%cm}f3}1)+*e5S
zHWYcXhO?!h<|8F+-)T5kDhP(>>?z~D?CUS-*PI;UYz@!5fJLznClzoG+*QGb58lr0
zI^Lg^H84FWze6!Ix~L5;u6t@%?$oZzx3~;<%j$!zIUEs}3%NI!azIzr0q(4rC0y>^
zLK9`!P|b$v+tjPDmHtPvRiZRF0|#A8^e!o#s#-EJaPi}$UxXMv@g;Ew#VoRziu3HB
zuB~BZ&O)wr>|b#4S#!*ep4#$bcAf~u`akcBR<|MiZ5WjhAp6l#of<^fySvVi_p6(J
zueoMJTK581P1D{^vNVX&(c93JKQ!G#%A(o@E4T~<g$?Lp7a{6p-Sl3%)zrTRxqfds
zSXu?$x{9<x84INqv^6#~dGWw}E}NEgrf5BxgqTK?nh~P#aOJIBW|C*GbBSS;sG4<d
zs%8Ko)})FYX^Un~k9YrU+A9G?6jU0T4~(M~p?h!f9#hJ@;m(@P2+khrayO$;ZXeHa
zVLi&P;O6gJNJGzZ$8pPoFgYJg<_14Jy>^E4dDmD8=-TUR-^Gcd5O`mE2qNi&8j0jm
zX>g}=E`1aG20|PWN=D_&;}aahNIgs6IOmY>RW3dDPgKSQ99Y(W{#HjsuDIm~VN2CD
zy2*zxr!vP7Cx$i=FZ;AsF3^t6tpR$aMUzv}lgLt&%k~s4D!1b$QN}$tYNR|wj6T-=
zPHVUdEQQX>DK_+$9w)i{(AKbb=rWe+$*|xTPne~GbaKO>DO)Kqd+F0(Z>8axArbUN
zV)Z`lOC|F#m$MFe?<v%^mfC_mh<Yme5whe16f`MG{HiU<q~S7xF7%Qtn`#Y0zV&P!
z(<ONC=Q;|;^p|vvO$Y|(s~vx?ogh7}mf+GU<XNG0S*N(s*h+Lg>}I39{ut(wwY7NE
ztH(^T$FDYmS4L12I*1@7CRL`@*4dz6Oq@YL5GhAkZ^pwF=ymJt#rZKpK-F?kv|sd!
zLnSCg=texCj7eiuS<$e!`T`~Rmp$lOA2oH#blS*uixP2!jNBo&8o`R<<Qno|&aPcA
zsUOPYRord}jBcqjVTnvQi7hEg_i#Aqy{l*CRhC^QIQoIFsU&Rc&yobCQa~o;q1Huj
zhFj(~BDE!8+>nrx&KKAwt|bL-Wmy(?B;Hz#dw1|{@D_&iZC>h2+m3-woHhVlaK~V6
zaE`WDq?^9E<STd?O1$>vM4ghc4CisEJ!&pFrLKhP;spf7T~azYA!+Ee3?ZbTH*hn&
z<TOs|S#c&U)Bz#L(!gNTh;av&d#crzly6h0oGL}F36l&j^ZKDF%~dN(JsYURp34v4
zws#&X60}`k?^Z|bczTAiWAA@};V6toIypj$Aj{~6pcGcRfc^Wr<=9ukbY0#-cV)Y{
zHa-@3MO`#zd}T6JMw&<owI-7uN`+Y-(9np93Nlh(3Vs_*WlV>@b59XQ$b;Yeucl{v
zg?4k}@Ik?`eqo2X+v~|k_B4_P&G|4tfli^NQ>*z1L>R7V6i*Ir^Lo@As$$843};AR
zy&>DJIH}MFj|jT?tS%d2@70cVh&=Yq%7mR(^$b&3D@5t7)HGa>Bs&9_=tO_3pq?C3
z`7+8SEA93Sv;~DG*i(A3`wl5i$0*4ww-p2$mvdSmpd?r|&?W>XrMa?v6#ay~T4b1V
zAB<j+U6+1}LYR1hzYos!oIKZka0_`eg06CT&hwIm_n#lla76y(#SL`CD{$-%m86Cq
z&E{TIt)+J_t7uF|O~sP7!@SZdT->0!_aZ?q!KEf$$P&E~l_zs@LhSiQRXL*6->`<9
zd+<x^yTY}VkITh)KVsQG!t7AL_dL|ST3Qe(vfDYD7u*1Jw*=ZjmH>r7>0>LN*U~wu
zRYKud3x&dm&{?UYlCz&4_T7ocrX9D!T6doJcaW^7dHzGDq~M@O)K9_Z30OnL6HRF?
zGT&Urv8YLKVWknycYsO>o#oJ<iWpcI)gR=V0y*-PnEc`k*hKeAk!~jW<LXbrE447E
zoK<erUTkV&!5D<_e5Um;Dm!Gpsw`0tre`)0Nk0WfX;SS`HdG}a-P=hlml<ehCb7AP
z&5>leT7UL|^@rdM&K$|JAF$-lu(?BEmX%Ao{JO|8ROjBqTMsu!w{Zw?0c~QM5Let?
zTB+hZCo&NZ7dIv+@0{n#B>k5hG&y+}WXCxFzL?+8!=N{W&O;z&#6){Ypw(eXZ0y%l
z^0ZZ+c+ZzAT@J5`Qgja8qb^H4DJx%e9mcU|=w{^n#RWsAPu0)c2*05NMjcK!F6}ud
z@%8iwVRWZ^4<e!6P&NToyLfT=A}>yMXXm)B(nikcD6E|O>*d&sdY95}OUGZz`hyd8
zIZ(Ujc?$`_iWe9{ipXF$j<=EC`hfOHy2S`sxYHtn#SZMEO#43aLJ{quryTSHciihg
z5U{CX84Ko!yE>3spF11-K^-FyGRO382LHQ&WS{m~6_mU_kqk8Z8rwphtow(j^v`(h
zpnV%)U`y}p-8P)Hv+38G(6&N1-A2(L>m~JY;wCNeQeKH37R5|?&2NUtK1<IHQh6Qi
zIwm;u$r6Ng8(DwJQj3H68J10htacBW;|(VBwVt7rTZ_kR>V5D_wGFx_VY;EK0gaoT
z$6Zew@L9C&k+GEgRdj&2`&i~|5YSqt-77N@-ga-*!EsMQH2`(CN(#Pr(YTDL0HbOu
zw7*kJu`PUN*fekkC*jz3w<s%I-1#L}pl5%yYyj6`Y4>Y|vATh!x(mkzyc#3r5{1^-
zJz&mp>l(^YAAR8)O#fuAd*F~6RY3yV;KCchQz-%Q40SFW?bF3>Q9h4Rv?DdiFzE4W
z920+K5Y)zfV|ck^_tJ>R!1jnd7`xn^zAGf7H*3tZ$rXTovsQcqV7UCzEo^FfvHPM=
zDKo?hT)r=}&<gre9<R$_>2@kx7cBj}Z$xlKzSq#8t)BHYbEfLkcU?G5P>R0mQrkZ1
z=)1u$YkkM^fuLY_XhfOdSe-2%;d~hv1Ya7X8j9hOcH6jIqYNIB8HJl+qR(dMFJ7X6
z;JjG~A|V)5Q;G@u4}#1z)3e3S^X`b{-bb|>gSGi_;&8Qz+7(THy6H1yxSwtv@iw~s
zSHJ_L)i7`&$TQr5F32_(`%G&ab|=xHvUBnBAxxaBF$S$1P&fe33Rbp)XK;uFPa^8D
zBI#hZ;!H)>%D@dmwK?pu3cx|n!5%hnJsB!_vGOGtp~&L3MbhK3k#^~B9J$xjH#!(_
zd2{r=thiV6l5~hc$UYK^W+xFYtx*$pNBFt_h<aC7I$sZhEp*9)u7*I9#*2<54*_J+
z@5>7Fpl*XJIOHGI{5jaeD*SmPR>#4pAJ(5ISvr+ItT)X-{z#x18(42nFG$KDqKizc
zqzq2xBM~bzZBinMNUg|>eNzOs!hOen4!vLo9ihqNJ5lS=mt@|4d=QKiY6$r7lTO@O
zrXE(GUN~^k#&B~l2&9>Y49B>edSoDgT|2vmVXAap1*hob0M$ggY#qmQ8i3MNeD|`i
z&S85z5$mTWGGp)?tkeO@b_$rE99#~VpKR>;D(uL`<8ql{D}2`FU4oN!Rs>lB+IQLg
z@a<n+WOmmeaG4+TnpK0;S9!g+FCYt4$!zFK635NR&Tf}{)=5u`l(cFOOcAanMS3m@
zN(3Lit;f*EPRw1ccNAEcOfKCG{?l9@vF24lwyh(2{_jFr$<BgafX#@u{FxJas)hNW
z(%pDILu^%6a(O<=ail*ideMqRsUezg+&;-ySc<%nAf^I#4R!rqAI@+tCbgFmNIH+Q
z6&;pIWSxD{i(qdOi+8jUB(pcAywvsy&($(%8`W0ja~Z;J<UO3v&#mgZObB`Yr!1#s
zUs{qhYZ3C0fUIKtJEhxv<ON>w35%%nc)+q@B;7f-G#=}5snPe?kN945!@0x3G4Rdq
z4CSjW9TsH)a6DKC<$^E{VcKAN;1dM|Sn3yrr>u)hZaTO7BQA)m@|oTRUuv1Y7i_tT
z2*n~Wf8{r4<7n5({?R$=*{@wYkpq~h>V+z}Z?0WWr6sHlXShmB9a#C#oe=2bJCiv|
zirhx$Si5eH%AZfa^OYqN<wUqX!-3V@APJxe?Nf&2_o}bfuB#>sRxApVAK$|zwv#d{
z;xQr-x2Df0=SOKU?<RqMZ}M(>_C;wc6KEfnX=D%?lR^%`ar?Cozq`*mHr=<CQoiu+
zP$PDw57Jd2kPhFX!O=P-N?Kgo)CI$|Sre3S;_oR~(>N*f``j2$y+X9dc34sN8NvmK
ztR=<LtLr6DnY0=|LLxFRi*_?GTxHd!%lqTZfk{1Ssxv^qDF7scblzMCp-?Z22v$xN
zj?;dYl<dOwF(~0Ua7W7tLiTtaQr5Yqg@=C<N)l~~4}puq>eE$%lfDt33NU2`%lBhX
ze&KYvp`5AHu9(G!@()|`U1yQ41V29y{B=5tavF?tGhyrK@E<vZtrSYgYI=_LVa_s=
zaN<HLMeJE}cnfQ^&W(oHB<Fyr<`GM?^Sr}0Pc-SF9W4(+^_8T{4tAg8NL9#Z2UkFm
z!j=X!=}ZXfGz-koAX7$3pqx?ag5l8<en(jO-(<@rR9V$PGu{GR4OOghir=aa)_lf>
z+(v`OPg9Dyq_0B=q*inKxZ*A%b%=UiGUJb<&l8T7j#Y}8a-5UUv9JuQLqi7Q9hqh(
z!q%h-+C0J@eRdIV!Av!1==jJnPenfOu|fpCc!5A_9GgHbx9J<5x|BQUb{{gVy}4&&
zZTcx$4R*a$?uou6-M#4wC#A3@{P%NQnNhzHBdp_P2iZ+%$D%8sr&4$otoHC34`XaV
z)z5h}!8)SPy+r*7q}rL0`cXMc_$4b^PL8|9gygZ9t{Cj8Jo`?By`GxAF^(yUg1JY|
zf|bZhPg9%_u!<p4cEq47a$Mm**s(K-cvAxvk7EKI_zd@*9z_ATS9GCxB`_%m9Y(fc
zeH6j>Qll*mg8j*4j>NU6*A_E5<Tp7wpYjJ?)qLO&7t|b2*Vcl3-qQ2z4jw7J!yDEw
z16kL#L5!a7^yHFYeu(`SxmF3a(cs7&;B+%qEeQw8Q6#Qu=CrcHdgGFdg@FuJC^V{G
za~F35s9S)k&v1n)FskaJf2HOfdIoNmC?=1dgoYZZ!a}&b8<uc^N}H|gQOk8juwL<_
zR10yY`&1~wNpFs7BtT=lciPLUrrJ5(pB<pwa%r*6)#n%wH@x;zFvMu2`IPwnT4^vk
zuo_K8THQ4UX?PEnWl&;I_yjd2H{pg_mp{ZT$k|H9!+Gi2HotLIW|=`I_FggpNRvK8
zj&#Te(lawF(nKUTh2{h7S^$OfYWG+)$G0&DDU7r+uQ&@xZO={#V+FE`>ci@zZK|2K
z@D|Ekg<XSAv6~+KjpSxY6vhT?P}L*PF}+*NFr!)bxt!G9v;(`HRutP!<*nwOCDDZy
zch;0^eG=NK<p!Leqz87=K}0c>ecdD)XJdg=T)0J)p$^rW37G+T8cKp9a??R!$I9gi
z2aM#Z2^09tv{S<XMiuf_%cl!hs8xz^0<waEjw}Q!A$1&uUVF7tIj>g07gUrP7rq|g
z>LH#kJ(3@7*5Cp|O+k$05<k)9K|-U!(UH7L0N6`#)@QR5jWICwpgMA+y?c&HANpQM
zbY**vXalQ#8IaA>d$UQYgME~O8uEF`)~W{ZAg*Dc=@L-@g*k@q|4xT4F$4Q51A&(%
zW7)Obsygmc8g76SD38tbk|dJpjaQnFAoa}?n_VR*{G(?CMU1$Qp+#33)f#rj*5}J0
z$Vl%WDu035<v;6=IjLGE3O92PMvMRZwGz(27FhMin}|{(({tW_ZcOZ6gGfpk?4}Pe
zPcxVSYOQ;jOMQ&$0t?sRKgvxU{nJh)F;~3*JDXrEK*gNcbXl6he=_z|&9OUxzV1h0
z^l!k3M7F0%s=K6m?(*O@MosrO-;Fhku$&_?h?9n`xJgs@nr=#7QiiYa-Y%1**RJF6
zs^(fZ%>{|Rs6i_o!ysF=Z%-$MwR(Q|!pj&`UE{JExnRMDU*XOe*MONx8{oUl+I;Y7
zZ+;O@=wiCT26t7Y_>sZ3$5Ux%r~57Y8u`L&y_nBNqaIEx@ThvJZ;k1kPBUIZa7@op
zys&eGdZ3P?Q=wFVS4yfI6b2kT^waOwe~N;ItU@sV>E=&=|0(~sh5xPZZf)(ZKiS%P
zvcA8y^<w<{t*z~oTl)0#n_F9--^7#g$ylEp<H<3feEX}L`ecqLbNS{M{1+W=Z;iL(
z*VZb(9&U~A;=A#q^@m$q4++OU{+yoK5brR=I~n50z?k95j8E?V#=iN>*4AIvzXe?D
z0nqlsrZL&tny~wYecS#WEylmFFQWgk_b*+`KLX-6TU+0(%Rf^9%FfTW6(9Gvw(k23
ze!h+7JAA;F_)4+!+~4ERovrbINJD*#Klkd7pGC8+bxtzA`}4}p0)IN*Yn^0t)HC4t
zHr{SOEU^1n@3z0N85xo8p4#6pK#~_E$?R*N^dTM{^3l5oFXgMd>-_58`YZf<cWa%@
zbPun`_rNp64RE<d+z?gc|C=AOEAqtnpn5vq+WIXA_!>}vkGG85?&z;?6|?K-`0SW0
zIsQV3^bkK4754<C>v&JT*Jsa!I`y;X>x#ql6kPr*4lStq)!%M%=)+ex4QFov?*n!;
z8)H^G|IqGbjQ^Sc0IlyplA6N=RI;ey^~e9Uehx&Q-%NN13~z51Ay=9$ND2Mf3#xrz
zck}v!Mtxnbhf37ZzOX*P4Y$|9c84T1)d&>oeeK}>*7#5B)C%$EgZO2@;*%{=efr`X
zN(4H)v;KE*=HHDq@$~Ij9!GNukHT@=r*`<a+h5};z>I(YO~^OlgI)epet}Ez_v{w`
z{f7VSl)try>6TD{u+MK1?q5q2Z75&MKYu&Bv$g&Pz`hbW-&voi%Kb*|#^FuD+xd8%
zigkx-We0uTe<|XKx1ve;)DiXTn`lYe@2+FStv!CNpzN;yn?2YO+lAJD$AjNCeQ&>}
zz;AOt^3SpS`)+X?Y6r^Z*JB@P`){|XaPJyr*Z&or{i_J}7q>*}@5-akF$K);^P(qy
z$pL;dyDf9LD?06!v{U`s_k@uDo8m&v>MzAY-4(RVZl*qdDTdDb5Va}Fb^Kb<a#uJS
zf<Z;|=4MO=FhdXCRZA!crG28#H1mWxD2vtusKFB^a@vjmVSRzF<F9S@GLVuhXa+Ql
z7lsA-mJe<#93Tzanh=X=ES8g?a73M$^1@yFmR+caaaYLuccqAE`Mc|f0?{$r9xEN4
z`^UesX@!_l7CHP~;Uh5?bY}Ds>G5mn8IFZMVnZeWOY4gEp5Xk4eL>@OeA7sV7u!Cj
zxFF%cI7tE|^)l4Msi`*hxxbKk*?<u2yIb22qMtp*sM=ZWhM+*=Ou39tjbM-%AYCB&
zIllP0ei1nOg-z^9d?k=K)Df0Z3(l^dc=PRl7^#J^IH|kq&@iy-kRtKY05}xdFHKUY
z+khogQ^ePnD93dJO}GF6h@&t*yG8bUh?%3?a4FCj+Rt?@ep-*{n~qA=w~~=k3`r9S
z$nFnX{OXoADS+{p8hs8MZ%=NDs`)oEh|Wn2zW&^D0TlQtKBA|`kZ2&LX9B>sPXIq{
z0+@<TpiHHK3tDHqErZ=%e{-7}NReYYRH1>`ulk)ydLbP2j$pg$5Uw+Y%m<!>8xH#h
zhVoqXJL7-B*Tg(>h#h{`lm>QA4CTua1y3N%-uRYDCkYQ-ZT|N57h`2M=n7b2VF$pg
zW?E5a$^fdAW<>N1UZC&aiE<(rZ-1?#XX;x~N0bQ9&kLiU(Igmu=r6*^9>i2ZP?Rk{
zpoe|<!Nv_UOhnvgFsdm1inK3o>D%pps53&goGJzk`wHl30e_3cm<Tt-JdSRz{}w?1
zR+%Io18efFP*YZr7<`Nc8-4n)n8lj}qni&*NlxPHYDIzhdfhb6eb{?tOa6*s!7sW3
zt$~C?D6<o2Y<A;c-Xw@0fw#87<CxV%kQbmlk6)?^V3B);1RU@;Y8>@eYH%Rx&g!Cr
z1bNyonmy81R9}BDN*?4Sop;PpQ6!Pw9h2jiOB@>UbjU+73TQ^O;cv`S*vMW3G&hs@
zz+6rGx!QDl>+G9vsG`RYh#qlZ@sEkD`~nG8ro=+YFzVJSk+mO89Ck~LmC?RZ!oM+9
zKtXaqA?yOEnL_a>#9b!jA{-KsP?kDMGO5E<9QDjNF7Sa_8$N890F!=opKxQY0*?9|
z$%%t<OmIePj1bVq!@s3@;vxD}Lq?p4gQO#STbnvKu1xQ&?g9-mwV;A9@qHB(Hvctg
zK7PBc3es>-+$c){@?FK3^8>sTpn6B?r~t4BfCM?SH8q6$UTe3p_BY*6aFrL((YN}G
zzC~c+mu8zyZ8{eb6;RM(rUWhl)8YDs@cTn`at$$AmjeqgwO<*h{DT(955*fH1mnlD
z1b`fa{w=$gMt#4~(KmwL`>wwVf{zTrgjQ!P(~udEb2;*F#)4V?yv-%}eVvO)wb(2Z
z3A)7cS~?S%k<KJ~S9k$LfZf9^#=bmIr755T2ADPuB{Pqu+W5ITE;1<lkFSsHYZ+Ny
z7cQC7sMyzBFo=E;z+`v=#-X5O@R5eW)YGcGjk7Sdkh#K4;DSAJCs`cO(%UWJuLFfI
zSX}=6G5!H<z>iAGDZPr~r2t?PNBk;Y?-hQLAHH!#1W6_;bi(Yp(pkU&L~v(o-z4+S
z)|glt|4rAEJ1%_2Y}>G*pxU=?Kb!~Q?tpK$DFYZls8`u?;X{*S4Dkge3Lgqn6k?)_
z#|kId%q#^UHXn#V5t0!|Gi9ls&>Qzvz~AzXjT3wpU7nE_6(80oB^@yUa+>)D_+ndT
z16}2_`?CP5Z2_YOWK^Lf6BX|l=Ids;K{NOnR6p^Vkz{bHNpEQzeEHI5fS-jgGJa$x
zBGw{nlrS_NW7Q_8k%tv!KmrpB^eJ>vTamhVPJ)S-PLu{km0EODh8E7Ffx@WU(5=$I
z$R%KDgv3#M2NncPcEnymNt1sN0g<k3{$PN=>8u?K+r?@blm#92FZEcdQM~Q=|HiN0
zwn@nrzC@?bOS7_gS4<&#tQ;4gV5@-47k^vG&RLm4?}pO6Zv77$+`;aNAVg#+7N6V7
z+dGOGL1et6x)%LtsBQQj3g!#rnxbpKj^rAMAOmD@5YaY!lYhcXU22<NNVH=+c<|Pc
zdKFOw<#p#2Ma*v~<=tLFEa+ta9L<&PTzCZ<v;&L6$x!F!p8#@qRq)ej*!K&Q-FAaY
z=m86Q#Zyqnpp{A41mt%iIlcoWL|jT^40B{)fF(@q#As293iR7BNg(l#JrPHUsKC|+
zmqT#lsj}F+1d9w?H~l*}L1d_%_1}UCep@8|)bJ@Ih6{z(fXiJwFv7mh6c61kG+^<i
zv)~p7FG6uo<WV)6`9PVa+0`xTz`y8sDw#2i2W#+Ik*V;vb#}T6k}!>e;Y*h=!LW?r
z6$G)cjVJ_~n-^l*gwCc&hB=#<z_%XIhK5k*!8DCY-?&luV0VJ<D@>gLkdv1Q`mlkD
zT#7&#*`|f+_3BU=BaMC0Y{a-SR9wQ($R1-@WvJtbLYIN6`L4f0gIC5+H2kJV1@WRa
zOoQ~z6M?&B*cVGKGGrt$rHcTjVzf+Flplxa(BY*17K{>fkWMc358D3494)XkjP{i3
z?%Uu|0Mv1}I2>)p{FeGKa8+KL(8=Uwg2{pf|NW+h9E>dAlScvc_A_-q-I+2s08vhH
zv7tVTV*s#(9nl3f(~d_v#aFh^wh<>3EN0y$A51JX24`9T0Kvz_-y5ISi#!KYzLL4Q
z;2ad!Of6zq8<k!WdF<K<6#JobAWI1Om<B0x!sCB*MwX`LKBX3_gz%EC|Mp3&e-M*~
zN*c$a#0;lsfxGCRWV&-(0W#0QdbPel$&57NCCm-xAby(mYFHI8f_u!#;iM`MX(nVU
zpv3@;LK(pLt6R3BBB-!^(hRBvy*Hq`C#$j)@cr&0P#L>l0aSWfU(*zgjctL3j!#7_
zV5V48sZItI+c5hA^gf3%Bg)Q-cVsK{M9_d<_cfpRTr2iK#}yYHbX}_GM>jiryTPst
zO?dA+7~kRuVsd*lhQ(f89dP3>2nNvjXN`LF&Hqxs5!(+G+18gSbsYwAJbfHkdD$;u
zA|H)M2rzv!0Y71Lp=Vw+I_Q_|4*EgJ4OQ}untx$`PS`y?u9f5)c_S`@b;sZA!^N(A
z07VQRKaEP&95ZrVNN-6sU?=7tlP=^FNG%iuy8cJNXVNKn$VNxz6CGg-#N3Jot#B*^
z@cbD4Lwcz+(H`<4^Ovwi7tvkqLX_*c=*N6W=|Q*k0;FoYr~?Cf0mg=4j!rUyL^6s9
zpojnK5!OVDXewbI<u)^;Vj+r)j1G$2xA;dl;2wZ|R~bhYJ)Yjd>R2Azn8I5T(JTs5
zM?Q5IKEQIHmdHyqSkh%SU4R*>R*JTzU3xe>(;bbwZZ;lfkkD!Pa~$Twqpt$ys{g?0
z`PQffW`~mgU+VOz$TQS5E&8AsTCO;S8?)21y_(Ylucf#~|8#m9Wd!CGW%N&{2m0Oe
zStE8f?DU8N>*@-i@&o-HQFHjGDDrLH|GC^?1Vr^6`uY$2`k&)mm}6bJH?nD9wkN=*
zt#tNW*&|7YGZYD88N%c8PX2+GL=?}K4gLiFT6#j9osP{TIR<ked1xEYs7x%GR~njI
z5G$Ae1&&7!^}w7VN7q6wN`bU<sor(tLxj^KZ<So=Ciw>OY-?qQW1kydna9Dm68v_b
zR29^~8l;Aw)Hd!%i0W}ye()5AokJ?5_`9<Jd7J#}cI9xT;R;Yd7DW=+rnKW1gcH1E
zo|CTe@$?QBN%C0HqKqesN08OHkE?l3wVTs+`D1%dz`(X*z;dw#D}(>w<6U!h{z6}8
zLiGTrOO&N+iVNjWx);nRcT)6&h<9Q{;qN-KpPl5=5q^P9F|utdi<gl)(l0SpYc78;
z|0m5Akq@6Nrv33}EIw6&wrAQB+3(ZOE}fzi7>p9BQa{cZejAwpM2#W=yl=bZ_*Jiq
zR_6vF2RrC0DB|3|lEh9*GqWQLF=YuPQ?q5v_U|;I7NJuM$z#(%=q^|&(-0Ec2#5+I
z04EDR`BY>u>na3PZKLi&q5^KDbzx9()M0O&d5e##Mu>BPW|lZ>S%XoZ1tO_BiV|@F
zFrZ}uGAWXUy$!m{R~V$x6j-{~I<bX}dMx111}5}bwCHRU$eR`Z0Ue+CW;Z$TorE|f
z%X%B@eL=7-pvORmy9Ye91OB|L1eQ0(xsiw<Xylui0`_+8?=b_BT`Jf>LItWMe8g;Q
zVa-gT;JE18G6|I{#l?_+_#rz%6kwmbi53sFaZ>OFKWz_BjU^jl3ydF@v>Wb4Lw3C<
z=oe0hc=%TEqCsHxs=vbjVmkzBfsu!f0o4nC#+!l$^ev`KghskfI2E22oC<o(A>@PT
z1J;bK^lvCmWf}Q%`9DCL+X!xP{z>fvu?6{{%%Qm}Esas=!qPlH17aH)>f{%E>^U}O
zgafB{{xMd$$)W)9tV98S8?)n=SO`1U1?BgQoy+QLhv?+onT7Fl&<Pu)S-s$6Nr%Kr
zRv6VbBql1?caRUn$7m1yHzPLUg`Pyb6qeXO3Wsn98Pzg`v1q*5wm~YmFjhA{f`=X-
z!DvZEDPNf{34aT`_l+`_9+eO}=p^74{ldfwwAVi5%?kgR7Lasg(XkABOVZ_7lg5E#
zQ3b+#ib{0LEj8iGm2|ChP?lt2Xrsw+XyQ_XC^mq`-e5i6HgHrt>H@@V2-SU%D5PcE
zN0eyJ8<tJxeGwar0zvAG2(z%2sUG>Q+9==^>KT*i!`1k*QXpVN%Z$&c#V6ni%W#ms
zKgmBB1asmpklAXT1~}7bfnUXa`9#0S{4lJOVBC)R$e8&NnNIjALcAaec+}E(g52h(
zfbfQ$<-dxuz%OfY>0gBv;Kbgc;(*SiYR3^Au+z6{<82Y?5&(~p%#WlPu~sV6Z0cJb
z&{UR;*<t?pc>8a9&_$;Yz*lf`AibZ2$HBYU3CH^I60B>icK1hRwRL7RAp65KNvNQ0
zoV*oQk0;7vu&t(G@i*AXa=ZE%E7+-*C8+jcWJ%Z{7*^Zid82#Cx9nl(O>Z?<9VRGN
zQjc|C%F|tq2|!YOXwD+MnqAs7plvMY+8N9eP9kS_vMfCPq(~FyW`>z$FBtleUx09G
z5NfEV8t%$U)A&-(n_|lS3eape&oYQ+5(+6(VM@f#rA&Lxm4&)U{gLsbXXQ$yE8}qr
zI4Mi@apm%7!LwvOk_99uMW>>>v{!s%=U4P^d@1f0J{8!^rxi}=FskwU7~ZvfEGjYc
z4Dpn+L)B+%ebL^1NB{x};*bE$H%VmxQb#*-jf*Wo8Gjp7RQFrHu_aDmRrPet+ZTq0
z9B_kacJnD&Y(TozBS_J1@EA~h;j2b{z?sDI&H`rfX;$kxj)Y61r3jmPKG}IGUL_bh
zr?*PO<^Mpku&xz~^7Nc6X}12gWGunI6GX}~5d+~QqfuVMjAJC1&`j-AN0PxuIEiWu
zq3RANFN}Pcw8)Wo7eYfid4Q7VW1)d<9SKC)I#SS1-jS7zcSE0A-UwvkZ`(2pPoIdj
zMV}ANKV|oSl5zR#wr5I7v&?~zAy4z8IB^7%J<KV^Rh8w~oc;ZWESQm9g(?0#AB@K&
z-df6+z^Y8=$u2T^{)0Z0FJBf_miMEjtu4$15oXh5rjAz6sgpU`sb1lH`|Vi%U3;#9
zGq4qPw;5iB>ldntu?y0WFYS~FiS5`LBMv4y(N+UyR+;caUik}G35c8v(+RZvfTW)&
zg@HBAPW_X1L&?T3q{B!PnYH{Qq!;!i5~$cz_(`(u1A?>T+HL&I(qJ`hQN1zgq|!=q
zY!d2@h`_e6jAx1k6aq_NYQngJSsB%4NA4wgcZnHU{9r9ejG3ewY6WEZr|K4NqR~+q
z!88G8B&XLkON@kaRzsx(R7>!{*d1GF;R_YF$DBNw36v!e-@5XpCk>Xv0bV?PV_vEL
zj>f+u%bJ?ehtMl}z~KL}_wL<M97)>v|Nay;+CA?G8_Af#<5^}sHV6S)BW@D*%=+hp
z8+8Lcw7Rw3EiTK;cYmKJE}4;8Rjro5v%BZFGw0w|RbC?Fo{^DJ^5?q$Kyx5}0DOA^
zSCLM-%AZ`*IOiF?@=ex@AY5N$6T}83imPOaXPl3P*uo2c1eN5rnxa{@qA~)O$b|Sz
z#R^Ga&b_EgWi-To#lE7S$V&<EWuq~h%4lH6bY+~JfroCH+rDhUP8RP#f6I3hp%EBT
z5KX7RxZ;^QT1=<1pvD_9zSxQ|SsxBA`3jj{+@0^Kp@oXkBg{0G+;FePq6F#<b*Lg6
zi^3oSA_$PNExIl*gs_pPF&-r7ypAw<VE6Jd#Acy%P#A%drC~>e4J0wv6Dg@|!#WWu
zpqSJ^X$ZlOPJ_w4uVIuFNbf>=mif*`U$9x97mXLFl9K>L&<i5J&wrjMHO#W$q*LFR
zHWrO5q&Ll_8V3fOm=@hE(W<|(mICyR5JCPyy0e9*U7M&BxQ__M_><006^X^sMh7&y
zW<)RG16gmC4`%m&)!`5b1tP9U1{15Yr>a|2C|9VKIE4!ka!ObwDnSjd+k$~+pv`XU
z!i#7y&~B=?5A8Dg>VL2RY>^XX6iGv8?}DHG1_<U=w(+tRc;H#igaktIAYH1vp+(LR
ztna4y1E;vT8^RJseZlCFZcTZd1s-^y80AC!2@+SU1F^7Am5v~a-j&TwXm#^}1)Mv9
z$(Wpcpv*{eqSKxyaB2e?hH4GWAc{!$Lx~eL<BiTF7!W=tD2a<bnIp*s7-Q!f&A2R&
zAOJKGptsQ#3gH?N0GUm+jv>a}qkUX6115~iWG3UkJ23EUE7zvfo|5;Vu-G->XI~aV
zpkR~9mIf637rUePgsJ7ix)@mon)Qx>V>Pb9#(;&fF(5yt{()k93p5@I7zwLEu@NA%
zbixi;I^E76;0|Ds`zl4M%FPPVQ;=6AosYZ!jPB2Y>S)^z3Q`3JqPgWClQ13&0-H9x
zwI?SL9NcS?ce}J2GKqAx4HwU%FugIokSmSsZV!*1GO?tM_XhBSIE6F|JWz;B1>VX|
zi}BFZuHhA|BXbLb80(t0pmYF}lpFj~*(Oo&3^cW8$zOshfVGmvQ5I5<u-&w9q-X$|
z48PWdF~nr-N#YnCPmwGQ3W_t^UF`<9GvhGe3O_Qz6vi}RBn63PP$tN`9XoTwn+zel
zd&~+L7^KcV1zU@#rIoUD1W+I|3e%G;9!4UTV@M#47p8R9t5l2NR79BrN+C$4kX+tS
zx}-f6`jR**b%Y{KB&q4z(dH}{?6ac@2%@$@I<N5$didVDG6v!5OkSz|5_Ny)#-3J#
z@|ztWi#l1p;4Ga=>8i0~QUnIF0R^6+Bm|B81POUgY8s>9&&(($MC7wByd_~clK3%8
zB7$2mdv$n51yNWH_%@=6L;=VmqQ8sj<OY#*8PDYY&F_>a&{;%Bm{8P&siK67JFp<~
zHa$`7K<Arb(7$7ZhDfN(GA*gu(6kaYQE|eoTmqUvCUw4Sk<4VeYMK~8W)UkU_bXyT
z9vR*G>D-K61GTauJv~z$Bp}E?h5!R6B^WBYL@Yf8MwaP18y*8WNf(*4ocx*p0iEHQ
zra&2EL;?vlV5aNkLV@7+nvgxMMF7@$fK2g|up*$VCznDPB+sA>67&lO!Pdpr0W6&@
z&1iy>9JWu!$Z~0z1u|qYriTTYGOaBqMN4Eknf+p%Sc!3py~t@c(Z02j(akB5(M>#s
z`F#?2DX>ju963EOMZ=cFL@@{HT(R%v5{}Rip%THXO(X)6i33D=Vj7H@UESfj<nm{#
z^d`Mz&14vY19!fYC<!#A&WhVWiB1pA!2x4O9Rljz?IK=KDaPj+GB0-m2|{O48-h=x
zsG-<c2KQIZV;5J5SaH?6OaH_KLmUDZ8oijE;uDlqE7?LJ5hp#}X!=<FEnM+Q1~KwL
z1c2kA;+<-w>sQ#ZfdW4|1>6)LDgWqD;65s|G)yLBPcbhe7-^C^<!eYnswf7Ab)5`O
z4oRW?x<E_X$ACNA%B8U)-z6<UMw1#-wk3hLBr+521sYqfxr~+nLFXSHNvK1OIs&0W
zPgD7_RN>Dob)X3Df{HvD5+F<FDq+1+;2H)G-20Q;Z?zPdbw_Q71!WA)!slkosKhYU
z58l&e5Js1O1ehqyyd+F@Vf$#79C&dncnnZ9IG$t=MI*ouAxwP+^q7O-PO&6qBg6pV
za{j~GWK%lOKKPTVOdukD-LSm0^uXOHjto_@U!E`9s`NkT!{9KLCVyJhjJ#N4H}4fZ
zSKsKd<A-ym^l@Vq>Rfa|QV0YP4~3S>6htwX!LqKLS33w+kGR*CUugzmiJTKwmwRC9
z7gw^c;b$RG6cN==iWzJ*J;RAR8z&3S%~<pgVQmM@cC`Dh`Rw^V_*3UHFM+(ng=lRM
z2aR}y7;saL5^z|}RU<yoqYO4M22-%`7=Z~vSoCH9E!IY4a0=bXn?gVj<0AYr1%>9u
zMXg;M<N=7aid9?-|2!gLaPd-*Wdi5xhtmPNx2>oy-c)`@wb@7Oy#xCKun<!O0+0f7
z3NFNk&3PHzN^B!Q$`vaH0I}Sa#XFtCycEKwEwDPju42nWTcE!z)`wOeP2>twSKoyR
zSdk;}z~8OFAEa!bu?ebiZjq^OIMKO~$~pv{NW~~;$L_?=rdq?~J4YWaDaB6(K$nbV
z`9`{2R^H&-fJ8S)A+!`vr67uzm4FsA-h%!Ln;FdJn+wqs9EQ&j_rl+gbX%E6L}!WJ
zfj3BCM2KWw8eUhK)J1|;c_;{%UkN~6;Qo!>2|dI-lFh>C2(a^jb|h`tcQyTzYzZ{k
zl5+zv6oLpUs16564$J|y#?<&5&7QkB;!og&GKlrZwYUu65)&s=Xd!5}7fh;NUaavC
zETnFgk6fIvI(4{F{}pR6y(dmEkfi0U!D{4ktrMz97BLqr5>vho7DmS3d%mZUR<^Tp
zWq`v7HUY3unV8YkLK=`ShQyPJD)3~=3BPEc&_gCxp_WAxdvczvQXB(y;>+z|Oed5%
zPfT>+B>vd6P#(UDq9K`>jG)tj^XPUdvzq-kcUK1BT75%H|AHvklbXrb5(_Yx+8Pn?
z1K@OOm<A(Kz&%ufX0d_8AApA)9QX_BZ2D?bfd*4DHXwxrX?RhDmVcTdCNgzdz@lqK
z{Ipm!_*N(OV3M{4F}wng&_%@{kE79TLdddI2xbunPz{0_ftV2B6%`JFhrMKzaH+$q
zBLJ4&G_Xeb^iK@Vi(w9F0s(?0qPdIFMRLh;kA!t(LOo0qwX5g6`W+D+6sy6GDn}#m
zci_L&MspT|D~@(*EcX1qoJ`84Y9}Dlv$)XK)E?GWszQxfr>t&ph`0nmk`PeF6!y;p
zV+{YWfsifX0cr&(l0Ch%sz`#M9~iRIpzf{WTLa3ddVB+@$-6;F(&F1z5i4@bXG>~{
zB6=54kX1Ryk8Lq<c3rg*!!+FmAn>BA00c0BohH{$Kt$P@iz<kPF9~lop>7x3EKyE+
z7D6}?UQzU<Pc-b}`T$*>kt!r13+({8&%6cV1;tpD_f7Svw$H#QnN0h08<9?6tRIO^
zpjAchL5b&`vd}VXt%57M>o0R8;oh9k#W*c}OzI<DiwtWXmn<m{3`ELNE(TFxiIs((
zCv$8VzfUjEoat}L-2nf|1A^@mOa<P5OwMA8ptEC^9gUuv?!*V62m#-_d<-tZO<_||
zO0Ky@kg$3Rtcz)&kmw8{y_j%6VFWvdBH?M5prLX%KNwM`X-gK_IV)4n4auVI^OJAY
z{}SO5<tqQU-hkN>gJMT|_SifTvu4P$mM;wy&ZzXV)tPNH7NF;eIa24MVyjpvRksv1
z^>KxnO!BZy_%E+1g!q{p82kc1L4w3F0Z}11;=SjXH6SwP%z|dDCsQ4<bDjl58{TEA
z)&F4ngGcVQ07*!@0N2ZD2lpTNox)GD7=eI@)@6Vxpr8ecUCO2qL)w^<(^X3iL@W#P
zY+jFI7K30<t3v@fMq_A;Gh?t79N-l=ysO~=tPY1LKC*<ekUCU>?YW~%(FRWkjcyml
z!k#kQO8jlMvRZ~RQbJan%hA)hJa?sTbuMr9HQpq?(>pIRnTHT0b_=O`OsVgBcdvm3
z8PeoQ`A^3H!%5w_wXQ)+m(~A(CtuurL{Ue*b!@?u8-cpWjjDmE|1lUYu<A={E@cDZ
zMEMioAr6s5G4ZHfcNWJ{m{)#zJ6^2C#WnRAg|Xah+gXuxp<z>@Pqrd?Ti6odp%y^}
zj1cW3N|SJ|KqvFb2tKJ61QYC_Z&DWEZdISU2@s<vUF4SlLXmVGz_Q0!c`7U>tz<@H
zSXuxIplLD;&+npP4`}=%fKj2zmt@#l5Fk^^M79Roh2D@54NOp)h|9$Rc{PWw3k**=
zhtk7PQI~QKzPL*~JrS&O9QY$tfZ7=}(Xg-l+4~P@hl2eADpZbEokU`YtdXDX0mS^*
z$K0i-eirxYm=>T*qayt`LDw}1aPq@LbcJpdN)vNFZHg^q6958$Pe2e_2=uY(JZTK^
zKal~Ug!}_k>Fpj23NKq<OIINxDZ)1{Jo1ou;X}_jmocP|&{f(Pr|d$jVtp2sl^K;s
zbPZHqX3+4{@CoSSu7y4v!OG{ko|D97>Nv9Ck$U{F7(plIVNJEww(}8uH>e5xb4p0k
zHDy_kaDZ?nLFa4uXkt#~jjV@kr^pr&$tW;1>4cv3B~f}PKb<mF2%)YbUFk{*g|b+4
zS;C5ZUEJ{?X87>0l-7OM8<-F1u(}^cf6FP(5CJVqLvmL6i4n0J&*Kqzg}|6iJTrz)
z1qDK9`G>dyAiC0=6^8Q&i)W5*+>t#m*iu#}0}A%y>UMGe7PFXzH(<F>$4^tXf?c%v
zNiZV1P$$MJz7*+i&0r`HRnG2czl#WhEJ27YV{*1&z<~fSBP|#}>z_m&X^ttfhGZS4
z?`X^rdH^RdU&j(v_Wfkm-r_`pZ|UXdMcPJz#t1o9iY*QS?}3ZPPaqX*v!ICp-6ch_
z!eQ!kTiKGx)@N9i%Z{uHks9!!BssuZXvoUcrAN7B;aU2?Hy}UYw}3JJek^~geKc~D
zDH0TD55$<10|NDP<n_7!!D9ZF7z*N{Ifh=3lo-5XlK?0<l_Ej;pUk6NgW49)WCDUE
zG6|a^7|xuX+)U-|w`m!PxAQu)ADRq<oci36yCdfQ$k4=xtF&|qExbrt*&&k4GuI;W
z9bG0!IJB=RS-^(B@2X>BtRzZH=1JZfPu<9{=}R-2jEJyc=P%6#3}G>m3qhccsVfDe
zNNxvkCFWVS_CgB<1FjOs(Z)cv?apNdquOIu_D?88&FkDZu?h$eY{#;gpqKB1@Uz7B
z59?t&MJE6?#(>9TGrON!nW=RgZwv*X>72+f0L==utZOP;mmSSVz*JfODOuz>RW5ow
z2&Zun1t<qh?c_*09g$O%C4^I)U3Mi*3||am3^?^Op%Y^K_>H6<+pFLYMCi!@<Q?W<
z0LI>FDcAT6q@idRA0d(@$Q1Y`Q4sJWj}`wz45a0+DQ3lOQb{U-z|49MA(t@Nl^jA?
z;EC8^Nhd0yB+~=DC-WQlIzM8M)`g6lc*@I5Q?Q*f=kNhdqY-)~pMT{+<U{~)AIY67
zc_XN)JqNKFLb!wt%|!7JR#+iOc2-y+K#*GEouZ3)vY4@~)kflx$V2{<RxSDZZf!;E
zzQ78;$l;JMDuX{oXF0p~&a#lIGrSN7sk^g$KokT6_~sbkm&s}V1@54*c)li>8A{Ad
zs>p;)B3_mJncXe<1+7Hnga8dCSweSSQmkLw3QlC0xGe`mUNGlJqf!^)Ff#2`;e0(#
zdTYLg`7HvYKx<slU&$y@-{K&`Zo;C5R4NWM;<s_-ouH?B=Vf|?iz9#UI)AG{QG-uW
z6HTLYgSOBO&Ku6IG7UJMyNHT^fpGXk`5_^sLjo%z59J@d*1?}?g>u5-EZPxLC;{nX
zQq>}+M1{r7q9PcSrn1c@WUeQuL|OhxG?(tpkJR5vmjVo5BDAs|L9NdOd=Y@Z2^LLN
zlSW8o(C0#X)fWmAahC0?nH$Pd($8`}W*`aw2$>u%a5%L8uDhodT&RJr5#PV@0}6VF
zRxCsMA|nx{kO0dLiODi#KAAvi)AbLUJa}Y@sj^~A)U$A56iCc)o;Vo^`bhmCt~NW=
zs*8|97ZC}V!I9)vKxuYAEzH7k0KoK?tq@EntkA)9SovCUEUX{V1(SPlyvC=%2*9je
z#%#-#rJ%Te%+isK1t65mypaf)3)T|D9dSa$24FF+&<xOjl=;L+3Eqeaw*(YR62ha1
zD(<3-#UjW*(!tn)TNbJk-RdVa=4;h}3IKK{NlNQA{=s6NcwCSAgnPXl<`$Kf+#Bc-
zN)ATdg+|3sD}N#|i%`fvvLgH=XPS^X;B{ZQNaVt#)GpWC2Z=BdJuA#WGGT`Fy-sk8
zsSCR{D8mbeg`)D03@kdpSWhwI_pnJ6!39<ucHu@uQzm5NV_{p*{6g6V9K*>3vM_#`
zZy}#A6C8LfzPlN*gq@T)YUz+p*a#<e4vg~=s0=<z_}7d<uqO>x`m_}pN=7wPV^)Ts
z>3BdD98i6np7_DF$r@%9S+hk89&I4vPsTTENiNjYJ3n8ssH33UnG`z={4@}tNKMM|
zOQs5+D^o2ZsLU3cs03O7JET=eC=Fx^<Aq(E26779Kx+qJ!=tI;0fxcePOM{Q5o6%Y
z8ffLo^hAs6D>xj28;c-BQ|`F&v_4^Z@+;=Xc7VINy~|_7BgT@tW8aZhz%WJJZ<v-7
zW*?bvUQ|+)^~-AmJZWG~hI7|GbnA3joC%CVrCf`5Oyz@)$zg;Dl}?pLFbkn7%D@QF
zq;~#!(~`T=>pqR|Tv%&-hO4l0Qx~F;g%JcBM!%F^Z9F9MDfAG{pp2a$_&ZrzwLwki
z)Mf>gKy{bqc;qfJm4@v>?YrbAOo?WC2us~1Qmw2mdH)qu_!HX6V3GYf>w4aY<`h8^
z&77{p11^5MN>gO;D#Ho#x9XwdS=cFLH#4E;nf}83=KIL}T^lvkNGxbGOIb`V97ur>
z`7y#&Y6bfWd0XkHb)o<jyO`AMX+)~X98Bv7VI@=Z=KN=h;a&@s2)aN8fWus!h#MvQ
zI{kFAlFVdEjG16x4`aAis711>&JA*1JQV~UlT1L2x-*$HHAP>TU74xyyD+OH4FXo-
z7sI`%5~53KPL-ITL=e#wowSO3qudUh1CeyeyQ^wAQV_GXDTs%DfGTb=aqfXZJn(mD
zX6$A<3($)`7MZ8|1+ciN61A%=MAv|(QfdIbBIBOkE1WaT$NC5Ohvqe9i)YFU!bR5$
zas?TN7*RWXfC)*}QhSn}B~3v-(ZRztVImy>C_~l;ejka|;{ZsfKca4v2CDgVApp@o
zTxKW%w9+)&u$XHNY)SoOv?A~c8+Pp{AwyoQ`wwvV(<9F|0XpPU^gD=ri3cP2k@d<y
z#!}q%X3UkZ6)NZv;md0eNa-)<cc_l9?$9aNr%Kva8-!mH-#C_kznI=Obw%Dsnl(mF
zE>j4%yHdk~*<K>UdrINw?DIeZc%<3@uj64NUfi({>&P4Y?eP_GRk{Gi-6HmAkVZML
z1fv1<o@S4q2BjH4<z78`g-Q@IGadX|4iVWs)ih_)w%G}>=&m-Q<A`#0#rh?bq&#o)
z7wi9%>_l)r3=ZG-9ii}1WI2E=6<-|Ypa~o}-tbrORqM!lC?cr=Gzj%x_S^NBG!zvn
zzp^sHqzLr|<w-^6*uhJj&QsKJYNNWfdJRPsy%cnSw`*!kIwZg#ioF8?SvYnEUdd7L
z_{d@~A-C;&n%CqpAR+&tg}H7z^hc9J)-J@r@VRObPIQG@<ka=BY4wE9Ah2UWWR#fF
zZ7Q}UqV$A3M)@Qp)WE?x&MY2&iAV`oB$UGlsFv?z7R2anDkUyi%RgR<DFKrx6-d=H
zBfpu}>Q)!DsNjyMOtWKyU=&q`zUwQGOKfu^IEtvzVKDPO7E4ALM_TH<`aAP5TEXqe
zCKYP>sBRN5NL}oporl>(IbtnL{6;Jpi<L7N95w*pl#oj}0X#$d%EoVujcpBhxBKwC
zJ?=b|Sv|u#?<dt8ay`jU%f6$S@OU4jQWdNhV4(ek$&KK|5y6D;lj`<Xu?}2GU|kg&
z^`Y%v^fk>Mw%nLSk1slAX^n#+wH|>Vl~;tP2B4Iq)hclEFm{B{9_H_|*(1;wz)CuW
z;df~RATB1F^G`UDH`(!CH5}jL7GB5u-2bg?>rH-tON_!#4}btPl}0CU#wc4|GZUF*
z3xttdIcpCSz1(6L|Io{N&~&@LfJQDL6#U491o(B}M@j1j3*jd*i(jI`gVvDsI}&!g
zPgn68tL^MbMcms-CWeCpaJ2TI-89t@i*CROm5?50OTi$^NbOH`k`RxCJx7W$9&2z#
z^A%uLp>S+)5oFPKoJ+?6YUE3zx-W|jjUqWlXSlV#UKvq`p+ll)n|e%x_yn!4E=uOL
zkV78Mwxm9sB;2^{L3dNPfFNGT0&v>)AHNI-_Dh^aU=hBzSRrN!2{MSgH`zfzT8n60
zF`<HOZVHH69FF3rg(~P5iB;5<!AjVny@s@80n#Sh8<1C0M3w$~Y977*pm+kN-dQ#p
z*nljNP-sE>r?&}pU&od0;)FpP(G07}$VUqQiOS>pT;apqeiMUg0<Y{fSy6(FI5AgS
zs6OxlKCpam9ML4s2FD*Q(~g--!(+OP_?aNp$*`w+dDF0u-@@)W*QNZ-gHXg!naye@
z9az?A4{Iu76NERd%?rGM)~cM9w8l;1K9C}W7{-fi2rr+>M7r4lIx@FNBBC)mJERQ@
zRvG+3aX7TX9g=qiGN5c%?VyN{Y$oL&vNncdcvu>eGDs#6`yx#T^aBk--oge>ErZKe
zi*9}~UAVy;^B^;cuA&1tAc|ef$l`^WWjg-Jx3I1Pin+}NmpUis1xQz6X93sv6bQj&
zb{#_}2cPBmn^6(ZR{Y8&186M=oF5X#!7fA`I!ed{S4@Tj<3Q+QNiJEb00}~*V@^=o
zq?n{XqW2~Zi#34DJiXIDqWveZ$Dic(8p8g{F}x5jGU0A4VAqs9VLIC<nUVvd^x~pM
z3$;Y8C7+0@6HE#y@{jQd&(1S5$!er^rl2zu{A*zoVJ6elKs9a_W@6ICRl?v`jLxH>
zl|CnR{LYw3n$lHtD!51{QHw#<aF1IFJ+A<tC}KLlgd{vIj04mHDxrco@wj${*AHw5
zkyuAE@Nl_BRTO9Tiw|iLZXmgy^l-&5EHC-vx-JG>T{z6T2$Vt(0?qdbgUGrCXf9hb
z<vcGFvm2Xt!NECY5(O}GxcclFTlyZ&gUraPQ^$D2Fyl@nUX@5{>A0go#!Y?vs|gV!
z;dwOE{lDAJpvlq@y@3Wr9I-4`)YHT2<*4aPcvSt?NqlfPPEP=%`X$&)3OlH>Q+R+C
z(dtSnzdA+Ppp~O6OBcfM#^NpLBAL+Mg~HCZp8ZP5(%`{m5MnX?+>ygU+fk?tu;N3a
znt~9|P87j4k4VjE%x9Ii3a_LkAlsD+h4Z>&mR92@%L*<y$c}C@Q<57r8e_}iMF}!S
z-38jk4#X8QeGgoDzAJv302!wi+)MxVUEYx5#Je6)$c|C{Yl}Jo*AE*9h{Wt_;g|xD
z%r5L~naA3h3IHw*W>Ouh$Fw+5SObS5vbGU5>y~$3IA9my5s5cS?ScTh!52l$2$w<u
zbevE!!A~$i7A2^V=%ootB<j-0e`;(JW5a9v^Ty?k>EL*@*tq`l#*LGc`Rw&za<CjM
zM|iQE52lO3(Q-VS?vIv(jbA=|_Ww2aXU%l<W-^|Rn!&OeO^40wdGmZc8GSY!KY!kA
zZM_&To57dE@nZSq(aY26tE~r*?%z4MwRd;>?~CSH&x_A6ri{`Y&xWJst1DOjc<tI}
z<LPkpwz;zA|F*ZU9es6e^v%^j{mUP({L8g(u3Q;?_4V^_MpuVdN6)YR=?}waf4X+{
z>u;_;`{uK)t*z$E;pp|3)6>c1voF5*q93sDzi+m#T)xtL@zv$4Uw?hA`TqOQzSuZj
zjGD!AK0aD*{Q1GNzmJZV+r!aw;N;<ab~2hT-))ZGp3LUU#pPz>>C@3-e>Oaw0Hw`)
zp!aliy;;srM;|Wzxp{s%75p|&$J6Bqoga_><8(Y9-5Na~oKBXTvuA(5)Vy!zqvh#*
z+TgF||NI~RXFHGDd?(MZqZwdeuj}&Q!=IZEpMAmqzaGq+r$UP#?_T@n(H{>FK#6ZL
zs7$r_`)wnXzXhRwf9cP4-$#FZbnV)Y*M92m>u<aJ{_U>^J2!tieA3<5-*)%C|F<6=
z@BDQ0PIq5_+uir4$6w$6!?g!JF#Fr?zK8#||7iE_*WYx{>u+P<i0Q+<-9PL+yxrH^
z-uCr=`1r~F{lmw%y65({v3I8N-r*k({&xT0|JdEv-*)#sxb?@KpKjl}-QCyUcK5w?
zc<b=N{^8B;zW%nm@53j%fccMCyZidv?!I6Du>a)h-i^cVzW%nm?>G1Ux_j-1yFYgK
z^|#%9|M2gR@9zBgV~;HP+t@eq$CJZr``7-u_lNG8{cYJ>B{Kh;Y5wHS?VC5Q-RW6}
zzpY2h{eS%C>dv+OoyXnK_}kb&_uYMTc=hYY2M@dZ`rGcl-|YYJ=+?jg@VD;1{x<fF
zIK2ATA6VwBM>F`_*gHdg>)wM$5AR;v@1EJ;cK1E_<BxY9JbcmvwZDyhYhC*9*KXcB
z{IO3~{B0iL%P*V7{OHTWY>;<m)8%|NnT+P!%Y`Flc6>aWM$P{HX!&w9ADtfmeevay
zycNYRXjs1OYq@-zTb(Y)lfHI*ms>s?EJjBOs-n*^yock#;?<XIvy~eqE8{$^^htwo
zg2GaLpGL}qY)PvO2bTOFr=$71ZV2#pOJ1WxBhz{NtLV^Ug`avGT1DwJ9WCF?=C3jo
z-LqM<ddWJ(Y<e_;i*@vBH1Fxn7F*UNFK~WxG@8$6^B&CL^_ITRT~;8n!rox<ZhCZl
zx`f{qJOp{VC6Du<Knlq5ayFcgUclQcF^(5o`gY4-hn}xT(`5nvNS@>tli6^vco{*^
zC%MJx>3A65^Y8SQY%&}y2WasAvo9LBTgj7Mz)|9(rh%ij0Nm<~UDjuV>1_J$cy@|b
z&j*vmh)+MrJ6+5z40^!<CWFQD_Go$Zax}a-nH{~le|r235S)Ls&%XFzY<Ty^<6E~M
zJpKX8e5&HTeRnV)J_l!R-<wT`v#B-Qxp9AI_ukXTHx75v_N(o$?D@gN-Q8PHpFC{8
z$((&3+XHmk=u|!%Hc+v3K<h6*Z@z!}^x>1oyHB4spMTkGZWb-BUTVJmi_)Qd?wgR&
zaN`$FI*=_1{=z&>Q@6c8Tk0ckKAkPMR(CmgH9k2R4SyUDZjOMb(Zkbclkwu^-P!Dw
z&bZJ9Td&81t!L6?>qOgZy<{T+#QgCR9=!Q*sa$9CfB$du9)A93UnEEW#b{~HeJ4U?
z@3je^pX;@0<ag5)9H>lLbN0`_7$5gD8}<ZXX~Jr%Og0|V!DLrN@G^BEcxgO+5#W1p
z!c8D{Gfz*j<Li4Dr0gyPYc_v(Z+tvna>&KO`1o`(;3&J(!L!L|h^NcZVtHq<xIG%(
zp3L5GbhKHHk6sSOQ%rvJ3KQKOO(3Uubu=GgS9+f+QQq-k``Ody)6{may$&BuJN7n+
zqdaUaxSGDVfsOKVboA=>Y~F5mV>$%2=gWsM<5(%+2F^}yOeVhe%h+QU4|K%&=y>*e
z)C>GQpnf!kX1NUhS+AvzI~Wev8FZ~?5z_X`4TCL6&u*C@J-g}U29TcJOh<%NM%HR~
z12)fYlg28z8vVlGsm;B?yV3ls@J426J=ON7CopGZd=JR%F<bztz1;M^(w?w4N3Zst
zhprC?^TF}riHry_Jfne*GNVBH+|>a6?;`A30nmmz*yU57OOZmk7|p}H3i9P<HeK03
zM<KP;N!yu>;co0<sqJT}?VZW&*<jMuqw`JGZ-*+&X3+NbMB9xQJEsukV;lZ*Q$0W{
zC}ettVYNHS4Td2+f<j+3qqmUk;i7q3`r6w!;Z}#{VlTe@{Bvsh=JN(`;GLZw!Q&cq
zPq3{mt^M~WWRPa2I=|U!4quL%><{=0>(rFZx1Z6s!7{|H)xPqGKA1d1>}=R9XUz%7
z+rR`foY+W{MMIyhXIumnX*bNU0IHu}!pDT`jG^ou)#V(Tw0Wu4rx{P9=SKr7Ug7E)
z4uE3Xqde2@+mp%oXuO=fOEY0HE)8i|pZ1L5-waL`-QYuCjcFkVlLmp<qtRl)#b8Ib
zkUn9~Mb8{y@SW579PEDM=xBC2UGDBZ{Oaqk|7B-(d;;V9Y&;n+--XGE{n@es9-D!7
zXcng@61i;9b&Gw^oXWU*{i&uZm*<&k7o1OZ*P)oPoSngB@(kQXUVzUuA7eWK_g*}e
z$N`Jy`FwUPV#L9k#q4wrH21Gi^~~;KIX;H^CD}TsdNIJrqfrBYMjQ5zSZJ8XzH!=W
z?u;Owq=O^pNVFD~qkF3}M-;~q0H%Q!jN&smUyPcRO8<ZlM{{^>%hAwyh|9*P&LIR7
zk^e#SVhoS5fyBLloV^4J;HVvs!L-mf6zu*P4hFABL&dEPu4`ZLdE?lG%6UG1v0{|b
z1c7&eIm8YW+A*vhk|d98^+zfbkl%&%@x}CvK5n~?LVSVfbS{3Z>p{_B-XU_E^LO7I
zi~Z#7noo=+=&vR_!e@?>O=up)bt6@4R2$8kF_i8zNc$<w5teZT$pKc>IUfysK*jmc
zVl;gLW!o|a=~YkH+0-~*_!CwU!(bG6x$yY0wr7i@IrI|r9Ar1~e&SN7baFAa1nAc%
zs3z%$StqY1R)=Od1Is)Y8xPa^)1Pk3bUz`Ic8W8r`Q#l}w7Y!yNFq^V7~lamE<HFx
z-0XA?#f-xvnT2OSP$fiDJ|Lo{d_9_vpUcpLNY=~E8?%KtdK)jA;{nYTf*24^>i52B
z$1kRs<F+3``C=A)9=WEkzmR6D*_*;@QJc!&Amakc0#<7YGaUSeo>8hzAOLda#YjA7
zqxxc_q!*rpb@~R&EMVqacAywEFo)aeX2RWR&q&<slZy^Z-$x!>moMorK}o4|HJfkR
zK0SIswjD2>m-1odZ&WX7`R&nK#=X_n#IMUb=e8@%Yi?8-!~DXgP(RykTI;nafc&&&
zW%8?N9>UX7-P;RSyn((9EWY>n$hbqxeyg!PAE6^QA)YWCJ5zhsvP+lQt1cB3pm2p@
zt$PIC-$MTUCq>GBSAybCdpQ2v=Gql&B0S3#eXy`nLv1%o{Mt0k0Jt7Rl_5XtEMX_{
zn!|$<Ef|hqra&fRtJ~Y#VAnMQU1?P5BLgY&0j~a#@EOO{BWyn$`TGKA;3xC(YfKFf
zV4Id~^Ysit;VYL#^`tmZ+}JY|_c3Gj21q`3;D>!-ri%|;1&=O1(7Iuyi_ZXmtrxQ?
zN_6qzbpgF7{sc2%0l($&kfq4Q?Wq<QM-IkT%`QRMj~b^Hyt?>ky-}@;4|ztQ>*53V
z2f!{qrmjEx_6(X`e6%wnW)~lrj9Et6K5DGaSlcHU(V}q|AE^r1eZ)W(xAoH&?$9=2
zv7YJ)=(arHmHqep(&i<fh`#i;o@`-f5uBYpgag~hZ5;JrwA?JZ`>Af4GN1Ks@AJeL
z^Ih0HcKBiG&`7QF#m7Er*~Xrs1xwt%+<1oMI}g?LA!vVa@(~LT8>G0^xZHf~YCF%$
zK6cRBdHiT7bASTOSe(>-EU2QU*E=x7IjJ8b)2S2kx0yu%M4k+s%lUHed57^#Y_Q77
zyfa#MI+=Z#xU{|YO49tv*OjGk|1m&t?Zv@69O)fH&eM*><W!nv9V}ZcG^?J(#^A0p
zzI{vM>dd9EU24^!`R+U2FO|a>)3>|Zi=J)=+|af=$>X|9zrzpR)=7&_+39%5nKqSs
zn2B4eSr54aBS}@_s6mh4{pI#P9?gcn+r6~;o-un35|va0G2(_+$x}QLV6a#@LlTxQ
zWyq<#MrdDXzec;fegvHmv>k0DUOJn+9&NVqfd$xzD`E+{th3uiCc?l~OhHGfA0mmu
zh*blN+zK}<j-*yxLC0)8t^heGqYFl*@?q6wMbJdMuWFD9@bfRl5_)0-7_sM#L3IIP
zX$QHJUF|UEYiu$4#ImiE(?so8A2Cm_P40P7BA#JSU>X0pFiKlywtCQf`|Y;~twQ5O
zUK%{d;nsmpFTtAcw)3ORD6M{)o@5zN52lR6VgWWn*UK}<+F`Ol+d$T%_BF%!Nc_U#
z>tOoqbkbl&$gqMEeY->sm<C>=){Qt&a4j3Fp3fhzfFHU9Q6M`$B`$BwUz{FWnxUa&
zMVmZwC61Q+l_By6xkpPW#o+l}q%mGMZwmpqg6`9h%!CR0C0K1ur^RchK=q_W!5v|Q
zjA|0sP&~%wHY<hUV(_|(ze%VYmvpAXYRh-?o$ar%h|Orm(lnOHCOW$EY7{Jor)hrm
z!P6Pg^;J{;njl9kUM;AP<+x_D+v=EKpWf<o?Jj4>K(5vJ1qH+;_tTkP=@-L6aJV``
z(rFPbdPE*UrYfkn9UrBR9SYlY>~*9;v=aLKOrcpx&onwD$H^kc(l_7j4X-zw(`xHq
zc;hL3aUH66(!FceNN)tLO8^|hP2;rp>|N5o9?pHYw90kkoYyZVs_PDauDrcV+c-QO
zidbK&7Sh(^wi8P6&W~Ei*~9xn&TfeWsLqA7wc7<jZV%L}COhz{z4zK;r1_*D1yk>+
z4q$JC)ky0_`bR<AJE}w5+n^8Hu0u7bmWgGtmOFgg<JTs{(+EbJSpzi9hO4Y>N#uM9
z#tO*<8%bKI8+^LlKWGqrn2mS8p}y0zFYPlVm$t`xcs~BmQ3?X6ot5Oa#nE8;7)iWE
z>gR!EEy32N-KiKMzi9;{gv0~n|MvHd#%OvpIUSA;XRk(@;`v<eBy^b!z}nH)kz+<y
zlzm5Um6VV3a(X4fnXk8jFkhGd6WyJ}5NDyjYsn|A7^NxOk6UuDIQf!$8}u%@<zhq}
zbS>>gPSL;UVqkj18IvU9hQCWtUGRjHCUuhZM?lazo$5`v4!*KOqe7{u(8OdwQVO77
zSA+oS;<Q~5wpEU7;y#^24&%(>3r}(@$LLPdZYfRCyLprJBKF3vMWR*EwdOa|tCd@A
zo-i%C_fsl6uz^pT-QkuOm!NEU^dGW|gP|Z`o`Z{9R2I#ngDhHpdl_D*AzS=pxN1F5
zJ!Vshs;bfWM20Cqp2>Ip<BXH(-^iicFHfIs&!)*J#)1x8dcZi$X0V^oE4H6!94xMr
zs~;UdRX;9sog0U?t?#~>){V~oMfREQwS)MVO5nTv8Vi1;ouESF7lxrXpqp7t;@<29
zk}b>q{>H7*Qqo;rN-Zf8MI{7J5D4%nZz1GU!%uT0BE!$7H)pfu&SW&0p5|k-GSc1M
z=C?$7j%g^*NXpRj!I)R5TsI)1oqmIparH!Q$KraBRNmMdrmQH{@lfiaH+#_L==Ia>
z<I()Zs3Z(h&0@eur${80x!mRUi};{4B4bR`{Lj(h+g)DfEyt8zS=muD@Ji|imxjBJ
zjI!y^6jv)LQ9H;MwA%djpWkDVc5$3pULURp?A(^oe+}UwM^Vy-wjB8nkiqk*oGBKD
zA{MUGK31sg@-JGc9!X)f`zJuUh5nx^+9QDzQ9&iR9G(H(W`LSC3#6zjR+)EfXe|ZU
z*gh<PhTwFemH@GjdTlG!mQz6IK)7QyC9o}6;G%GjcC@D}p*_EpmG?d`ZI6(2kT4JM
zDr#<zhaVV;I~QCckCJAPE;8IhVl6btb8KR6zFVST4(jH-twhid*}z3OV}tk&-V6}i
z7K-@0?MdfAW(LR4o6X;OQynJFkpfdmNclvsS!h#8TDFV0C_b3u&eG$m$$Lwi)U!IM
zllcpXsQ%@-i+a<R8%#@PR29=TAXZtfPa18OfH{l##o!9=%blRgZC`^R-wHdx)lyv9
z(7UH16B?gdq`ffiWZ;(8d;~x=3p=Y0x%2R1Fn>mQI^sP&(WNmldWe+m`RtuvWnOi%
zu1GI6AaSwYjo6m6E~w56y$gAt@D$<=Z)%aBc*_i!lO%fsS%e99*0EMxeJh#MvcRn~
z5CVoxS>sBHh2)9H;ZdUrI00^O8*6cbyZCm+f!XYOafSy?&?mrcF{GT6sK_8r0mv0Q
z%>Oz|XkeTdqkFi1S4xcJ{cI18wAz!i5bHH00Z_JlZwTUC%?D>laZ63CEZ@C(HJ!a-
zO)!<t2U-E^)#%+~Q*j{KYTMlIB#qKEo6_rcCHP3-sL;(bvW}*%Ieh_5Lm>~41OZPX
zp27LKoaL9aB9lyCnhRWsLx0+>z0z1B!D`PoHwAHZ{7N3eauRjKQVkZS^|{ih$+o9u
zRZTuHiZ3^L-aD4&IJ!1&NP#6;X(b&rj{^~o)2UZZi0%w^fWq87q-?+mMd1;@Muci+
z;~^5TakqA0B6K<(L$Hb=kdy5lUhrnRb$}VhZbeiN{`(Ns)JCZtVl_vs7cd&yu%I<>
zDq8SjxZUhM$L*M3|8@BmhUqWYGw{DQ*!47$O_xTaX~R&sl!7Ucs+%r4+2AJj%eS&b
zUi&z}5#|u3G^kL0(Y%2(nDSPSl+=k!OzJ@O$Ls```NZ|``<!?p*W!Rp)1o-1#oa94
zZOQH_FYiR~Tpw{f2r!4(8)D!misQXorlDE6p&6d?mMT!@s;%R?)B<JdUIWiNyvQ~`
z9t|Jx2GETu>iC@=b1+D(j`4<f{IoG4*48z=9m_V>#;A`U?zqC03xlR`dHJ_ob=N3%
zt5EOX*dKP8FXGF_M4^P!qn8btsTtxt9JpO9d8wgmX!b#cJv}zZwWV<3sDw-Kh?W@D
z3L`ep-U;xymW1jPR&7trB+urX)9C~rF|L=^*M&Ro)gek@x4v%RlKb+p7zx~V0^a<m
z+*S2fs8uAQ)^)9tW7T(-53!c|DYyhzV+CGtSr=}W?@kE9A^$^k2i630pi{>5?-5=;
z8clxBJ7&M<1?As&4X8Jlw;DT(6u&{Ag|RysRa$N1TB#BW`=k|=;_Xw2W};IVyca5R
z>HuTz<3G@0g9KY#c31BzN=AGE*-&!zU0c1uOSM6}&^fHT4{Ab1H((D>UtvI9$IL9S
zAv3dr{}5Kkd$%uX2zBX6u>~&zR6ERc+;k<Ec6qK>Y-`n05cXV6mi?g;X@67#Wlx=P
z3-(U$3U>9Ua?3s3nj$yay9(#mUB~$mkCk|!KBwb?yfAle&J|<1ffN#6Ma}qPc*V?u
zJ0AWw=F!1BxAl1lH7b>RTa8Iq#*|sLBo_Sq-T8NS{U=V~n4YOFC8RNMG>3hn(=6eM
z;Kpr`+bepA?9@ySZa$q1#cbooG2E}|a6=3(wnL6fbH3F7tOwNsWY|a4C_(N`KSm(W
z@U1Fz>uv%uvd$X@dLYqN0i^qALctv`s!NsFWfWUgOjos#`U?q{)p`{-ju~B`mt;l6
z$bGFtW1VV+_LQ|ns!1m)+l*YMq8li!d+Yw`G9y2btN!J@PS7Uq(XsGWzNJrW0?j?K
zc*|&8<z8;)z!%#1YH1BaUtNaJ?no=xX$YNoaEeGOlBZL(0o!G}A9|~!O`?y_ou-YG
z`jpBGc7y`@`=UG;TM@bJ23FM@;;u@%Za3aJ_n|Tw&qmJYEEOPWQ3krAGHo?<SwRsV
z(kH<3_#fuJMYi$6u;9`mHwdU67Hbu;YsobUvyEfm(xq(<ZF?S_ee@Pd0MN(5e9>43
zB!@RYjh8QPn2WsWHqEg;VfhOB{h@;m)i()LjKzG9CbKCDGLKHmHS~16)P#$$sM`sX
zk|NFYu$OOTVr~SOY)RX_fTx<<z*AU^P*`K|0-k^~xG$)tTKc<-+4IZV=}&LQNaK3S
z(uv!zzbcoPg;2RZby;QD^(wH0s`HLa!qxdtgsjt8D3^kJ!`KIp5D<S81V1r|BY-aV
zF7i7?lI2prRcK6ONpXZRw=_3df=Jl9ZbKHsiC<P}hj@@is3gQB!dNndAa#R(hkI73
z_6?tUvx~c&`>1w**UK(x%g$!UV!UYcMUObHF;T1x5wy35E!r&^b%OU;Sfq9<34$e!
zN3Gnol7u2QP#B#s*_QWpPCK2viUeC5Abn*>PjOQX_WVwe(tCxaKugy$TKgm>)fcWP
zRol-Uu^}O$&3;#_OZg?1GiL<})Vk)H;M;(1PcwgPv;#z67B5k&L$Xv-Ou0j6IadYT
zbgebb>b0byoRx78=w}B-SWcPg+BIrmggz;P4&Vf#W#Vvh2&l)`jy*enubzg^U~t)J
z27s+k>v>lyB&Xy#m6Wfsj@9W{Ua`3kk)?&^zyy^xcZn+nUAeT{4>i9-JX4Cv7MyY+
z2i6FfYH31q_LtHNfpMvY*s^|slbR8V-TIb^I8*S}JeroGs@ynPAtA)6BpBmi6GrX~
zE5nU2t7Be}Tv27aJ~8V&Gs|Wr@W%~GO+Gs7R%t%BgJZP!lNEoB&9{6}K|sWgoK@Lw
z*t$A-A?>S)Mfl?8!(4B0e$LZ#d>NwCtI773QQjg%6{Nxa00%E*!~}UHvtI91<l0X&
z;$_8%?c!2oJF}I!OQ2|-;?29XxFO-3LbX^~&BgWvvbIF+X0ZL0)Y82D-poL~otZ+_
z9_cnaV8rQ{ne+R|XD!?@TrW?bE7uqXXD9zX5ID<;8UG0Utz7oG(1&VZD=?UNNbPT%
zS2ed3925}nX<0?8@U8+;_*B?IkM2}acl21a<mKWL6<pGBFIE(iGXyJc=0439bOi#|
zW{rG?djrQe$2?Twwn^Lp#7Bd|YgiDK=R3_9jc_i4Ks{1CxOtQ(Ji$UaH1yt>k9aVP
zBpLzZb2)yJ^C7k!<P)Wo>X6TqEEsGZ{m>|HCgf~}(J=tfaafUHuY$@r{Q8k!1@dxZ
zJQPE)hY!$&CD1g4jFWa*x|Y$7%dZCX!zMdDv7@Jp4f08jop|)MjWCQ9#~iX+Eoy#S
z+&n!N8cG?>HtuYJA*xMb4<<h*c}X2!$7wRhX&#&2jA}HfRpgk)O;irTDPgMaKtobe
z-I|wUB|3+;=~;Hy)2Cc=j@TW^z*Z(Hz4g@J-5B@WLQL8NhZtq8Aqr!=rU$sg>g<#t
zlg=QUjG#vuL9o>UaiCklCOR;{NC);yLi+%^J<GGOf55Ujb)_$%T@V-EW+FytTt~h)
z@WnGW@xx3U`ysqF+)j?H;Y$~R&=>HmhuOaG3$y?$!6*P(P*>9EHo}_jBbKCfH5rh{
zWo>(CWE*IdA(DF-zVe`*9X$$~x960~2whA!UO4>Hri2MYXwORwQKY{TD28I44~GXn
z6edFBv|yVZL#UY!2zqT91^YM!J3c*jWVOJk#=6`D#9!iP7sB5KRPKK758grvAxsSz
z$!aC@BrJcoeH<DVBVmSWkk)E0K<+O1)}?R+)o|RwgJXViVSg}xm5wL0Z41ZxxFU6&
zqd*79U7;g3HE=FW^7dFl@;IZAy$gNh)rwdJ<e?AP3gOP>yR})P)u9+!XKl6VlDm&%
zmDUvJV3}6m-;i}$a~0@P7HYKtx<LNc<Bw%2SFrtKCnWaJ(X=ep%}O3h{MTATz5GKv
z?!uC5dBPxl`1#KF<G9WZ<z7U%OPf)gqCq8FB)w1jQL$$v1Vt#h-BI{rtJW&Lb?Zgy
zrGfd4D{rrAa=R<2cvv9!-dC(m-scf#E1DK)c&(r0#N=1(eELH?!}$#{>NZjE13Lu#
z9EIZurmL-3#3x*D!G@<(x;vvGju4S_V_ul$0Y8cF(y>9!K6a#-XaT-;#_n=VbUK+U
zY-#y4%}~IU#;xZ~t`TY0HPd_mK&XBB)wAtqr_XWQ^>B7~^tQBp4iL@@=BR8fmvc*B
z3M=9kMx@l2R(J|LNC?aB_K;?i;aQ{fIws|8E7-)D%xJ7W%9?Kd!Ra%mPWC$X?_G!L
zN)lldJ?T%Ui{1z^6{lUR17|-DCXM7)^QVbMz_@~&<*2>)K)j8@D)g6@W9;4TU@tmX
zCW%_bVVniH53}cadp3WJ&sV%lZ13nuQwsy9zbgLk;`r7fiEXVC<$MF220d$asbPhl
zHae;XsbkMpypd$K)N1{s>A?iLbJxNPZ7`hs3S*`bAzbvpeL~F+7Q>VNiiW5Elv<9H
zHx$Rx-?qQ;h}+n`i}y_=Wt$t%m^z8(3P@V_9hR)VR-^|PJR8XlL&ZZV1707ukz*27
zoLwp&{|KN=$Na;g(iL=`Dg~U}Zryn5#7`-D=T}{y<}%iqph>8rJFL1m86kptdQt^e
z5m;ulf)*fPCGF-VBO1vnCnJ1FXX+nQ5NxE|G@;+w5mE=E3TeWKnY*t+P5j*xBlQ6y
zxYb~*<D=^jaDmupi5UarQ-?-L$tUNFj=ETzoYxwfVE=D)RH}%5RCKh9xBfRi8p3}U
zh=K(5Qtox#@lCd?_}Xo$vHv$h%5(+ALI`E79R^Dc&85+is-RnP>OYR)UGS|>V?=ur
zu)krTE6q_L1pA^GGyy_7!1>=8sm0_!aX7s{`gEpZ0F_$3e?#VJ&DFs~tv1R`t;YuD
zg_%nAB$DWQQIKTs9}^|@?Htxyi_>}`Qhb}J&t{~hz;^r(2#qRjifH9;usFA)MU>K}
zE*P^2(t$j(Dg3Cwq0_p{SbLBT6aB_f!-`v&0PuM6+83yqE{8daLoej<!H+43Q*}=~
z<_qXr+@}vzIx5S!A)=J&h10p9X$n!MX3=6b=w2?|kdw|&%jsIdnO5@(h>J!mdmQce
zjRh*HI$)yn<v!GAF4palH&FTfyZQdhcmMwlL^4CG5)$C{y)wUi{H>dllDO1+()41T
zKw)nPk73y~Qnd?i?Bli<i7zfSG>FWT`8$aW%C8tz)N3_^$zgpbMRzfH+NEQ`w{0w5
z*ba6OB_YEFK3r$&B2$v|)KPqe<o}A**bh#3*{<cUc>C51=M>w3*H-U0T8itV4&#?D
zV0eM?RvfoYELSog5ieaUh})hyq1~C>xa$)@v|a@F6NBXJ&=K(#<$oFjVAYL)HYhrp
z;-U(Y`oY4&)AH>L)vN|$rF??svQVRp*A)S^tjExUNuI9T7*}PsXBDul4pM9kd)nBS
z!cl;rN*DD}(`cFpr^Sjm6Dy(dzb8C*wpJm>()-`Rjqw0*N1aep;}$>oue;P*@wCG8
zKB1SlfKkCBU7umWyM+WcV*>P#-(20fw!iZj7p4LR$`fMezK9lo=B|VO?ee9#Z{8E(
z*Uy4TT#=9BL!m9slz0ooi_nnNdghJFIJlv)M5?mZq7sJ%RZCEGQlS1^|MmJaVU->H
zD>ZK<SJ~0k!^U|Q8znrbST}>3m{&{dd>T>cX7Zbo4=_SC{p`~s%Zy)i5ZwIFV|*#?
z45pX8EDB$G3N{}7SIL3OB<bs(b&xkOD?n2^lmb_RUac#WsFpUDNz9iFU?u<BBwUHg
z=VMP!aOIEne^4OFZf(W=4yq+tZLBkdh8|r~+Nk=J*^4S0sq82MSB>SOhpThUl)u3;
z8mP%L#|a%_f-M>>_>FazY?7+%9Do8H2S;`@#(ozyduz8EnVoQg$uU#PhjtZ8Cp!#{
zgFGn^msi5Rwu9>5FriUjZH^XTd-kQw%eLghJeR*Jt8?H`y97~}0!Du|KCx@ISOinP
z#|!)0uc0<5;;I#-@gcW%3?+TJr_#yFAcA+l$=nQB&k6LgJI=gzQQTEIOT)?;Y3B`+
zN)`HyMTMQfX8yhlqKZ@69CFZAohtGQZ&~;Z1q6w8B*T7nla+O5lp{I;x!yf>gB#SL
z<jnMRGFe@5CUCUK=%>4KP~ReOMTC5VoxzkBVs&|GAvKktAg8Dnk(r+N54=znO6mOS
zBf847eUS>R4&G7jV#S6#E66U|M>T1eIdzgCmnr1cJ$;&>!)MnXo!kPJ?tX5w7$!QM
zcYZwMH8uET5^)J98ySMCyiucEZb(V}MD8Nx9vKDX=oG~}QCZJ?j!wZvk|MPCeJz|1
zNLi&@>Yt!U;!9||5sH7!;BKL6N(}=ho;QC#U9hn247a?f&R^=L|MS+|tatb;tIQ#H
zrydBUXIVM%Bvt=%;{kIDJ;Zxu=#5>`(fBzEWUwgv1cmG}Yb`v`A(?)H8mdY9j?&+%
zH>#D>nFwt+e#EyTG=VV|n+2ZaIyy%#bVbob%3j(0sa3&uD+_EEi{q7LGfmjDyS#K?
z)Kc-WmF;Ljb&vEScxO-2bxLhs?kD9s39Srs%trC7VS$pU6Yxip6Brvyw<{u%)pxXX
z5_~pnusnK+OdRL7Z|w_v{x{OlZ8W)jT`nRaz)ESfh6`BcS+MO_$a0~pDVcm&oQJt#
z%<^sXJLek!<WZz;a@BX+%h|ozo6&p+Vn%a|E8^C+d=q9gIDXffD77(|oUUTvRW)?7
zNSi87UsOjtj!cVm%mb3Js`Z^dP-(1G`2@fNYe0g`D9M@%mPT<?r;lD7lst&*#Wk})
zcB-1d(_*ZU36*=u6KEQsGfq{PRt#f29vzLwCrdgEc^H3aS1{8uLchujp~g(XJ`8pf
zf6FaSq=d;n@a&<&Zp^UZUrr5>Mc;#qEp8PW*q7xFX@VwkbeEJ0!pz<SX=}`w7_416
zIiLsbn`VV)q;e`$sZ9*4;B?zabbjxaUBa!UZjqJe_bH1tagk=BCY}n3s8F774NrwD
zZ_j*C4`!;GD5#t8N%8Lnf4k^_#T0)h3?wz8aZubvyU)uGx4eYy;ub0^!Jb8;<3kOp
ze~|IWBEE(`=#m4{nf2Mvdthrwbr$MC?v@*7Hfp9{)6!rowMhDKKsVw#*Y*%)Y;O)G
zOvv3_t6N`Ma7Ijr>lIeB<BSulr*zNkLptCekT?wU)NJavD>4_8+fn&sTb^%j=tm}~
z0uA4tXhl+-j$<SjhN%@TI0OMq2nhT`{CGY=#Y)&+Zh1NW`F35ms0dfx-B&bJ+Rtq4
zL0LuWo>oB70j(U0sX_Od>bg^d`F!9Tb$8#YHit7Zp$=NTLjC5>(!Md^Yh;YpK@^h^
zQa{hDO@c&K>ng<Y7Cu3y4sz8>SI^yHQCdsDPb!3)Ly_Wjs(JNqrZzZtNqP9KL;t2d
zH{a2d53El1vk#$s>OJBumkHSchdGJwgaImwz8b5oJz~Aci|!6vDOIoSzV+VoK=vo8
z6nq(kbD6J}l+^0RSqx;DcKlE^;5#fOpU@ktY-imf7HK1nSMi}ZnbiPRq9~9;Au$mN
zm>|VkCb<GHEgzN7%B5Uyenu>*dU%=frRtf;#xIWEY=VCiJ9ie5pkgZU+}O8_o!N2U
zD{#|;O;W&LsWFu9l^TDd0Zoc2qrzZFRz88cJfHq{&Da?^qdCxJSNa<>T7ukGgUGYb
zer9vtB?6ufq;e<DJ~G4djfC6#W=ajvALru7EOXGH{Qfie%UCtOpMVlJ_`w+nN2>qQ
zQ$k$NMbKIo!r^gtjt?DdHTqw7#HkD?qZfmta_`>@XII9b!Ym*Uj#1GWUt};hAE5Fq
zi6EO!Vc>JY@HC7Q-mID@x$G;)KN-ABrEmhqQSw+q;BrR=T!hn1xx>$0NbjV6p74b6
z9)1E~4By2c0!^<+ljaS;2m0$u`5D#TK2;g+8%aKZKn}n0a1Y-qu$siZz}c4t?&Mo-
zUK_~XWJpO=0Mt8_XPJbt0OSLy<c#g9uR!p+Y8>EUUe;g5F!Yzu311At6*{czgvVq<
z-U(v!UYPh26u&1(-fDL3RLZc<w@^U*q)<Tp$9ghYKc+0su^GX(y;cXpO{+VCo`4Uk
zM~Uk89GJ+z^u$dyI$nq*+S@L<%CC|r*rN^t+8ZLOBuRMT_$36n7`~dhAUkH?#LleH
z+-d9esXUqh0+qytBHjOJU&dId@?lt7I;_STMW4Y#U_~NTW)^Oy@mFLRdlZ?5k5({_
zy-v)NTnS@|#=lkq_*~wcTbrZ>0+Z*5HJf*4#ieO_nG$>QAodO)3S=KXxb@(A^LTVJ
z8Ng`$I+(uu)zTAE3S85m-DrV=l*=vi?YE|gO>N=HsQG@0hKr*)f>~SI=*#JB%fG_1
zg#mRocdOdeN;zyGn^*ll86Um6`L6VTSM+q3w%z31WBO2qPilhd(5?F&$~HJY`WddJ
zxx$<_(Y7OY(DEgn|F^_2m@{XC6$dpr!hD9;Xu7B0Yea_m>+uZb{UAl|!2N^VN1qz2
zhB<uL0Z5-G8G8OU4q==CiX&+Tz_~wo+vCA~yoXgy3l%25*m~2i=|En{7jWW$RQf@d
zVr!CJ0WeWi#SwKT2wiIUf6Z)9$RH>n(It(=2wLPw<@8!UN@yC*YT&fmvPJ^dmN99w
zZhPv6$#%A4dHyRcR9HN|4y}rg+Ge$(@>K-v_Y9;h-6(uwlN09j89t@i3B#*M_vqkH
zW`4A`FZ^UVt>Bk7Spu8~+5M@378~i$iMn%<&%0y*oYW48|7}SNJK@V%Ue~_Ulp@%G
z-P{PtqJwAnkdZ_c^ka|f+0wU?x5ORc`64hfk#BFirth_&{4ygxIKxl3A@73!LDQ1~
z@*PrkYvBKCH>%Up^ag{tP86odu<IRETz6qdMq)fhvR(wnK$A2KIe3yB46Kb&IiXTm
zmL#%tgMl7rcVEuBJB#Or{t{He7Hu&*8so&8U-Gof;Q&M$;tb22QkbkmIQUf=<#v|r
z_fTkyZ`H*;I=^+G+zqPbUvZa2oY|Y@%zns9*zbbdV8GzY>r?H1OEyQI&40-bI1sQf
z%_R{kyX>GVg`z#~+~!g`jSe)#fj;~*(TINtokH78WWL2;LTFcSW}kgeSAw<fe$EH$
z>8-Dw_=Rme%mLqEir3whmGhMo;2RV2sUHseX)B=l=XY`iG|Lt$(gDZ{+n$u<2&#-p
zyF=AL`=wMXMV;S^z{+@LyLkoQ_r^1PfoT5jDn1<ce1J^*OPh{>5-mvW#V)^fSL57Y
z9`hBMPY~#sm?rU{16=Y!S5Jb5V=Mf}&a2~nlB<9HVfV%lkM5)o@PtY44c?9BU)_=5
zWEpF)$Yj$@LX+D#;>PU}aiUt!6Wor$^q`XT>wcaS0I4Xpo|_i>r@4N8qUSlg?n#)Y
zpzZtT_tfYg&JhPl%D3`a4v;L!y!@f%sj2sZThlQXryqLf#D<X~HA-C^{oK9TBSAvC
zwKYL1!Gq_AUXj&K^YKuM`v(P}2Akdoz9tCqtxp}0UrI0IffeF^Hh7T?rgUWj>VluT
z6|W90fAY*xcvFFPOk+jf|L`3O<>90SpY3MSOd2a1-wG3cJ`fD9ff`7-;AL!{XbBjb
z)$*A{$qf4hW>pVLmDQScCG`$tRaDIUHu)N!tPDvYNeUtwuH(QVlBVKaTIsSu-zRCz
zH{aMWsWqdb>I#M5mMH!y^+L<xe!lXHb<mbav*Tl=!{+4i9eJ?BWSSSJ_}n?Zf3TT`
zbLHy#jRE9JecI@_I-C(uHSyW%j34=Ym?DH`^Vj>DnG9Gg+2J~>*AM-vZ4Pd}+tEzd
znD)~G*hh81W5!Q7N<SAPJjV?@IF%3`f>q-|v$V|^X-ZI<T%oB*bz`w>MQfkp!|;K(
zZzB<lH(}_29KPjdArmBUnNqUir`8+?UKMtT%CR8C8P#MHA`QB(s<Px+(YY#?kc<HQ
z-cYndhWN&!03m+2w}+)yj*YEj|JcTh<Wd%;$ZC&!Ug{rigS!}3(ME(LZArE;$X9lm
z5<*xnuRCR5y)rHMZPqmWfLf7<oaP1c%U<8bS|G(nJpj_NS-;-sC-*9lWFkzGC&Xt#
zSvz>aFZf-l$_A%a+dQ1OFUom2J3wX@KBV>4A3>(;0Rz%H%|`}E{ev|5_dM2AtWTs;
zqYR|Nqd%cNk6w-D5Fz<HP!1m%0S$3$fmdN&xYEsb1nEnf0~hMrJOo|waq?~4MM&A~
z@Kp-EjM^V3o9Tn&Nca9rR%cXBzGF}r9L)(OY+~#z?8|y7ooTvep<S`&RQkLg?*4uY
z{UsmA#!U}sG5JWy8YT^SjTtUY0mCC(^#|%fxry@L!4(2g$iCa2<5V2!)e?A$V<7FO
zPj3v-1sUu~@M_iJ^XhDd?uzKrrgFf{%NrmE5DAw<7|Q6Wbox_Z!s)`R55UVgf2>F^
z>UglIb7s5Dqp36Ei6;Lj`C9rpqWOF_-$&?f@FIPRh>zrJk$eW5gwK{E@&UGkiNf{D
zBc`^8RmlAzoIB}`K#Z7}vz{5H0<<oh`ycsJ!z|@gJ>50e+wdkyuliA|6+?)-r_k*<
znSuuIIRTNxTf>aG^@P=aDi~y!3&v9-7dR7ts=!J&OI$R((goGFPVo*wp{&g6M9z(X
zWZWOej)9z%L<RS}G7?gJ#hg!0YNSRvv)}#fYG9p0)f>vITFF}3He3MMP-jctn%|{q
zzfJSYw%sCL*xb>js8{C@wXQODV_yP>x}xjY0qQT`1A0h0Sse8mlxI7xFRnQMcCg-m
zNPE$M=HejRN9j7_mmSVaWG}09x!H)E+6|pt_kuRyrKT0c3T)Fij#nf<#MiN56*s@c
zmh|b<hff~wK7EP`LJ~cJ3yT|6mn7X1&C-Rmz(sw->%s)gE{-@GKv56?Og;Tj%oA53
zkL7a-hi`YOOUsA`b(TEVD*~orE;(im@^eQX3d;7TD0JyR=+g8!ilm1}syGED^XC<m
zz1(z4SdcAeQROZDtCTcY@_I+N)^~6Nr?)GX_g#l^aGV0}Yo6zu3o8qk%Qc%GHXIK>
za4R}qyez-f+ughdRhUKo$<-R<8+5$uYoF(pN;+~`Hh(2Jk{NYxM)L(c)|6%__L8oW
z#wP}o1uiL?Bc_VU_M%{Z;Zy7|Z0DQ=&=goY4nKT*p8KGIj^ZzezYG16S0w5@|4ID-
zyAk^(n4y^bH%&`yGhQI~YyJQTk!Xdnra6a<pl#~9mTxI;ny0LI##g1^=6k$$`w3C7
z;zP;WEo`)rDlb>{4_?mRJjU0Kk!E>aKa%Z~{=m;y<3iD<UnnYf4-`hxL*H#5&4y5u
zSlrY3$&oxm;U21=9lTiJ)LaAV+sr?EY+wJhITLlc*YMqjt(p%^C-EoOAFeTpB5Q`H
z+}mY7ig-_aSl?x$=VWtqvGKuZFh?$OpiVkAlPuk1y9MlbemZ^a^+JvdnQ8|gJYz%y
z>hQ+2nLXq8QRQ~b0HT1^iG#^2;?48Z=@EljDp?UiAQ`-~97Fshmcv`laS0mRYkRgR
z#i1dAdyK29a~#H%(G<#UT&<TA0(r)>>U5O~1}#THlb7$8tq*5AdQHiKUYI4tR~dFv
zP%$226gYrr4R3+BYJOac?pn=6GNE-H$P=n^`|FkIc5A!A7bdkMGN<hvBn_@@79@?_
z5vzjF3uJ}rt#CORHfBc&0}VFYFrwI?tPZo^x$tA4iV1N4)E%fm8gr=>TP=)gc*feu
zN+`uufcSh06uB<LF%-ZE`UWLqV!{ie3O~vvk<z^=*MV{_X^1lN;2{MZ)*!PXHB!IL
zIeY_^P4lbkO^9)<o3i?8l2)mDHebsMP;nMYE<xprGU*ckVVXLS`fzqz**rzyMBG^X
zwYyG%sV5yti4Hv<Mx^&QnGLZm++NJ)%Q{ikVe>X!j&>9V2M|;Xk4w7gh2$O%>@j(a
z9Gc1NRP}0dx)pw~dOyD!y}O(-{|jaCf#}I?yLg$I&G<FCb)+Hf6-HqgA*?W+IabhV
z`$X!9l+=Yl{Q?wWiO=Dw<dRLCPXA}DF0aEP`7&5GO6mv$2#lR`o;g+TL}8ln(?u}W
zmiTZfZQC|jt+h(CC;n7NlBOE04M<Z?l~5T~Mc0n$V6;q5nuna1;+%!*AVPG;y2lu$
zi}C#^X{-6_&uH|QW{dyb+6u7b!NphV9_Qz=pCOSN3jTYI&T3^XakLV#1NDfB-|0$u
zW~fo)E_Smv3w*w=`BybC1(clF+VBKGe!33fyTljoU7YnPfJL2{qAW<kPl3?D?>4G}
zzZ^ebA`VP+<OxzU=Z3cnTcy2mrV`avsvl`6%`_#?Z|Uekx?8p&Xb&Z!$T-Y2g8gOo
z-4o@m%ZUO8tj@^9q9yzpzuDoM9ivex_NHv8UMNi#wJ(w&curA{gl}ZGp0$ddIaStN
zKoT!ozIIQpsIDlW%$PS3-=p<K@<)MJ@Ub2vrl~5>Y)T`u&WOYwB!@GxA))Wqy$6pT
z-o3VugbAQQY03sA@_hLf$Z2lfprz3l+TQt3C-)4GH1&D5zEX8iR(#0g6}ZZGM-zC#
z5|qI?<m%52COB7-Ly@zS4sRvP(T`w!2dW54w|boWA>1WXRRlNj%J|R7PQD>-0oghd
zxLqKnmlZ9F8AV+4Zao#s62DcFS(>lp3deJNSd)5~KE9SG4a0`SRP$|Rl9aT;<3I?n
zZ6*9K-P9zXTK5R{G8Sl3c5d%O!mQlixVq^By=Nk$v<;urWaT-_g`tcW7af;trMFNd
z14Y?#q{2%?_!=rw7gG$p^w*JdgqIA)Qf#MQ&l~p*DeE~VD>;`1SPNZXYc<ZOz$3}(
z(*xh8e|k}TXaN8Rxg{8heY-``1f?gXtK3yZ6qV{K>Csl+)+fm4N`vP^)m3UbDQXqa
zWW8fSE2VnhnX8jG@~YB5nMm<dbbo=Pi1e5dqO$D82DZPPhhYwE^|%AZwZ7qYeKMjd
zJH?pee#GR~?QdsDI`3YzbxEEUAD4!LseOqv!|>z9?%u<%zW(}O4)gHkz$@UrgiU7W
zC$EtwAYY@VA8R-EKmW3@n(ZiQLP6pMl$lsDd187lE&T!Qevcsxl)Lv>ejCrsnom7S
znJIvLuPF$O1N6aLv|lTa%H}J{<6oW$R3Np^%mH%#?*lKb5_S4C$;*7xa(X>>D<@ZV
zk@$bJ1H{XMpK_@3=$(sL>r>T%`w-=<zgcY>tQ=cVUm0aDml@*8K`>&~%xEBvkd-ih
zk|W+3m{$C}7|nv{JPkRsOkz5YV-|`1!JXhn2DKdtSMoZ7g%(QbPgNK&F2|>dN;JDW
z2g})s7+La)#EdmWE}l-X&|yUPA`Yo9ne3`1v5<yvs^4R+Tm{35CKD`pEgj*_u7rdz
z$Jv*5klk_OsV$M{gJ+2Q9A;7<=(=L4BAk({?hX^%?!tZ8Fi<suX$Z9@c{=uAVN<+-
zl0fO;pMB3F(NH-@p_Varkd*TbUOpr;$@C4Pz+cE-Wd-cTC@Ua$m6T7{TWbhtY)}-2
z#f0AskgSSWJ^g0mu)bnF1t2LR(zhtf9|}|Ybr{`#4~L`#uX)6^7u5L;<nHH;B^Fa^
zDUhVM;cb*W;~jrVq}Ct0n#H^6k=d#{yl~=&8og^%4oO}B5`Rx{fW`}S^)Ai)1aC2(
zjF<1~VUahud^4NB@>s;B>L`zBO(CIe@kvAnUU_>(lwY^6fUr_IEDE<-VcY&1?!GWN
zAV0pZ1JE2@B)~CV6vLokPx+t@ZB+0&sT3yPk*);h&P6U&ewsb|f8UKv+`)v8E~rTa
zzn6~ddlwZ)coHgi{=Gp(&D2gKe#J(F9IV|^;3-1&hkt*3cjw0+57Jc`K!xZ~FJ$8r
z`rgQ@bvN9_Ym!~s7WnX9E#l-?X~L5Pe2P4!z>4kD+Am_C1KiBuH!KKs?hv1DKSQRw
zBzxzG_xUmP-|kXTK~>SFv+2#*Y`FvHaC&-@6DicvNRE@HS(Kq&vq+U=dV7ZN%cH{7
zGZvci#Dl2YbFznUXK~?0yLC@irg!+r!5#T6vNwDhQQH0oGB*^5uI}V4LUmqc#CZPX
z-6E*Lt)Raon0_|GIHMbSG3mi{56A7b*(nbXq?e5z2CqAzpz-Pq4L#LprA%0^wC1>p
zBkV~yk(}+E2}X>}7tHYrA}m;LsNOQ|q_q7h{{-s7Kj&hHXC}f7r;Qz3gNZ$DrK->g
z#Mza-_LOD;CXt{;I4KNW5i(bWmirZwfRG$YTdfZCUXnn>a>B=8PPcu5g$KCfMIaPa
zpuCS1bEnOZnmqFgE)LW9u^=dM?})I3Jx9hll3reqHjl;KHibrK69O6L^qjNqDanf*
zKx+C2+%pL&Oq)<gr!Cxk(!<b-Gz}e}u5(XC*Wl=Abh3Ob2*u*UX51pCDiDK7gqX%D
z@ra&vb>u0jkm~Eel6;^UB#D5WIKV+<BEclRPTb6{2DYWHNq$4!UGi``I<<or>={Qw
z-F-QHD>{=Z?XH0c1j|zb*S&tijC%@o;B&1Q;PA+uOi1_ph(^wH#02%@`@D_Pbw5?}
zuJyfOCmCIK=KoIQh_AD+A6=DmR>Wgq60)Qy3A`OrKXjrt(ps>@1n`}7dh<_}enOP~
ziCj^zstP5JN?^0@BM_qV6q@kUHARpqx<-d@vt*0Ie_oZriDds>j8$<;$-rHbr^}0<
z1&P9!HI%N46FNeCG{$@QF(*`p-+DbBY^iPAvJBa+m$TU`F{uaI=Ew2irdYp+r_XRR
z>E&I#xBSRT6sxtgBzb#r3PD~VoK=WWz`aXwn>naeAdtdb<zYd^SwUv@hLQT^q%zRi
zNy5ZpM>cer<c9hL!+7bFy;`Cf`fxE_A||Rc!pwo9VdUTXzXEA-Y3W70SUQ^*wD~V(
zakAtm&p9=<bHpP5lc;tA)>#F`kr^>Ygz9NZNPUHpkpdEup$dK0&U&r*u4y(%zWu@C
zRfF5k4CLW+1#_rj<^<z7X3C<j0UU`iNt5kVI$dd70%vJO6+a38GA<bxdn~3`klVM^
z#2!KY*)#i(G6!6n!GsH<6{M@eD|M1)ZcdGf@B$Z8_`QPE{yWRC4h$zZzB;q|uV-ej
zbjf%2rGqrC{vA=%q8SpGja;5jpTW}Zb}e9(hf&ycZv$^o6kqxaYHk&TUFs~Q+Zg(o
zT=X)jJ4;IqgDSQiUI8B%4~*EcsEjlyr#_~ezM9V7OnEYmINCAq4E@`|gZm&3bFIhE
z-&O3J@Z9ioL)qi6bZEYDl<ypoX?v(wtSckk<*j&aND?lTe{$I0bS$Fx5i}`Wp_T##
zvX{SK_=!gP2qZt)ML~i2miVp)O+E*-bdAF*AuXE31vd-dIKw@&7o#b&_;G+LH!MS2
z4#wc{NUh7~sK_e58qN{;m_BGOSU~(Ur5lNl$VmV>)Q0M1eP$`hH#lXp?FSV%nqU7F
zM{eWcU-He4=H=<L28EtcDIBxoOGg-B@SNG<#)Fbq4s8I1W8(;uq=b$D|JjEX=3*4*
z6cW?57l)ZWD&NDco^mx$v=Fp7gi7T8pEs9o@B<ym{>KK}C#Q>-n_-J_j6{vM+k+$7
zOX8B2@dvkfVKt_rI{bnMb2;*<Ahc16t&w<TG6D%06qi|*TFplJt3WAy*nCy1|8PE!
z<qK4Cg6Wtx8#t8MGNh|&x<9j9HDG{rm<?5)Q%~cC6e7p(bDzDedMQFM(MX$w-=p0*
zvEZX1_JtGqf_q&jL@BVB*K7!&!NV<<a;`!d;?h!DbuwJH#;sNoozI{)AgwQ;$`;sK
zl~X1S?$=w+K^tG`%2hIVv}ek;l=z59YM1Qpl_PhaJ^2WkgetN>OaAI*Xh^vuFB{2U
zk_(`?e)#yw{r$tow=}Wvek#&%#3}}wQ+&Dc2_QmQTaX`vgm~FUSwsJk$c0WJ1ai6J
zpCN%SZFMH&vkJcY^e8uNl|CRZWHd1@(<W7Hk&#`^NsE7x6CpKzhZ(_p7x>z5USNO<
zzH)vJEd)2VXE)xq2~3;IAf*s%a&q~R;NcwR>riu<tBMxNh^SO%1u4pNw$L%iWO$k`
z_%$1a=JY?J+C)9~3`aT=1U260#mnd85-jn#ib{M^AL&q)<5a|Qfqal6@rO-t_^RYT
zS4xx*C&!xwz>qm)BT4qtRdHyM3%ZZ5!@+WTbez+M9RPkNY=(f2=#~C&umyghWM}qP
z5;9SSg?)ler>YIS5q!{UtiXNMn?xo@e4aMjaSdr$z#{5Zf%6mC5A);1@e91p@AS!s
zZzYJ5Au~r}op{6QXoD>Y^ICMK3_Db~aun6Rx;hsh9|Ouf<1+~fgzyEDZCA9uKjY&m
zC;8#yN<DcYGtoY*ZsoPMPF`yZ5qQ-UK)Z{*@MQ%Vqd$x5LWghd6NL$<x^z7?(E#Ve
z&<v=kh^?6nQjlQrW^kfAS^S6!kL2kau^^c0qc!8zo`g<mz*4pXVEA&Se0VWsp;GO{
z<tF{`6zjF(YFZjfDq5C@>COkJ5r7z=Aq>9S&yH7)9%dK+*Y%_n%gPOZ$<k?ok8?)p
zvna+XOV6<YAWuk|!@y<5aTh^?>srf(vE`sKP0_5SDMjvlg?Tm-olyw6<kq_L)#$Wc
zlOAROH#6#0x)Ymz6!Lug`uubP#1Y60c0do&xKj4f06EVkv(R|qTG0OpA1Otg)^(Di
z-=ee?>?Nv{o{i-+uB@oi*Y#t{s8Af&Ryifem5zvi21w5-vZ_Xhy-G@MrzTCDSuuD@
zL34|D)MwIHoACq3D!xPi-X*rBy8Okub9(!;jx26lBscmFm9+U#83+9vls?0oqI-;6
zEiP@3kae;Nyo9Mx#x@7Jiaj?)K2Ls8N7VfecmBmF-mnv!Y#4iwN@U(T{1f0Ol+`zO
z&l@24z`%N0tFG8ZBJX5(zycmigwb@jj~_W6mgA***Tf9QVXyAaFOtPKG^yD+ry*uJ
z{l`UlLmFfni9C_n+A6BMBZoD0P&c{I{D32FccGXAvasbioKJFk_Qu?*kf_f5T*ATR
zF=;zk8Abj07^$8#dCc~EIW|wHOLlS051VkPzTm!q#WR~Hdm>x95nKPf%GHE=g%u0Z
z8RT(vJB4=}%r#8T!{+;DjD#2ABK)AQ7)J6?zl)vt^5MORq{HECZpzra0D(d+Zs+BI
z7W9k@cS6m2A_;E9xk|{Hwh|z7$m2ezJ*r~~Cm_d%nK>6o!Z~2>bKEDUBA!Y2D(Jel
zc$tS-!N^IAV>2Hh69wVQlpviVpD}YTuO>Mgr@gsv#RZvt_Ql6sZD-n=zIy>WniKvL
zsrmq7g%KQXM7{3~*MV&%QdT3ws}@C@TLE_Fp}dQ<f}EH`pz05lbT3TNT`9#wFei_S
z8v8ITaufrMD68{wfYeP~aplz%l*?vQW%Xv~<>=^@UeNxWZWmvbpG{xBO<#7$G16o<
zeZl%dJeNX=CplEYS(ViC!ZErm5jW?g77uI0OGAu{vtaa|kB(8JodAuR*#!Ni+7XVX
zju`=&XST*!mJRg~rh<D!yv_HG%H_%N8?R#E2u^2^51|sjHVBW?q`KC21Ho+;gXg2=
zJEn5NMT9Lf<&O=;1fRLJN=s!~)ue(kgLRStc|^z4HS45DfdUK4#lJ!vb1*NCp7IxR
z476Nx9WhJvVRoUDh@Utf4p{#LD7VafmMj7>kB;~WU?K*#-i9h@P97kcIfljO<u}F?
zqi4hMa@{kW)8LAe9>?ND!-j+MdalQmK-shT>=j6kPdnm{+X$5A=Y?g4CwpfZMz0!M
zz^8Ym;A6>mYw?#rE7wVE{_oYpSlC(W_?S$>GRJitCYxV!c-Pa@u6b2I3wrFH1xl4b
zF`re$#7xrL#o_FS(dYy{__gu4zF(v`&*mmPy=P)NaeIU{CI8Yq(;wfVd<ia_esu}f
zR_qq4bV$Qw6m$|?f3(UD=Ei{IQjlAQl*F>PW>a<V<Sml3#!Z!u$4WTgGCj$PV|!Dr
z1bykl)<3^*Idkaw8t2g{xqdjiH98uj(qy@97K(8W{I7~y!Mt)z9&1YBOoDuAdpYAD
z2EwHezb5Dv{)!?}Yz2Uqhj{KyKp7MjQNp=qJ&qM*Ilrw6q`eCcL_K?n&tGEV!|z0q
zj~B3;gNZr?YP4%`YiM|U$5n;J_pZq?Y(7(J7Yht!%i@fQyjKuzk!zHi(~jaW%DFOi
zWlcOXM-f*g5>`(w4#6Mj2E?q03apE*y0wY|b86!N`oh(F67p0S4oWLF@1IXgMs}dx
zrP~&3kVufz{U+Jd`5$niNXOU?9IsYM8m7NGTIw}VX{JAYhge~?Z+!^FG_cM*5~MNo
z1aoZeU~6$Y3KJ!n^-%SldiEcNXPk=;CT$+Cko~hW>PA9Z3xz56-I?B%-#UG2V&xV&
z1V)ve{z_hPC;+Q?3htBcd|Nr`a=eHDOS?*Dt8NB&Lt_3}zC{BBgUKF_<co4kzym1z
z9uCa-1tdqcHC=oYdwsw3DhE|S+lM{G`}kFjqO&amDphtBFc5n~9481EaGTRPU9n{s
ztyS+7<TyT&&?nzXKwXE<daQL`HWC@$dj}}*cm%8~zV0iBh_x)sgU5S!_U=F3-#xss
zf8*eXG^CzJhCjm+!&AB=N6W=y$?oR?%BgywFhgERvG*E5U<HuxFz@Z+mJW#{&freR
zpqv&;&9sX)qPUXHL$V+yw$#;zw6&G)1*tPF$zn+RT1fxl9JM=ma@u|5zEQ11nIrIT
zKLTu3y0f>__e65dr_4!9nHAt-NK$D5--qk0xEW9g_w^Lp1gTUGPOSrdeK)Bc#R851
zDC)LT4xND3C;2^;K}bhH`dXKHd^nTaOyu(;Gxtr@Nrqi-9r?#mirYt4t~ZIb`2-43
zxPjmRjTg1<4g|2&2gO2b_Rz2Z!RB_P@2HEqS>GNmarI&{!^xht1#tat7)aB1Gy@Xf
ziQ`DUw&F>7rP&vz*ijJ7*Y~^L9}P-1UI3|j(+!$PR)sn`B=sZei_QhKxksBBs!f26
zO<Z)SwN|SCjt^J?`NfKE;$sZ?K%jzGRRL})#@trVEX*>C-84ML(UU3jJVwJ^eno22
zHW7KRla^@UpIu<aH#Xt0<oSFw`cLGzh|`?R2%Ii_Lk!k~7{Lm0We0!nM5rAe%jPmi
zTM(KPj(`0gT#G_tr^kO^e7Su4D{_3{LKjbUs$ZEvh;LHF8Bj4~HVJ$A1q>S!uDQX-
zwM`_;3r5oClX&hqA7bl|5ChaFDjZ1h<i+X92?}F`af;;U?dIk?Z1bN3$mtP>me@rB
z2a=jG-T*t9cmJs^P!VoCnhZUZqJZ&Q0{8!ECt9wZy9D``G4}OCe#-b5Wu<H(fOYHY
zH(&ip*yHoU7KjssE<jwTuWMXkn+pF+J8;bsLnxNh+GZ#PD%@+0It9q<HLv1=QmyIr
zxgDy&hjI}P`Xt#$1M)iW$Sp=lwR2Xw+~BiRi3csm|E>}BdUN;2<6E~MJpMt2$fLW?
z{JM&5h0*TkZMNVDmTiXH$LIu#20Nc>4Z^7#x#MPGN6wq;#EEF=n-wAYB0B*gYpW6-
zXB3BtuDE}#)58+&XeXomKkM=tRzQ3uf@zOBrqEAcsqcwz2u2%Q*0JxO8Z#R_<xvPH
zm16}tJ=Y@<JxGUU?wC>TapWb$lLiiC)NC)kL3!wo;Y^RStA85>-;YU81+7I83hNNc
z^#;Y-Q`cu0qT^=MCwf`(9yY1BN4UE)8s5b2^ws^-<7bF3czM4`_iN*FxwW7@&c|K4
zu%5xO#-2BZm>d=9vUqi>Ovh;ezRy!jjx7H1=x8)X$%$+Ls}(xE%}dg|A-53nJUD&v
z0<rH@ts;G>?Xr<QSvzqJlojX^*e^N)XKkg@5Q)!<&+M5q0A(qgQzV?~$GlO~{w)e<
zJRHqYN#ipA!gEZ!d>5Xgwe4e7;Tfh0tPd3OhM40VM{U1qO;I)Bd|Y!Y56L8`e`UiC
zY=dLoyFx8M<^f@Aimnluj4SBEQ2x`oEnliA)||&C9lOvf*Xq}sz8Lx20=Y>Wbi&;^
zuME&4fv-o^m*MFgFbd6xopK<fSQm8Cu=1&J-+YXF?eL?-Eg9l#1h_gdn!`U~V2rmd
z%lnaV22@=L+@I^eUa~dpX1Mu-A90_OEoUxi*wBb&-1zx0nn(VQBR45>d5DN5H^8Bz
zxgFw5pm*n|6SH9=EJ<8lBHg=@cv0EbFzPMCygdO4Z5ckpNyAW%$vOop%-_WiglbP7
z9Np&EMAPSM4|8wY=`fgo`y-vh$8d_KqU645Qkhd^JVM#?X#uJNLyvN2xyJ*{8oR~U
zaRA$D;9=m4tbvu#lK%dgu{297yx9fQiJoHqrVyp@r$ChcO2JUal5V@dx%b!IYd_rm
z5f^e$-9m(H#}U`TuifW8f$n7D<jyAKV8Q8O#z7Z`AVGntL_G2RwQ7QGm~bAx&_Vk7
zmrMRd05ZfCDRCn1&UkTGo81~OxC<Ggs){c9aBueyI}dMvgGECuS&#?yI<4^ms%Rq3
zd0DQs0)XF<tsa>)p5-E|?g)KFZs?NqdS^c?p6Ktv`)v=9Fw6Aw8hhUN7bko2gG>dt
zyL2gFoQLB3L)_O|JlT#(ppl^vhq$PUiV*3XNWyXOIdP!DbB$*s92qBGkViIDRsp`R
zwA17QLGrD2ITuc+*q!^r&}nZ7t&Yp{qOV~ca7O+dC;bw8FHiKNjy}dkm;3TH-cy`M
z^V>IzTe`H!fvsS0nAaFqxBxMP!@R(11Y;L*?5h6B2Dr;+Z3|yb4iQV0%ej*#{Z0>Z
ztt*fZ|4wqq3N2lAVS}PaI(1e*FRz9ji<VTcg1WHe#M*71J(s>kK)98(MKKR}OY1Hz
zNN+1c9~6fEsz!6G8%#`VD4x_1tPS57h`#kdTIyCw(1j*kR5kn5LZED7U4$bCwJhk^
z>Xo>dld-xcTNKLj3|2c!nK9PlpQX#Z!Muz%#luvV*xkV~yt4}oPEL^%6qn2Rd@(?g
z?~LQ^lgZ!+n^ER81g;>LepgmepcV}+LRYAaj?Uwuu{k@M1g0NJm-Zt<P`DBseUw^-
zi<%iZ0X!06$F7s;0(S~hp_~q+e}}GfcFId8H&)&`(9Ejw^o)@<6R>MWBAAG?^foER
zxL)Qac~WMwaXk3r)Yee&Ffe9+qACX@VUXVSarA^7714GuL_i3^yfVj!Z<7gDLLg1k
zKoXr`zmrPvU8fMDj=g&%q9XzkFl(f`Ksusolf=0}!~?#P*WQhcwA}7P#(!FY{F1m%
zIlH>z+$KPMl9b3h6+_AaW7;u#MrJ2h`b#<z(=l$8F{2!uhl2_!rZIFM0RcSu;)%O3
zX-7zx#lK(`#X?A+N!+E6@Y8tt@`ilh5$OXye_~H_*i?KOJ1v5IWr#8=Pt7~CVQbCd
zv&g2)|4<%LYKW|BlEm6o2R-hcT}&@$xVee+Le?`ZbKLrm071aY6Nj&it6B905qfQ_
zFNk<PMs;P};PJOf+b0RJAC=D2NT{Z;&hf2kJurFAXarIt<uja6T7$MGlaJOZ2k3FP
z6cx0>{wPB)r(cm<I+-)50?|(Ty~`lM^3=X03Z_*#wxK)@qI2P%wf4qg5b}<2-9Qd}
z=-$w*F#{>gCfCCk^yZiLaniVYT}zrq>93iarb&7bVqGLsqAjbnJU;j_^0X*jL)IY@
zCf_T|ss<0>vK^)B@dDp&Odm`<Li+OP7BV&~)+()zYolP?nKcQr{=6~AMU@Sf`q+5A
z@k^TCj}in8^y!3{hi~QUeTlPZ@T~>hM-BBc8knC=k%1frm0^+O8`2w-C(^xEnUD+C
z>#*45UU^%tRVG9JrKLgO5XzTpL%X&qabmcXwFJ!oHP%^Oy*dg`Yf?Jdsf`^a@3kvP
zV+G+lD<&zwBfHj=hW28{8=5wKjv1{-=Zuax!`RuY!e+x7^#f94n5+~;qAd#^w@Wxy
zox0{V>;nuhVxP$k=1yZ4Nc8Wh$PqnABnGMT_+EvwaJVUue)yl<2%jg~9rR*U1c7_T
zcZ&l{dd6Vs8V4zf$HmaaFR>BBvk$f2ZZbrySHtfumj+3VERgcucJhVr5%-v!ke~;o
z7BiL2XLwFWk&6K5-WU!MWtuTH7^B{pzc@YS&Bl5SxlRmvj;3xc6Ocv-Lk<^MeF6in
zR{*%u4!}@=PV4{Z>XEYZrm=cW&I|IH3OLxfMTe94`NpLToPm*SWI|U3O}l=O(BHGI
zbR+mXr&D6xb6(9&m6>!P-*sSPFxBr`F$@$K+XdF+E2e{eQ7cRdqu)})^rE&z<2}OI
zEWt)p*DT<3z^TAnlxBY$x4weumWAvmc^b`S5w#|R9@$ALo&Uty!W+81a@y;~;_y1%
zFwYn~pO#@&SgM(lQ0dxcRr$meYX7lbAZlso-}`D^0$Uhk`wpKXp(`UlNle<?DfAj%
z7ZP>v>{@dsDs{u1Ch8%Os=`>kx7th@Tpe1pe=pSyiqluErc`ZkZ({q|>2qWb9nNqK
zq;x5C`op)|9pAswfx0HMLO=eU>f_P;#i$$?Uqg@L8z>!ex&%gDd8w7oM+HK2Av%=T
znDwl%+SM963#6iJ#DQ9yG)X&(3b<I<K;s}P*GO1!x4C7Z3q%T-Fkv2@JbDH4XLY*R
zRKdUw$SS1yshs-;blfa6G^;YhhU$;9EF8`kZ}Z!CF@nRJwh@4mMO@r1Zks6R5czw9
z)c;ho)!ItyYn1_`5%i=TCgz3LiaQbLTsjf{2<uu?D?&)@4rCA%x?y?F%6uv-taWP9
z*;8`HG4;Vaq@f(6jHXoSPI_u}3@YIyXTDUBMnsy+vOc?;ISvNz;cVfBds?{90;RDE
z75h~^ocUYjJgY^7uRPVYkrKrj99D)ls8hVueNlu+ADxbHWXY7Bm#5QLzu|X||IuZr
zRJp(RWVyqVU7;83O9<5qIaBhw5k$$8!)yE3{<`;v^z9*%FLbh^O{M5p)CxMS<I~9~
zsaM2>bGC1ort9-S@cqRZ3eBu<>v`zzdL~&U6M{bF?d>~@u$*)vBkA(o_kI4^QtW45
zQYR<(&?^rsN|7zyPv|XzaxPV<6|D91G=f$tMJ_vPz*H5is+}S*$v=IyOkhDCvv_k|
zkE*3$lUNt3LAhM>JY!hm%%Ul89ZRkwV!5SW%yFk6y05s6a$|zK;lp=H_3D;QF4$z#
zDm0Y3>oR~RTx78X7t@GuBeHcglB@rLuaoxYFw5MD1|+jUUK4q``kXK>A-x{Ya3B@B
zOD?!VpAB6o?Ur~-N0TL)GR>sTS@yfr1?p8Z{)!|6X)F`iaqf7ruq$9y>X){(c;|f1
zTya(>M)3n#8fspv8ecSiQ4>vgkDsypRnti1^2;xq!w0t>TyGxhfn@XRVEXP?4f8G$
zP~{wGb1>s&eEpywGTKm(K_?}<rxXR7OfT0X_l;L=k$-PPj206_z_*5)*|If7+S(SL
zjGFH`&*Er4K3Q&Qqc5kkEnJX8KEoIVp{MUS!rDCLMp6M(41DL6@W0DvwW!XB06dU6
z!*$g+xMhZTrmWz*ZNk1z7q{R%9jn6oFq(`{{De{p`vZK)Ok1?laUYy8!otJ!R_nG5
ztY{p#_HMZ4-8JrbaWFnUok$Ic-Kl07bxe;$lI5NJ(YvmZFv=1aJP=feEFQfAFWenX
zSn#1^I4uwn-Qm#c01+T!sND$Hj?m6)RA{!gMAwF+xwy=dxGdA#1M{ap`@-)47#|S7
zn^$lQBV-4@M4d!{E_pI|l8M{6mMF|Al14fBNG4`6Nd3@;`TH31`{jbnj(Fad3XsZU
zHFs;B;uk!$<h-o%aCxEMS%W@YaXBsGqGMpW8+Jw;xg{o_DpZWA^N{v7i8j>Jeuacv
zE#F0ekkf@8>4gs=#z|ufbz3@TT5*S4+e=_joE#Be<-EOizI=<LOJ42m(Z#qe8iE|S
zgMbPq{Dk&0hDi=)r?7K^xP&xkXtnB|wG$9hz$&~hZu_mnTZa$!4{yRp?FBdSehWt7
zGdskv*nf6G4^R;N2)6+cDu!kAgh^1e=eou9Sizk;+tGH<6$s;*ybs5v9Nmy3B~rt{
z{&xmvM_UAU)`l4`Ow+BBjyt{QwtZ^*5<a451KUJW#dQ~{d-IX$;ZHqddj^}D^@BQi
z=z6mjmlb}KRq*atBz>rYT6Ou2X2?aoweeV~t@<YE;C!=;m)aj<lMDyj%=E8kg<?cJ
zrdMk2!PN4@DLhJFr&)Q47T1#d^o_czX1RJ>!D0sG)mGV14K#AShPJmym+~qMS4&Iu
zD5(%aNcI=cgom$g+ttBKn?ANKTlHI(e8BIbejd>Wc07`C(lV1JYO=2U`iK1|SNCol
zLRa=;C+W&|bo)9|yZANm80%r~ZM?o0j)&U=R2^jv2+Wv>x6rQ2S+$<E0p4~kaO2w6
zsgPR)qX7{NU)4~Z9K_gl`dCU;@JqTMp-J0xNP^oMKLe{*<WUIVm4n(Z$bCAa&sDwT
zU)&KNgL7cZZD!<$(L47D!AOea>x{<O`^|Kx+F)&OtIagEU$jjW50XHO_wLSUO@G<x
zwmH$pUD>8RMS~PX?4L&uHD+22V$VV+1w=QpDwzFfU#&me@SFIR`t$5&wf=1LlMP(x
z&)!x^e{wSoy0-y9SpQ&&I(QFf6Kqvq1WlSYb-2}Wa$~~Vy0QZbP25wgT2#u_A~$D*
zJvfGaN9saU(Bgva1-1#XZp)e$s~4aI(cn;@(ZfBFPqD~#thFxk?3SI2?6t>dNy+(@
zQ^h*M0b=skT|fsruG_WZ)BaVf&gy-?jgPq@XPxCUAty=XH#e5qSzK6D?c9T?lG;$m
za@e!$kV8!pM^Lwxr`CbDwfcQhq|K%l*ep?H)<%S>yE;Op#g#8t<2KKA1}@9lpRBxH
z-vLM9-m|q)2Njf&&hA<f;-t?5H1*s2ejV=Jg2!q#_Y~D1H=5_+e~Pi}X2qu%%J@Pg
z)dlHnI&_c_f^>GjPfEYc+(G9As+Bz56^-iPWW@6Nm`a$Ydr~KEoDvCeu*1G_hQoo2
zF?L(xlg(?45U1s%Fz+Xu${8ijrO#H+CQJqQI)?k&j1ptz?qQwXsbVMd=2QNMX#w4N
zVh=POqMS|l+@f}?3B$S;uCmiD=GL8N!wbY9#LNsL+A|eag~jjouZG2MJ$JM+aL$;_
zA`L7Bykhm2d6{<wM8CL+1$w%V4g$eKgNist44x+T`?_~}f_2rgMLuElC8jup#6}PQ
zZU52k-LHAA`mi|gxU_kR%dw=0?#_??_~_cTAFus{&i8PTHONasZx+0=69<{;Z+|`5
zx%t!K6EwaxdOpC>Nzpvw?%v?tX#Q1x-NW*&X5Dz~hW-BEet5j|)6F~okG(JLZtFPG
z{+?fP<Gg1i$0X%F2@_93L6F2~7b$BT$0r6!P=ZAQ3;=40;{X0W&r?<1eK!)MWM?ub
znKLqYZ!fi1b#--LfWtNT@nmt_9Ipe3r;oq5`Pt_Wi1E(;9E+lkJ_(bS&f^X#yZ<8Z
z4~0PVwr$|_mMmFjW9c7m#CE48%lVNv&paaB!@cA<3$llmnadQvMCInG(AjkN)wjlS
zskk-kxHHNW6PIF+d1ocmrR!AFHeaW0>GN*Sv?$i}zQTpNwdw(GVt?8>)3*Y`V6IUm
zx&-!RR!Q$Z<TV5Z8TC-&-X15NQw9vCkHvQzr!0Cqn*5{OyD)OrOI{4aGX}4dz~=e-
z_UFHO^yTgjqzz|3bkW0Zl&$N!S1Yq^6+?WQKn{|g!Sj9-1ETcpmTCKa`>-WLPb?hf
zH$0J2=x+e2#_fWTP1Q@Z5eT?x0}GM%Gv%i^iY7(qD0iTw7)r&B5r%#Nt*b~kkJ?;v
zkHzVzX%wEa;5SsNRcq}95^WuE$px&PLg@K=)3inl_IYjx6bgh~)rz+EkrX2&$=D|X
zak%`ytB(^^FC`PTGC|XUBo6)W&XI(*plyMxjcu5T!fxRU<f+e4=O6L^z~xL)1U>1f
zSf~)j_?#XMlZ@U4aGcrcXzb&cY>;WJne24>WRr8d`Q>#%?XhH(Y^10&@%G(vP@Cw(
zd^eEBp&b0OF$}6cqL3S#d4E4`ejuRUTwdK7ki;cCtXX2Q#2`M2OBEmJ2;~OO;w^Y=
z#Rn*GbLo7Tk79nsdlyH?jZ2BH>Y+9i(m3Dh*>^Gyb!hz!ZL5ik3HE9Stjr?U^js71
zQp^SF!CsE-mJ|m)F4e9vzzs(WJAYn>)*mLkGT2Vw)-WKTM7&?UI;6Y5aYL{ROeob!
z6(5Q(&V7p1w;wELI#)S5Ivw)|>xVwzcQlU2ZkP(b1s29#WM%B?2xF{pPJ(q2c75=K
zzK2QbMJn&XCs<H~b%1l=C>blzG0`F;-Mpltwo6$)!zfo3-N39tt@_h*tX;Bc;%e8h
z9sKNSW}LLWxKun;5MVVcl~##Mk2-p<lnGOJh{IO!=Cd_B8M|f-u#59eY^3vy@G_T3
zF5van6izij#Xivf?1104_OiJHttQj$P`|#GT(cGEvS}uHm3rCOv5&aq7je8a8Jk)7
zE)sU0zWt7kNO?Qs)-MWuYp;&VvLedKOR@fu!I!>}%h<eI_>oI|{Jm5HEFG#MwxW-M
zqVQ|&{uPAUuC0HPpvATNNiP#%T-={j(3xA-jBoFLw)4&XzkG?X77OLfEjF!3WG)hE
z_c1YBa%Mb5v^Go6bwoP-b$|h#@kz5{OB}cQ*RGhQMnDL=LaRb=u$P_W<Ck4ST*`C>
zA|DJ!Qx>ios|zBU8sTtc0g6gobp?NTo?6`M3qyvib!OOP!6@@A!byJnUniOdSAk%{
zfFU>3x)A+AJ_6Zg{qi};jJimu0KHqn`{X;1K=Cv}8S#u%tHl!LoN%T!4`%??mOj$R
zn&xmO_wbeu;YMujDAyCMxH{azY<gyohOd81^0$fqOa-vR1rj8@SxuVNcy@O-iYus(
zio6Zrc3t?_iBtojm8~6Png*6huR$gII7_1eIM8?^SxJYAI>t20DQq<>dhR6NqcxR1
zZ%<e<q&;}~7T}kEmP6$tQCMrg_@Vgz0>ahW;;G%JOVk>-Ol+c@9z{`$=J*o0lo}3+
zvS_3Bp#;ExDLDhQR$hZJU^1lwHlNf(HdFl)fHp<m4Uooo1wf5AU4T)_x+$61?`w(f
zR^q!H0Z00!Q=TUS;wP`yt5Lo=u)S=+n#c9&<!75`s+15iKhW_73x0>EG3@m>&bBzt
z=umQuWI7W=8=X6BW?$2W1Ut$lD(LCM?=T^H^+TMfw$k9nte}JpdYZ~HI13tYav3P1
zvJf8gaPll}@dzOB#hFu-SR6Zy9WXRnG(eczftaucPM81H+VRT<%#`isqb%c2m<EFB
zP*_BZ-Yi((AUaP_=&r8T#qZv47Y#P%C;RV1OR^vu(B*et8hA=eHoz@N#;Jc~HN)zS
z@p{RP4jesmXl-1<Y|`V>^ox(m|HFw6e9mOC5nscAY{k#t^IN2PIoP^C7~cKc<E`Bx
z-WPx6COZ#@!yA8l@-Q0J{?5&|{Jg4IfU#<S=VqNTB${_V2VU2%{i<5%C<5x;cn!vr
z$9KQdcGmiXNB3{-+}OUofo06`=;RlF<>#^B40WW72i)*67Ti09%jCwtIG7wBR_p7}
z@G0HVHLOXO*E+|j_Re_u3p!ekRvlwSTz&HK$6tQ_`7dl6=HnIrhYxY=eR?n&AAYj`
zo6)BqfBM;%d;8<h@$>W1m!I!_e(>=ppMNnLeR41!{bGH6y}EWVetC@-Tm9mrk3KpZ
zxIg`=TK{<M<LaYNsz3ed7azU-fFG~K$*vDJKU@32D7g4w^V<(LHm)t^``0?@y|G+;
z@ZH)6Q(Q8twlyApuvQiUaka*_AUwH(<{$k2r~Ka*{<pTXwY9VMWNYim+Wywov%&AT
zwuaLi_VnZHTU#Gr$CJTyU{8+m<d{#MesSHNEbwHZHrMzs1{`h;hUwSVD!(3V4ep@b
z;NjYXt*r-yV;_Hx=RU<7Oz}oj961;>Jel#yo!@wyZ??9+S$hh&))GL&rK2(0+8S~A
zrMGSVoq7zed5bjuAja3w`bQu>+S+=wrhmo&l!MQQMvr@2TlWHkkA~>J%?Ip>Rz{t}
zc#l7~w+4SvM|+Duck7M!Qn#%&BAMEKy>hoiKb!BRA(;m1m~e0tZ-);u>@nAy;U|uf
zGwIHW|NRUsc}AAZZU@p6Jeu&)oBPkz>dqQl-CcWufA4IqQJC)H_24dKhO_}Kw@4e3
zYVbehLk>lm7#!4|4z{*_%L#4+3dr%6OWQ5`_0%Z4c8X@l6v@FSV$uWrG*a9ZN!Re6
za&OP}#GU%H!!@H}@f1@21*aCNzWCufr=GmH?lgM^c<*zd*#KB=|HFpY9REB20a@RG
zC3OiCs1#AB>(Bpd?G%JOy<X5AFucB=mE3r?Bq!`=C#c@OKFrH=I&}@XmQ13}_KA-H
zX}Gxtv73<5G$Sym_iTWBTZ2EZ(JG`r@26i5EShY|^x2C?)CdfAYwhol%)h&6;_2&w
z9;fb99)sg%pf>s8=50I$nCaio#l8_A?C_ub3sQ=|XE*roBmT3U|F#jvTjBs=U)&(v
zU#g3BRBQe7!~E9P+A9G2LVCWvHZqg@$o$6Sy6AQ~SfgRxrdip>SofYw9r0F{luv_D
zUtUK~@_uIxGj8p&wSls;_PIaUmhVFEzvIDg8)FY&QsIZhNB<n_-#5#fFgq|dUk+lX
z;SV=xaPK&0*FMEypGvVmxgo8;qemYD1>pB_wiBOmg5S(;3WqzgX)n~z>}%H(LjJkY
z!rba-@=$j~mf7`UjL+ogVhov08P~x}Bg-90G!%n|=GFCt3}A*GyknkF1f_qX&2;w!
z985&(6PUx35C!iB|M0QE*THSaUK1I+63;+}!P2RqwtR5Y-~emT*OgeVF?&ve!Wj)Q
zlZ89pmP1&CaYyX^yKzKT{?6J&5FMlMvGFmafAEE)mDH5F$m#D$j^r#D%-AFH<4cW<
zz``D}qp|<F4@G}ZaQ@;g=)8`vJInB57;`EFNdZi-B!Og6hDA7at_=eBXTr-Tgks;>
z8s1Oi>>5SQ&)P5q1sdnZWpLsQgT{d9g5)E#_{dr$8eMb5o}^ZSyulrbjCpVl^(49v
z|KY5bU=gW1Yp^iz>d+!ZX#gAs?K9UD+BQ(h%@paiCF8i}ph*e<fC7cV{07DE0Wim~
zDWpJWSii8f_~|2JYz8W|v5k$?VrZH)pbUS|<BJ>CB?HD^=JYvjdON)?Q}a0m#Bh?s
zx1U>~fP$auBRf5SMuRXN2!Psw0Dd|GK*bTrs5Ib$)fo&m*`2jlH)(;4IBr7?8mRrM
z?Of9{<6w70?b?6{ovCCo@dDB?>6#eEbJcb(|DxB(BXX!6e%3h+>P(&FXA=sMKyrJ7
z8?K#XJZ!bc+rv)=CTy@3@WK)Yz-w;WNaw}?rj%|(b_Opn_U~kzD8<9urh0C^jdUc5
zWPXtaeNLC)@?pOSBS(;{f})sMzQYLnh=W}kW<W&YGXzyezsA~UH|*{39~O*IEXPIx
zr@jGtlEL31Ge(kzgvZhKwci5h-<pu5$Do?pikn(NV)6kNY>erX$IQ_r1l?m`YI32z
zVO9*7+iPxd?!n)iSn^kz7V=^%&^nL^2!)-XaqI@4T_=d|LAHjFabPtP@e(M9>6e)T
zc;rqcfdu?Oi(}DB9UQ27h`MZ$h-c%X+e7O`^Y!;^<iSqzdD{aOBND|uC^>k3MnI!T
zhcc9A0nbP_{0%%MM*bS0g_}eJ4>cL*TG!#${Lv$t=)rxGM*%GUah26Cu+Vf$9!k?#
zSZhqSaez4dmYkLIzGj4f<EDU$6o5k61*p41MHC8`3AvO*2?-Oaqe3TbnwmuIxx^)U
z0Bfg*Pm{o8T-~MIz*XQ_%uxh!FpdSBsW)aw(58n!6nNqx#xzGpnkYcBnWL|x4vEX?
z&Fe#;L&+_eARxYPio)(+lIMfhLo<+0d(y^43Xty@y+R%krGV7i#zzByBLF1mnXjp#
z+;^LP8*6{J{RG!!0Rug?UyLmh6+Uy{>}E5hh@^mlmYWh>0yE&cCV78gL9P>~wB?|}
za~oIl<bTlP_<^DkLNIu&B>?mo{BMeT?$q@Q13eOX?}h!!1U_;C6I#PqXb1yJE@%GD
zK$PXrn_Pn5GhC$A@>#AD42ktxgGpyJn6h_S7Qh7fJzz12<$)PZfeskp+BlUkPfNAI
zp#?6Ql;fw?N8Va9>vfirF`bIH=7K@?MSy8~0>-IeWYEacU>0fBqK$cSwa~dNOpt<I
zN+(4e&@$T1>8}HWFNwJR{5k#sZy=Ax$}yvg9HjtYS4aHHQST*wQ63(JA%Z586oxQI
zuGuV504lh>weOmFYimF%4Sulo<aQ{Z3)>Jr6kK~6{v%`%;SS_xNFBfg;$F>{OAcL+
zF~uj;C^VE%WM*QB#|9_F%smAl_85ps5wa0Pb7N_d(5r}5Am3`^^CUS-L(VCSMh_p8
znvNU*CCy_4v=|B-*s8$pYXNF~0iz{k%%Bu5D!pHNtXt|0x*^V>`AN;3CB3K?cFX#p
z<#WdXKeJqv^bsafYv~#_44ns9wTU!(SmO*>;A(*}#TWAx#qc3XaPb<%c#uu0XE!yq
zB##aXvkqZf)xp^%uq;Coq`d_Xf-c+gS1{6)A7nr@l;aNp_`$FaDh#vNaws!7>c1>v
zrA3Lpga1jtI{OwzHp?XjJ<Q$m;@v2P?6FB)YJ#l-3Sau$Q+6TBRQhm~9(CJ)(BT$#
zPec&uP+EKrO}4j<G9qMpM{_Ov=%j7PJq*kzE;ZTKKpZJGP(dch5Fny&8BP8fFKwyq
zcA?-M`yqn&j<l=DBABd)q!?j-LoIKQlGK7h_DAS$eCNU|k--M=ES#n~_4ovkN2r3I
z&cm)>Kz0}omCyqgjEbk=jzcS?90C2#EJr(VLh6z`W11re10vySC#OX%%FqwtlEC6^
zf1*H$q`=k&mqQ5SX|g!Fl0{Cf>(LHD5Cv*`?Y9tu-)4<Jae8XT6hfgl;EK==g0OFx
z;$eh^4lG)R2ySumtQ2>pk7m(41}a6GL*1Ya{KnduW~ON(S%YR-r&7Fa*x4#bX&M6~
zmM+N!!!trwki^0^q8POBD8#J^gH36M2b)0PX(Y5^AuM=sOXJ!%Xc&BmJ3)^XrXc|0
zl*<Hr*no;sibNR2rU}){)uD1h8pNX6nQ>{TxP+fkJO=Q}FvlqiohPc{yY>PdUbsBb
z@w*)r;bk@4f^^}D#NAocmnWAFISbtAB7tcX&B)65af%inruDWEl*9)Oa-o0F_Ztti
zAkuK!W173CNk#!sE8OCA^cjmA7Q-M^dFe_g<b`12!IJ#_rVcp-S?wvK0D8D*;b#O>
z9tI%GsSq3HGY19$OX7$jXqmPn)2Ue5n+=gC6ctO`r3NEUjUkv80ATna$9sd5`XVpD
zR4d^YigS=dGxLba+nDxB<*{ocDE5=hfi5BC;}#_2gvbAA&8)5-J{3L82;n6||KT*P
ze~^=gNgAX@i91eNfjbzVY`S&R0P@JeNA<D5$&zT2CEx~kkbb)LYKSUeg!FijL!@dT
z(oF~z@S+DsaRxAcal=<s1Qotd-C$ZUdIQvmWKEY6e7`#nROaqi0F_bJZMvd?i!I2|
zim6BiV2U-B*<?U5gxeR;`<%v|C<n{Yk+0ATh9>B3U-L=eS`!ZpT$7@Mc1V@RvCYoT
zVX*5$7vA{}&Nl~wKyH`LF#D^^1Mcz##Q+(<wyZ}N{ucs{)V^=T_OaZk+ce1I+2cf&
z=iLe>{b)pl05did@Dn~4cIH{b27SiiU?0S8n36~4{w4lII3hi+mDEOW6e9R={LL{!
z?Q#PcV#N5xtTfFDqp*dHmdpaSa_$M~%sxTtsUYz6F9|-^PSK%sI>ILnge?#cD;i`)
zU?ITE#~2^lOQVVY&=29Sv_+fHZR<jk+q@XZV@Qo)+j<G4+ICS328;rV^}(D5DG4Oa
z$SQyl{wFf51us%prFl%++>OdZ<PaGHWW8_FAHzU;0QMad95eKIdJC&#J@z>zTPdTN
z4W!L{5+Qs7D`Hv_ui(KMLzb=!Fr(DU$adzCk<Kppj?V2c8xKp6FldVBIL*6fUj^o>
z{~+jj>fC~`!$|*|20f<oOf`+OJ;;uhD^5vc8T1TS3wjW><k09pK~KXNL3m}1{uA`T
zzI#1u%ANHGJu+ZzTLDtOW4t3XhkvpmAKL!U#U>*lX74c8U-0XHPjKOZbuGNnrh)sO
z1U7wTi08@?N#Qt?Awe!fGOl;}2UZeUJYP1%6U1x96VmKt;1S6&gagGxLp-A~@nT+e
z^speUT>cFLk22K*cZM2WPq`Qeik(Y~t{X8#3VQU`*o9$=*dRUIS~=j@=Z04)<B(e=
zzau6!1J$zzsl!ihyYwSP^|-A+cnZhPDGgHm-CBUWF5>Iv%HdMeWuQPTswAjQZO1Pt
zCuGSZCtKs==`Adh^w`K^f+xcxVl~3Y)gq^QnA05c=Z>5}fuT{rYq3R@-ha?|$Ag`3
z80(B^9uRcNScauISN}A;C|`t=vJX=4LJ%e2^~`=5B<F$f3u20yeOp;kMlq1J1ghR$
zf1mwNfh#f}fh^E|{}?N#DxmE^TbcbX`yARSo4{n0w94W*7x*D60Z1An0%YHJ%kite
zE?Qk0KpgC#o1!SVf1$!oYBQ@NGc&aW5^BDT8UD@+YLPnilsq;K#CK64qahah49E&1
z0jC9@no0*tTZM$GZ`7U3RKSh0E=;OG9sVYSH^->vgoq0)v+}HY4MuyG2uahCjYuef
z11$uE6xqVjdc);QOwzCvSi0A3ViPjju>^PNV3IvcJz5(Ddb7em;Nz3n?4|_1QHn!V
z)<dlKMPOe*4?vCx4|r$?@_EM?tT!&XsSrVA<eP*7_ICa60TYpJF8D;^0!<Pcu^L;V
zS#l^zTpHRd2~8>$V(1?><RHib>~lBK^PxUZk$k~V-@`L!$xhe;W5Zl_!@X$eZj1!`
zLUc%nr=p7`fjO%EO7R!_AxR60JO~PyUHBSrG8r(oT$hwaLl-oaOpB%>j|YT&kj8*F
zV=wy~hSNkwf1dph$QC|=TbzG3|3GR%Kd5u)9!AS@6t=MR$j^ZoqC%bWg2qu}<4!oy
z^wvKHrZ=T3Ks{@!fWKYX@k<`U&vn80?Qw9ezP3qD;?63JkH9Bvke22Jja3ebm8=BS
zHzY=;*SAm)#K-6l`Zs25s24_(dKoNf|0o57+o-746fUCa#n30I!G*cn`4K#f{0L?%
zOq9u$$C8M*AbXEYxa_Ee_+UsNEV|}u1>V~jdb7emZUt11EE~(Tw~8(YRx}P8%M?iV
zjFcFbTWXTam27QDP^rlhXy-|PYT`nZ7&Sn~&SX8_HsGkqXebc3A<XtcqfnOZji}MY
z8=g&gpC`sLASj)YGE1!7^ys%)qXe(G=R#%=SCh+{0f8WTWqe6mG=WTbg@eZaN&dkk
zz=^v+?yC(ANT%}wzjFBU6aAv_!?BK%;I`aHNtvHf=p;`m#S4}|M!k$DvD@PmFy5(i
z_OEO#@XLE#_*WJM1hKbhIAAkr+HnL2;`G#fye}d{0}wG%_)!!iZ)G~ouCdhtOXbCw
zE#Xg%hd<as7egO_uMp%wdw&uchwNe}9P7gih^~v;ou5_I)>zSi>JPUh$pj5?@>Zgr
zo|uTix4MDF-w-FS?dlS&Bu<?oL9-7hOU5RKVYQtiZwwFp)*g1b>22<+B?Q?^+Oh5n
zMY^jA0a%KL9xNiN*`ZGZ*#<h-&SaJ(iIUx_vWW7NtWChp9W&XUDfBMC0O8mnv{X%P
zx=R~PmrI>D1<Kt9(0w+~GRQKCLnc%}iPX7}Yp+XX<}ONqG=Cb|q!Q)Icw8i$Or*M`
z^6Y0xW+{AR3s_E$j%B-SRJ8H)EA}^9D%?U-!R9foB&8*&F7E?G*J>=2Sjr6PR91&t
z%+`!WJNF?02sDUO0<hR5)db{@4HOm^TY{Q@2ox>+RvTa9B&wR7PI$+{(1`<SaLev7
zB`+J$uyzC~_3J$blv>29(H;<!w7m0#S!!CEb(=@&lGIbmW|2=ByyU170$rB3s^i)J
zK(nx}6-Rk`PD`4tPjkf*;yV#i%S23slZ?)Jr5Oh(E}@&+t{q8+9N{FY3xt_FoV;-M
z0cq)xq6_hmK^~yw`B+$BUq^yazK#^xDLY!p#4wDh^+u2>-u7h{o<5Pc#h4E~KIQO#
z*1Y_6Gb*Ljt&~9MP?Y&moj8N*9&jr1swQ&m&hh@D1v9FvfZ|8x!FV9?+DpC!s|j5c
zy9jyygE34lpJ!86?nkSyFU&*;_i4g3$Qm_u!pTqdO7i`8Q2BSwa}C76SJdrpc$q@K
zWSW?}AP@P{Pl=G(L9GGuV6ut68gRGDf*;DtH(Vtkb1tD1v}{1ukBq~hnpLO%*@mHJ
z;}^<d)J0h9AF*EINg~j&nevlm!vlh|9oB8I=Vh=~wrJ6q2B}#k9h-!?BO$OYtohuq
zfI|=opeDf;Wi_i~N9iSdcSsp6ey|oK#avUJv;tZG)P_Zv=zKIma7zG;bb8&Y#K@=+
zHQbbd+Y%x%cFPx9XkqI1n8;I@z*z$EG>k7JX^0#S@Z#w!k4o)#>ij#3teY8o2)kkj
z4D{!!|G;vfegJZNiBOS2y6K;eX<TrR-sC3RMKG=}vk7K{6SbpcNoGQh#cavKm*A34
zs~MTK6x9eokp=OYiwz<{IJZkvs?m`9m48J)=}R5pHRmy#YBY#rIx<elz{Bv&?O3)Z
zPM+^Tf3J6w(g=o>M6)R{t|HSQi`!IQsPRh97fTTq>m$IWT%pp7tMhGhv@kKYg_*|E
z3HQcW)Id9-4pZb~Q5iHKk^q_7vUM2|!bX|Kc+jAW2Evem;o33OW?_6V7(tSyQ%A}M
zmbmCiOB%jmm5dZfOm5(62+_x;!Q|1`DM}8ccSU)Y$Ii}Qh*@70jTg8jCjp407gYWp
z|9N8EaL<CBPJ83lSQb~TcgtlK2M(K*mTgwH>Kopr0DB`Q=pU3jdulqYiD^N^h%k&#
zZGM_aAV(ivkTEPHdVwCOdTYdBe*V`24nZi0h>-@9SJ^hxEfY!%%@e0|0a8whsw5@2
zLA*T~=nmTbwjo~227~Nwdi%(((a-(|2w;hvIAcUQ2=T7TbDRLdye2krZ3P}gl`|oM
zQanh9>bC5XGbHP~IsPCx?%{?+!nrSs?%UFo+gXr-2S!mo#Ghbs13NGa>r{0FQ|zp4
zZbGk{H!Kj`2__eE%7F<Z*@;fuQNU>pGz`regh7VL)<a1Wt>TTrBm@vKCOC<MJy{|t
z1sG%S8>_giZ$SWP62MNQ8x)cnDS&2^)p5djcytfP%s>g3GR@@jcMA@lZFOwQ{3&G*
z28&%2eeMYn0tKH;v2>sizxWxwCoC<O=wf6IH0vD$+iJwY$AE|NF`z$g{y}1Y3o`Bs
zj6~JKun{2lbP@-k&am?i!T}(8&$P%)xqBf-3VKD>#klwO82;>-jrQfBh$<S$a_b-0
zFm4Ninm)X@rz8;^oNLm%A-#qsQCDAZaW4wfyU>eWY2*ldxb>8or8dzUz>9DOX;yfU
z5Qhq)mG2hgp_^T&D?~?gOF&$7-C9sPKuPKiewl8QDR>5+`m+=-!4$w-2|4OQ>QO8=
zJsl|vK$j86nlOf3#<mK_7<fvvEGej9w)?gloX#wVfmFnn38rwNDMm7o=ms@GUhVjv
z8{T9H**$Vrpui|~jw#q$s+KV2)e#_pW|YvAEs;hdmCKYs8n2i#M6Y35L{q6U2h>H7
z#vvWvFutTU6#9}mrgelOO{CIv>*#aV5sul>1Pn3Xpw27&gC4QAZa9PD=uF1cf63h6
z+S<0;pyFi5yOK`mi)Lw8%CN?Y$p~1m4J3#PB{8&=Cuqnax#@y}KeM2?5>d{&=$4dW
zU-@HRi3n-I?2XMc8i<<LKx`vRBm*EM%6J#k=>$<o8TaJ=9B0ZC=)6QnLMSugrYO<k
z7CeaFrYA-n*nD>k_IH_~ArYF_GA(J@(6pgyGI0`CqJSpQNt-WwBzKu%nvNVG_lON4
zk0WAYk4E=?HaBzEAgwU6-7~X60zv;c0UVrEU})r$T1E+s&<vZ6h=G!1NG2<%Kl4A}
zGa}QJC}WODkkA5VzOK~_2u`nw?FknFZ1aGaij#m5$kkIzApyxVn1B@a1%qJe;&^~c
z=W8>X;7Sf(Cu3wC8s-HVLdNZ|h^c8Eos=yRI$8Y6Jh3t36l;;w?4o07qtQJm(de$8
z68@M3Q3`yMJ4a3rO3|?;H8ILTJI`465`}#<M5;t|^@*e)nK>X-6sEzM`OzKXrNf`;
zrZ@Ex&J-AegK)l+DG4-`&MIu6MyH1!;6SiT8v^d#?qXhHQe4h6WO3aIGzgt#HbhV7
zsFT=52Ip5jVpk|cs)XqsGCpy|P(Tn$V+XTSeuA3nSGG_|6r`sUP48;IB^B>w5N8im
z05m=@y3>qw{VG;$;K0|xfpEq9CO<Y5q>sid4U-w!bD5Vjj66x5@-ZZ_s#F7~x=n^4
zhpe!EU7#iF<G`Ko<<eNC+$AePLDL;mz9d1kB%LY!1sZ#;xyH)>p!1zaN_Ci1M<P`G
zbdxVsC7)UAz!97Ul|DHUpi3Sq0bgBk4TlHmeH#ATJOySQnD6kUjFVY%?!Jsh3{%~S
zo<4&FUH=G}Qki*3nC8OQ(Y$it*^MG%fT6+mBzqVc0e+Ffv}YiX2M7@qt0)^O1}Im^
zA8^y6bYy+-Crg>YMEu(Fy0r8l!YGamQ*y7qzwB7qf6#}?VH!>T^jkABvZQWaD@3in
z^J5U3b8hr;Vio3Gwjdb<0*Hs=r3nQ|Of-0{E9bQiqUt`^+WM7dkVxd3u;z6SEd3%T
z_bmM^29+ve_Q@!NrDjw(ab**1!M+(U{X<$i0P_{?y|8@#{2t`f=JF_kvO`4dZjb<t
zbc7mkQI0F%fX%1Qe2~WkY~%uFVBs+m6Czj{%>Y{9Mq+RZTgbaXKo6H9{Bi?@<}O98
zRU7mHg!LP%hztMRCu4B%Qp9qF3;YpufbVTDYRJ3E&!l$$=)DK<F8~WUMGycbAg7Q*
zEZ9PpA+4k~5~Re~C;*6cRu=DU3Xf6<o3#LTaa_gGLtBu)epw${MK+NbrmnFH6Ii80
z;6c1QgMQGmd(2JHjB|-hbHj-)L{#2G&`DH`a(?bkem31TOt}m4(UVgBOaTmKpcM=0
zI$C*w?*o$DV1;<8NTtS<xK;vI%w-Gqt60onwpd)qPH-4LL*5I2KeA<I9ub|DyMt_y
z!N?G4UOL_|nY2YBs~(Er`jr4Q1n+GPj~F55k$e_rM?jqi^do7>KD6>niY3V8DCY(c
zC?pX~Q3DRJ9FzlTU8wOlnjMBZ;!n_oItctrTtWwMh>4RKv`{o(3no*q7c2Y&4{1x~
z{ZJ=hX8||ve+3S1_Y?$!NOrw7M2%8z_k<derRJg{DHV9|Vr2Zi9cvo3@|9H>18hdH
z34n#k#Efnh(tvz%Ksvdqf=+In@QeNlJv6Z?wU8$Dw4ZERTqf!i%MCDQFv^1`7CLZ}
zc<fdv58ue5p_rJ0VADbJ7<QSky8riZR|62&SkN-QAPKg0XY%Js1ei>1jR^PwaN0FY
zgOMnZ9-2V+*r4GZ&|!cLf053oZ!9X%U`oLTq|hKsFG^|or#oU2)6fDH!z$vZ=b|CE
zHgP1AtSy)kH}HrrrUrQ&%We}wUQ2~!7HI&}Akqk8LV#B^I0PR4l1++39dSDXU>T-?
zEz4(rVsIV|3rG_PP%NqD5Ti?TDRGY^I-1Zn(`0sSpVz)4VuJ!3tf+D}0)H3sm)cm(
zLJ^9iojHr`I4`G3iK=x1A)|^5ZQbkvx4J2`oOP<|hJ+|20FlH%jVbZZ17nQ%uz}c?
z=m4_<5@}5zqAE=g`9UGS8Z@F+d~3i2)wXW{HD$L@l7xKQD*~hNe2!8}716r}1x1x}
zeBD-q5ZAL7Vwk4;0tme5x&Q){z)F+&6A&3Y4^c%}#FB_s6X}LnX303&UI^htdd0|-
zKG875@d1W9V>3u%3;h74&!Yv>1(&gy?7QhPYoCEJHo5iZG9vB3ct0|oK%0r)h7r#z
zW$`jwt(sJH-@nX}B)z$yi+Nhcn6yWRi-z@xODN@mK}c=oVh{tCR9V=5GRKDVd;j{(
znZ8Nk2INl<2zF>N4S4@HIWJQLpM$dO==`*DCq4j22>ABeF{A`1h220IyXKxj0`^qc
zP}71#vKeB%TzKp-LL7@r!qY0jQsv=(FrrP<)+~y1Hl~~#nnm9iJKtvimEn<b)jwf3
z;I`yYd`r(CdnDrC3{}?p(m*X3RWHZReWQy2BTvkcI@fM&m4`BOOI5QNSHk3)2Q(4C
zyrdH1X9{5O3-SaFQeXn6LU9zm=bSYla^cL1=Ax&m_Srelf}x%6n(FL-F#XP>h+04-
zlwCmTwcEk<2Y#pYlaLVvB($Lcp@4xF6hrE!n4vaq<P2-wfe5sq&mQ#{WibfWv^Ero
z<2;77I5!8|fCI9EfcI=T0BgV@!$*-Y5wd`)5PPoZQnn$=LCdfUV_{91eI@>OU)eyz
z1St`#E#>GLQl7igwuY3q`nqhA-sxRjGMR@E5xbStBBs=LwX@ftf`)W`GWoMHAaJ^O
zZlz<;>T>o!kjZD)A5qnD-#V6HCXFCnDUD`<Y5y@84zSuwS}qd<NuvG)c*sK}RZKGK
z$DI{8N_h1v+VNm54z5|uD8UN1?R!P)LdRxGpL|7%wy-3?L%ReOFhaHWsZEkxL8tjN
zLQHBGf{8lln~Vjd+svme0_616MZW|HRWfV<uRR9l>0&Xp(u^*!^Z-;qw`3Te-$lb3
z(B(yd(V*!|GHfjZXi81wIQS}bODP(-pfnND#Rhp}4#NuqPd$gx!%(Fy<s5u*n{;|2
zs&X8}BQ${489cGHum0@)2fV|D{Q?yx$8McOVTf?#XL|rK|BW$+jMUGQUK`UBbZJzS
z|0d|V1_4d(JVaO6Msb>yi)mACA-e!D0CEC`&_ke)PZvdF$p1+P#0mWaQrYPq42me*
zUaPB^NRIGLD32bJE_@gj=NdzO#8<U(Ng2Yb0zc2nYDSY0!-2-j9U6W*Jpp~WYGDjV
zu=0Lx)Fcs28%GF_E#imAC~RUL)=gW}cRoVw1~Y+wP6<gmrYw9U0g_6B&ew?1<WBWQ
z_)zSO*iw;90w<GA7*$`&(!==Kl<9^L+A8vup_Dk3)tYEY6#2S##)FjM!~dbS-V3{d
z`9Kc8_rv+`HN_bskY(va&L%$zBG8FC9>FUHV>U%*Or44Z;<NrCtpJE&nybRFAL04T
z@zyP^c_Eg<P6LX1C3Zuczr`%>;T>46)A7@dt*DDOPel>gLYo*^T$A><W^fY7l(Re9
z50OC-3SzRx<ZOil2La+5X;A>JpUNCrjVY>zgooQZIy0mmAPKD3@j{h*u`}y$u_M8^
zjPf&*zEGeuLXDMCi$frKAkz2=q5?Nhnh5AFEh=v~Or36;Sd!TG3|NKk2rFc2Acrb)
zfVZ%em7B}RatZOQeUKZlAMks^7=J(3pXMK(-4u!h1=@o!uH}Hh;vBuc&_6)tn<P+B
z534bZ`$$Q_k9`sVg`iRzl>f;xN*v6$L?sgltjr{QiYS~VJB67h+piNENwzbdISx&Z
zLAyS;bauqU9}P`<gh@-g(2_;+$~TchpNWg~y9}A2;jq4LWC0ugzHNbti;|3%=1I{S
zcikwk=}R-2jmWTI<*()fLn0=<5CLsW!xVy|+78f4?paHF@xs7BsKjxsF-YyJb73%U
zM$9JuiG;ZGI`>VY0>*>d<+YgLSFD5Zvrg?ht5G{;Cjd3ZK*ZxSN1WPlQ>z5t7z#i$
zIMFWv%^PZYuc?+U1FJ{CR9XM2S(G_5F19_0pm9_xP)?Zo&XGFpQ&LPMBq<>-L#2rk
zi(!lrr`{8vkmJX16!rL81%DtzPYIyxum%G#_D)N^#%Ca%L_>UpNGNCu{8APK^2lw)
zzso^-{hCo$VUuZ69SF>9`w%*W!LF1L!h%S|2TL~57^O-N$e!kR@NItN9=!_%H_237
zFHOY`&Rie{bc;sljeYTz2kD6bh!`n?E4>kEnvsKih8UNqVU;NH!3w_!lAR4!C=j%k
zbf@YfpDZ_)t=d=-i5~KwgthAR!`n*jJ^}_G<#b3fDw998&f2?=&O)To8Bs`p)ZJMh
z5Cy{kz6S>Q<$9WbK{}``QLhPMh7og@DxJ_IimLQy4!86RR*A$Z5;W9grS9TNv3_eS
znrN7ESq_1`WX+Fdr7k036xvTE`L><(+G7ikTLhz^b*bpT$tZE(^B@v8iKr8mh69cG
zZCt$*c^dEHnjT4UDc{48Z*wT-@TqFDG&VPQ3)>K~5#p+8An{y9G~^cqM?91t5<&(f
z@FIGsf9zNXe<lpI!x19dky5Aw(kG;5Mcjx=#N4AI8I-2-#U^yFC#ghTek#jlYx8}J
zx6+{ir<asg_=vPI6X-<%z7ZAORFg+2Ww7Vsz1a(ci8Rap)!hwsDcNW3k2y$^AF(Om
zf`r5R4<kHnz=b=|E#vzQKcHY|XyqBw7a2(?g9KC#NL-hp^T`FOP1iqY^5BsdrV3*(
z)bn&<sgRiAB6%`0^pV9u#5M=iW{XflR}vC1Ln0}yfYSYbLd?@~0Kn~*V+f&>D0B!N
zFkdN;1^kg+aJ`4bTYd_H0LuDd%(h;62};<<tR2}|074z+Et!D1;4LxSJ|{$O03PFG
zx&g+InomwjbR#9g6HqP5h{z(Ey2}>JBj_J>aB<+0g{H)o`iYGBST&#mfSpB>YQ4fg
zK;}v0^=MDH*2`&bnY0w%z>ZLJFzOH%6+iv@6TvK{&_BWm|7cGWItRMmGbxf@xR(0i
zdjB91CSqiT8OSEgkiORmX>oJm#|AaLC@hZZ9}O%U;G$=giF4Rwif93Bi&eNY(Txek
z_*h~am0!5F0o!nzK#1|nd<%WPOf-mGe0MWa2`ecDYH5>BVuYQ#04C%JT!tJa`dh^y
z#FGvyecFlwrBU70xR)VlHXcZY0Ms6*C$Vwux`r90YmT(&=mU{{8sEJorO>bsdH&e5
zjv{vmDOMQx=^((6x|ZXYrYb&HW>!R`%pRJg1X%z(v{fur15M$wFvM;kr|<=|bpSOY
zn_4`;Fj(8kJ7y7a0nVa<R#8k(vV^@tz#-ar2BCE2L7OP+lgLwEF*lY2T+MB-O^}b6
zsC37_BW-|TigLZ-R!+h`_Sn33lcMm~YX>}8U`~d8*FJLFbU@A(#-K8(#XFYr!N%k?
zLJ5^kl}2z6VJ6DKD4<F0;`63;=}NErEPhB~)8aE-1<c)C$RJA)L=ER(DzA1Kl75OG
zvJ58J34$Le(q;{sd`@l7fD)wcvK)^hM5fX3HK>1=+?6Tu%r;?ZyQI}7>Z<#1K!rbH
zog5ae&v~!seOOK@k}PvN5)Zie?J6sg!K(}>*x$Mj70-&5LJl(%Y4+?F=J(h~^LH)O
z%p&nZn^~%23gtivg!IQ5(=aPoSLkiSKCO}kXo!nz&9-HvYL$Ztk0Pz)X5NGU%rTs6
zp%FnBm;gvvm=lFjTG!d9lZ|DrQ*vgazHP=3SC~bLs?7~{UA`0q5tAk$MI)F@mYS+B
zVK-r_#a)<HMT3A<^5V3YDIvLx=QN24N+c28(5Y3qHp=ZFIZ(;ayxV4mOAcbTHV5%A
zHc%B7lje~a#DjQ;W-e}SvjDy9v2>p17r^46N@-n%h~a>yx@rKuO2Iw7TMN!GAMZcF
zKXk9DT0C=J1edKBaYYO#jLZ%nU_x@WZapc^DpSxWI=HzeA+iBLGE{Bg_rAOy2S7Rf
zK5d&CnB_A>0AhT&%t-=h)inFCvep{Z(*4P3Mc@-P{Mb(-hF+}t4`}%GQB<3N9QqXf
z0GTgEFrts})juv$T=izk)n6M_up^So&mWM}*XFlqjz1kRD7Z(HbkBSceks3ktbae6
z-gI+C*+-c*MouA9k!}y8287vOnc;2Y@FDv=Py&x!8{u`inTQv+{KGnWgTEuc0;x&|
zz_?n(8V%a0{YnTLNFQbP_~}r(^E2tSomZFyv6<!IpXU^jpHoe9CTp965YO&f69$gB
z&aQ^PQb{KBK7S4W-)bd-{b5M>y;u=Sj!KaO$hz?*U@j~{0LK&l2EJJx;X@Tk4PZfN
z_j25Bztm7BQoph>!K6s_6~>c>EU1H**qx`UW7o!PYvVNxQ5mJ61EO6wTk4PigDUn8
z1Y%*^8FZyYA>yNm!G+xP?`eLn$AE<LgBBjT+0gII4&g3lVEBA%5O#FMElTQY)b#s=
z&tY&-K{`rG*)kQ&5*a<Q$2p&rgci66j<bjtzob%<ibQfa0kiUb!h#&VPi4%dXvN1%
zF(qJ<QGr(NIs4tUHcoZHii&n5Wttre1m~y;^zFdBM6oT6kSLPIhQZ8td08^jIBIG0
z+V3pGXoavNyHuFz{brkjg0#f}+C_v-#u2!%@Ef^gAgetXY&HPkRFF$J0X$RtCdRK^
zj2#EO8$P^fk6RBlYgAb0^`u2ZVJG=%**8=ZZtsItW`gYi46L7o+!;<95lkpQx$bX`
z>Y$Yp>t@hs4}JAwuj%%%<i;$vebF&XYa9$|_YuTad4ut^0Mv4{It!dUjBg>dhxtK^
zJpz3Rs-#^QewVfYB-F%e{s|}QCOh7nh2wji!s~dS`@hz*-u3sVq$uL_0uX>^+87MZ
z6lJT=-9={I0%LS4XXRnaD7Q9DeCTC0Xu3mRK%)Z)HF;z~0^&NzqsqD=LikC_;+IT#
zVKsz*5MkK8yNcJqwzDS<ac?J0i~tAV*xiGE($rEcwg4kkVm;iJfkBbc-JcdDAs-2U
zjuK-$w&aS{E5NP7;P~KDWZ65;W#fP}`jV)v%gTn%k({G*+Iru(8PSGeKw^8FwoQZl
z1ih{yrFlK&kcaanX$+@=o6tSjZrT<wBrdW5oWA_WFQ<Y3Qm_arBKDRSVwI4HLE62_
z0RqZeWO3y}MQtt$NLp-;;-{x77#GPa8fNekzG-hMEg_&b+24S@DiJmQZ<~9J`v(;X
zxOwNb(Vzx&iHt%E`ae5OXzMy+HpC8tHKH3fmyx#={(+mv?YY5+x#J`T%>-WgYl@<h
zjMy<ZUuZG#0x__@H;!x)XG7qRmTARI)bN-gBYq}GZ8EHBo?mzB<F~{;*Sgd{^B|5m
zDYIM6tb@op@8M0QHihyg+~R^4@Y;;CvDT$Y;R88Bh~c~_hKTZ6Ok|54kRwZr3K3n<
z*&!`hfMpR6D&Vji?ohld$Uw58`9Z0V7L)piqK%=L9#%tg2E_#OFKRks9Ow}86gFt;
z6<m%jy2ZhCNkcT|MrKl7BL`?e5{H!$@)BlE$3OWN-c_J@*j$s+kmQVjx=Ne{uFEM1
zg30_ihD{DR%lS9wBA%V`E3*uswE}Q{NEjQtP;uBOu?eA=hJ)Zh>B=j)gsFf8Bhoe}
zIPF?Y*6%ZVQ^Oh#kg_Q6jE`vl7UJ<+onAxQ-z0_y;-wQ2#sYRL$&=9eI?0V32xSKs
zEn8?;)OzuWOr0nxQ1p+>2=~sjFbNyA&KwM3LVPVTkubTP2B~qfFf)@Ot}zC`%IrKE
z`qk&;PMjHYO*6jArb3D|iFpi~hPzx!*nS1%#0b;*B_zqT1P7!ARN{gM@i=yc*AILJ
zkwixocsSf*CW<r1!H0xII7s4?9-i?F=%skv@M6L>l*7G?pcFp{G~Xi)BD@7O(Y8vt
zsLRCcF6Lcua86BP0A>ldm_1X=-lKV;Gr~G`EKe9_+DYThh@_T5J33^X)W^S85HXg_
zqnWM$!*>>zEDh0{XfVQ&%JQO79@a$1TwkK2*|$#SL&C9p0vIhW!CF${V8+hi0aawx
zja6}Uin>8BM_pDI!tl!TE$E_3=;%UaXWOWLC1h#vB4iM=SbiSF;h^m-R0i1Sp{%9|
z64i-PT#ty%jh6MSdTa2iECJQ7G$@=m0<(lo>?|9&kRac>$wEnKuxyN@#e)(QjAj>D
z7vB&!$m~6674@$8=?dhMT9aPJw{P--6g%F{0mXKV8edzq35Y*@93Yb0wTokFfMjuD
zXRkcA&NKiBX)u%7P}`=(hQbOol*;--)V*6?d0~TH$|H?;P7T2TTj0wOGs9(2fE*{(
zOvn=)kY@=RM2xEm>O?fuD1YW`l3*ih`(W*Z#q4yxKVA%G)8%-&{9yCj4<^Sav-z@m
zTiqVb4-RMZ7i-mEc6>aWu2su7C*x}Hd^DM&{o&+U^<#B7pB-0M{xn`bAJ509$3HBt
z?W^&X-~V;$BdOQhY8RakcITt%Vzj@U%%+{4m#>SC=#!h@M6cQW%__b2P7e>q^WE9)
z@$1g!r_0GvF^$3Z*J)L4?eC9ImXF7a)1&2Jbab>g+JCWF)0=~Xt&@}a?B(d_@%Znj
z<Ha%_TWkE4XmLDVj*dr*7uQDKV|^dgozISr#`Df;Nql>KYrNc9j+WysQAktdmwE&0
zPoIs4FTpIm#`MeiWPdq6$PMp}7mG1k%{!sm8!g7&5WTIg<6Ryn6EC53MrV=<l$pN~
zT=&PzSCAbtU4IAl(t`(&w{LCV|J%LcF0%1EchqQqHhnpsFTuCn*^Tl3<al({i2~X=
z!Pd#kMM2f!^7$hI5rUZ@hlH*RyrOaD{LS%l|M{)a;^uffTr4s1a{S<gQflnCH)231
zK+i^t^}}%wS@SH{k7oNXAk+IV#G9&eDh-Y%;OF*%h!D>bj@?f?rNR3KpjGt{B0D)~
z%$7#JIhh{BbPmGxH`4FzgF*zON$LkNjc4k1{Y}xntp`(+g+8IH4Mq9rkh}ASm`(S`
zPS~#Ae7(Lj!guojK3m)ccSP*M>{O#grI$W>@v2i2rae==t;X~DY(AJBj2COw{A7Q~
zKk<`Bg&eZKJAg;qb@eU9++?b%S-2$XO`UjKjSdbzE^Of$E$^K!3#&O=yqWH=AM;s3
zwzt(iXw&TA@%Y&U)+gI!>KMkxtM$3Rt96sv8XixU%key6I;JfvaeG_sAI+xY8{_fG
zT6H`+`FeB&gNvWz`Li(yHrao1{mojnfS2NbCyU|VPe(^-yrbE{Xz{!@@5@ifM);Bg
zIIED))6>ZTTO~jBwz@Gs9KrOPw%<IOy-JNYu1Ur5XmPF8sy5f%$#gtAXM{$ZT7R0I
z<H_Rq?&!^U{>eE5^);@IxU)~^veJ0nO>3j=!r`0)RlP~A_mFYIVt+J!JU*T+sj?9c
z>?jZ^2>yJ0bb_|m&g)Ve-ynM^U)wQO`MT)m+O$1I>@t}?E1+^G&@og;<J*F`824?}
z+v?II-h+Tn_8Ei8A^}{RwqwA)rZos3j;9B8oHcHtpc~hM6}@e1Bf_HnFy3F@ojpSc
zLd83p<w$Yk8verbqDS_RHxM!HoZ|HY@r?1x{BKiuWu<pUFYB###`~x9$?{D&y)shU
z0h-k4+pt&&BZmkeEKn(!{ctoN9ovM(Q`ovu(<?k4?~f-Z7J)rQpg3OM7{8qCTc{IY
zY$4ubFnNL~!ro-PF$5;Zr$-}388=2ghqZ_hqzpa?d@)#9v5jjaU(I|n5G&vxBBnZ;
zos4%Q6f53!J!9~2YBTR70Og(Nyb7n+F?EIbcyfT?2|?uHWPUt87`}$BpN@`-NefAp
zr@A)wHuTV84r&<De}OXB71ys-5D!IYc(hiXo^U?=Yz_NtR39X@M3C3nnju`h%d>H}
ztuweW!TKTCQpoaK5+BfRPbbUC=*XpQXF57rJfE4o7#IaTyitv^Ho<cf*5>$ts_0(o
zhQz8hL8C<$9h>Dyo@QOxAcpP22s3U$e`a$8#>LbNJSl@CO^>$s!BIW$z)1m8iBW|P
zS<t8nElw_y9F`qPYQy#6Y*B)BeRMQJI9Cv3=M@-G0Nw%Df=$ZdtAjB_7yh91QdF20
zc*`ud>(s__6aonZ;RohpEUpe7VzD;9iAD49HJA&-D=4R=?9t>O<y3_=LWr~d@RKjT
z_+1@^3b7Al`QB*$V!ZSg9xQR%$pTuT`Sef|g?{2q(K4QH9~KilfzUEI9ow=b+T5F9
zU4MEU2sOZeEkjX%h`9h|nyx8+62d0QVzvUF2lL6Z$+U*W?(0OP=BPdZY%7QU>-5^M
ze+`=anvv@W24hqqvr!=!DJ^BO@?CHhz6KFk?9V5AU{m!R(cp4c{q=(pB>2rSc=gv0
zG$IF4^9u20_3AmCb9FMBFBcV5{`Bae+8b94WWet6!3Mir`zr#C>0*h9)`9t|lHn)>
zX|ZXKs_45}E$62u)37jtVRnjEhod9+E<cJk7JpNXE<3`}XtC6KczmD*>;2Q?J-~mt
z;eHhL$FG%BGOTZJJ-%`C!Q(sCS1HA`ad(E;d|KnwgFQwO)vL+!c{Lq__*u)YEJQjH
ze8d$L0_JfwA1`J{FUc$L30yJm<X+WttP85iVYN6#o@cQ*JUtRS)b39h1zcLb;V=lX
zs&%fN+vAR!uxQlA5Cy1|H;kqKOr{VzSWqUvMtif<C7_%vnghCoT)S57^6dnPx%uH}
ze_XwSkE0cV7(u2m)Y$qDcd(vVR`b&%YXkQqLBj};XeLxhkWuwLZPWJ{5Wf#km#64|
zJo*7@fF=vT1Y)4ecyWZ$)(<9&(caN`eF{^)jwj>lPwY;0I9aY+Bc%GK5^J>Q%k_it
zA*_SaCVxdo@jSzi=!Jxpq#KbpgT{Yg5^MVGzaaos$!L;ovs6(&K%*a}(*NfuRI}Gc
zsAq1%H(_H)qW`<dcY89U!tv-eUOybqL7{>Y6$JP-Jlu>?e^&#OlWh8tnW$v_BRx^g
zWM!yx4IPdakT~{QuTr+-*q+Qsubd~1o-qD!^wGSxzs<Z>L5Y@F&Cza6N5^9sHJ@TM
ze|CDz><DLo*Kn1hu6YVZ;gWlgI>a?Hb%C^rLGizThM(ad1fbTD58-a+&uIRY|Bu(z
zkKcYLb!7w4ng6Mc1zYlTd<914bV1y{A5GuT_`nN}4yxH<_5JBo_F{bSy__-D-Y2k)
zdy^wD)6D+&e_qU{-`m(6pEmKqjR%{sYx6msgX|~CQEPJ%6E>Z#gQ`c9{mF725aw}6
zia&0G8*dVp0^r{nC-Sj@6aBOK=!lStkV~>@I};Y-fILk-DSX`mTC!CgA<!Xzi*cX>
zBiA&Ea+STUNxH;%y>gddXav^Q)r;xu)szlDX>Z|32~jazPwWD~?jowG4w>es`(z@%
znp$8JF<Gfy1@Q2pzS*F(I--`hl#&wfmWy)L$jEKNeC*HW2kz+B3iUOo*8@1U?%NmR
zH=%XkZ93Fdn{i6_K$MYmIfVhD(@#qnxcmZO#7~o0kW}z6pv$;AK<)&3irn1(_{h={
zByKi4^!CeYuyubhy!*GuTf0M$;**U}AV5WU&Fs`W!>~9R1OC&KuK9N!4u?1X_T*t7
z1dqoj2rg(e83R_|cXD!*Yfgsv-&eL7xv~u0s_oE$0$Dujul^t*foXy&P@qkX?!&4m
zOz#9sApLbpiO3|~1r`dTkVSE57uD$HXmZ2=&12nC+cHEeV`ZB?3!u{pR~@q&beIeq
z!KZVJYG<}*mKImN2}5$0|6i!?WWfM&54!`yDKVqZefk_)4|y(Rw>ml9gNb=gSw(m}
zI$h2fQt!i3Fm^|flvi1$Mz=wU+^#EhYkpYDs~=Wh{dcuDn;nfuT%Gh<%1m=I8==}M
zcdIL>hxpJyS0)J5=3XE$C6~=A0arZ>9X>%aTLk4INKF=sVKit#Kabcwn^Y1HcEF-}
z7;%J3Ae<+bxE3f$3wx!-anI0=94e+5y6Xh#V~VcvV!pm{nR@947;71=Cm{M*pmEhk
z@UebUx~2qv(HtBqJ~%~~FkNC>e|9>J3<-)EiZ~<77}zzPF{D5UW*x9lJmDH<Q6agq
z&iqUN9KMO^S(p{(@Ey&S=7=O}TZT!ts8paSFa>zYjDynpH453Dcw}3#fu_=r4xA8W
zBbrWG=)O6^b3{J2iv>;>+u@Fw7z4tjn1K#D>}w|(2-u!t2UI?kdEsJ&1r0eP4zex{
zmrQQQNLWZ{6B3);k_=K200rL(*a&}B&nDQLte`STJaL`RTnthITr9(9&gLCMmzxqL
znhS1LBwq^~0jt^7eSCztc6_jPZ~!mna2cVX3VP&-VylC)4b5A4p8&r(EL?qaTT5co
zYq_ICDLf&kt-%+0mnqwA`&D6k!}qHCyXVwz?jB~pk@i_&RRCLvd|KV=dwSUIeqj=i
zqYwt1pn(P1-47$2^ctBaLbGWpXI5^5?psIP`vn?%DI*AVYfGEO$rU!}P=M1?2-ixO
z{j|@4vEe*=d}xOj_fZn&QFR24YWg$Wh-HqXBV2gRkKWLd4x?O#3o}N3O>!){_tZ!c
zB$1|8$;DhMl1P(7jadsd*N_o4A3j;qUo*|UKSAaaYDIh7ns4%KiotKj&;kB}&kNtu
zBCT10b?mrm=f(K|9xb5Qa2Q%DW&vo<TMX?U^e(pHnFcJF6@CnB9K34|@q9LWLB(oF
znjUwy-54Drx3^;$L*v8KVTW|GPisDY4eG<Tsa-`9kY_deZeU@7RNmC`!0bdPX5uGi
zlP;h(34#7?9Wn4MpJ+u|;|Eg`kt{v~CeJ`(_&K*Ruu!gSzW}b9TSy97YM{mnLn%V;
zb|_|SBd~ZeIT7duPrB)6FbtlL_g}PK<7)6@Ik^9V@OP-%q756?7A#j0czg5N=wP4A
zN;k<X!u!wy*wx@GqTL!X-#2K8mNK^~l3S5`0-Ppd2)464q|_8V_TNt@b6amx#2WJ1
z2zyQ394nIGNc+PO@+9@~vW_pu$!k%izzWTT33bcfi0aEQd$YP;6yPD8uOe!7mESBv
z{q(L8^>(*m1Y3WzQuvvc7{1r=2VZJfP9P8AE~zWJj73V{2xr8OoSj6_jx}S8$TDb!
zTG5J3rrQT-X1QlQ){01*yC6RoDg_rj?E$zO5oDgpS45lDITe?hCUCORb{OX+$~Z~t
zf#qhZs7&(k?G=F2+4#zL5`p|$69hfIi=IWhR@{ij79A!U)!;U=efwPkx{MA<6Q}Sd
z3;EQuY=CrXN|6QxJN5W5fVGL#D1x_wEzJ3Cw}U{}6zkOv<Lcr(S+oK*A|Rmi`WOlM
zh^uNjv8<l=;=QKr3brsRQ;6f~c#fa&FH5APOKxb+m$S)1`k}EpVk<z{_6sH25hZCO
zO5u}+>Ir%<T-5eJGS%EmjI0-oA8BGLwahUdNP#?1S^Mq^#^U*!a@Ep`_plnrcm*T*
zBr9QPM{{tKHW7{lpno16{h=5pb3@W??Uz`^nVzxIh$2(6wZNtfk0Ki>{AJqHE^&%&
zGD%w4bt6ZEWU<Qb>t52e1h4Wv(OL|{xeL%qzt)_+BlW};m%yiY3J(P?2_`I8kI%j=
zj8_XOA+bsm^kLfXaR+_bNkVS1pOkgvHumO26{;UiB-<%&hSuDeiHPg%pRhIkqEwMA
z+dnF1OtlvK$s;fai%jR00@vKDUM<4;Qoh78#T~iVm7pkdky=b*k+0PgvaYlk|75gn
z!kf;R*z<5+34!y=_Io<sYIwq2w+{ubXPgt(R-WBXIA0cN)qpe8+(JvnXpqmh)L>dI
ztuLczLwsKe@(_ZO{GE(%&R$FHH($QD<o;@Cb@+5evMNJGUg@H^b_4^p@x&t#;4S5d
zq4s9={r`K*AFa)dA2-hhPR`+E^yUc5rOoPFMdVgf6z+q8SUt7A8eL90>;9goBJ{#U
z=`JGl!7fCRv%zYRgCwr<9(-XEJH3^9vqvnp3t?sl80E$j?_t$pm!-6J<er=qL&I8K
zT<~_dv3J@U=0emJDD5%6Z_xETLSB{<#kd}7Tv*adDtd|Kg(%PkLIe9tOO;$wvF3X(
z(o+BoPiuwY7qwXh(b5=~rCJ)`Um!F$P-lq6z&oJtBU~2w0H7f;wP>u<^i)5-2c5Zz
zed~9^-UhfV@;-e7_lCAupx0J{%FggbnChx={;KAE>k#5UY=FNT6@7?H(=kA3P_oeU
zP8oU+5_Et3isk$fD!+pwHAcEDEgHi#ZOYH2SPsRzlj9x9@UKPxJxay&fSKQSqy|pS
zaFl-$Q9QkX?TsDmsl1!lX^pk&`k*igtudN(Dcb&2=Hv00#|qxbc*YQym5u1%#J=H%
z&Lc+hKYjk{-9r9idM<xY7nfXD?dBv;ZJf(euQtg0A>sQYl<L>sO}chsj7t+J26#Wj
z!BX=lSrnY6^JRsETxwOBPpUOXx)2G^0O*~g93~P|5$9Mp9=wN?T7hoPU<&7yRP1cB
zQvQe5=$~aWAy09Bs^pB$XXOCS>c)+rB0G3S(*oyMqKhc2bxDiE3-l?MWUI|mEMr#e
zP)6*lb!h~q7r@7RUc86LI~VBKiV0T3Eqv$&W~w=ki}VY7dS0J%>=2AdJ;$E*N-wmX
zac(9%ZLuOkLrHc2^-!0|V#l5Zwkuc>mo_o9Em<gDHWs4Vg8LiR!TwhJ`Vik<VTSq2
zcjYT<9B-PX@vuXS35(ztG!7^!vl`HmCDqF9CA1iyH1-0<IR8<_f`P&@wlr+m43O`N
z4|Q-wK;54$%a^FMTCX?oF#GGt=(-MQx^Uk{Wf(_eWfP+C^_P>;y45bNpI9-_IyX-_
zN$tcM_G?sWgmY57m!>qvy0NW1nj_?(J1D6~5ilyk7AizrxhpoxQav9w7H`;;og5Xd
zu6|g{G-rMnlr%shxqYk?JUr@yO=1hVYPl1XpL}b~ud4pzFxK%$C{vA8d43cm>B<cW
z1}hWoP=Obz9iRenIzl}!P6_A0)T#+{dC@-R2mNw`VtDS1O%E20yV5SBOQMtnt8=EL
z#}Ip?;jbcuaGm-}XNUEN->P)=Ls=P|8lO*IQlfEQ7ze9SB|KU9#{CUD3xKVdyunYK
z+tEYUCS0UF2*c`ui_T<91fCRh*gk+f?2MOjG#L6b#Q_LB>BmubOJEF^C81`dxD>39
zDp78}=?Ai+LcOoOuEKIqbX8VAFsP145xt5jHmh7&p<VP&dPD2V@*k8gT%<gxZ^*K8
z21BY8p?ubdDWEz3_(TjCTlz)$S|2<<sDsc`(Z<d=jcWJC#qD_5+VWoUM7kr4E&zbB
zV(53sK*+pc=Y3SB^&$N(g=2kVo>vOi*YAviz(k9Yoi&I|x9EJ?dcaON?9Q326<|Yo
zOAWOqDM~V7Fn_I+3|`H3PJvq|3>~A{Ra%{c*{eQnxlF|vfy%hG%hwWWXVtKEV%8oj
z8O8Qk{;C%<)&lS06jU5D0;}$gPSQbEvnVXb`|q%eqmyJ6f3?g$w5M>482qZEyfAD_
z-AnzdQKxpU7fW?$Nw^D;I+Khp?dO!BHEOy#`Cu`ghm2NLe=#UlpQNW)?WdZ~16vG#
z9yM1%!Gqw70So0By<&x+6~DH9L2cuO^<{7%*47HlI#~v{ha8lj#HiK5Uko~-eSSGz
z3Bw__Mxl&xGN@fgdX}{6hS1F_U%%9mwsR7_<)pCYI?j!ls+f~AK#O(L=2gV#WsJ;s
zYZ1$*t<ZdPm0kUGRe*fxI)p+_rH*S$1%|z+iw&ZSQv<xzhLCuV9~r<BJf7Ft;0js6
z`pz3H;Ep$3P_CjH37v{F)jw_)a_F191+bC9Okg>=^dFxk?pCU;NsQ!eB6UJ*mys3Z
zbQUs_X;L{s(p`r5tA;SxVG-MZR*m)OncWn^(@jQW9`P}n+G4e;YNVX;zQ~X*V}WJU
zuC{@zb?oDTv8iHZ*jc=YjpBrGdpdtro3*jj*%;%%RU#*g(K0gR(Z=N9$4y>7q<!&K
z=h6x?uY7ddEnKplK)s6<`RU2kL!6Sm{$@FTILGBi$=YD?8zCpA$Hf#}*7_<fR4WFu
z22iWfs}YV>NwDMH#!=TSK?&Sdb@i9g)Q0&mYhZnKO`WMX-K?&JB=BYD9Wc0Fg7vhU
z`J};`-}aJ@9#pYZ$2Bjmo1hy<Gz-!-E|9IGsYX}p@CBBEM+1D^^xJijj=|uZ`&B++
z3hCBCt_b1svDEq-k8|v{lge&{<HaJq2MvWQj~-c7daimdL=g7v=dSQ4JQ;~WTsnaA
z<nFu$^Fu(_{>2$t-gO%H6TrGO4lVj($U8NfZ>WS*WPOLb3rPDq7#n_vfCq|zDh>j}
zw8i}b7r4Tpe}=}HF3fa^n+(nv{=Hpj&@snK3-f|@tKMsH=2T}a*Sn|kwR@aau3w?h
zJ=GZtQ_K;|54t&63|#YZ;ad*6r)}f|`lfp3*W@6fuFGeYGVC6)mZf+cm!uar76frR
z?mReiM7r%U0K65KC(!e!!w_lI6dCoXFC?gykg!qX3V{pVfY1$cnaZkx+;b5^&nWft
zZskCpqll#c+4muIjNY;Qf46H9y5?vfs{;yW-j2{YO6%+$MhV-9c&ZH3SGpvjV-kjW
z`e+D-Za9PVsz;u>PVr$B?e1La%7hN^+9{2*ndR+E%7iWI!Q$loU7*kbe@}vlWO{G+
zD0EHB1KF!yr_j~kEzb7pw<>gu(#Y8Wpb%ada|B-6<YJ?ALCPT#fIWOF!mcu-gh3IJ
z!~&;%Q$q(>I<Uxo^{YYj*e6%mr#RPcbh_$`=Q0BF)kZydsXuJQ8;zHY7W~ml&b`&v
z9Zpv=J-0o>z2-&@XP94f`n1+-IjH=!<z@1#(mfPU>*n5HbXsbhPKt%eq{GU7Ra}hB
ztFT)Z)W=S?&HwJQW&Wzm1Qk$({qWX33LkHwm+_M-=D!<?5>K;S*ChU{>hq7iiDXv4
zf2`$Nur8?Ii;&ijxZ7$x4{?s0KOyNwQpLySp>Deutay;WFvXRi<$17-boJnqjg1XR
z^9uXOX;k%5NRu7~i<K7A+NCowq@0z5<ZD!|KLLOXu7yrt@h<lAN!b`e(!GC)(OtP4
z4XQu>(ZsAij5FzmZ?xv_v9RgxR@-gOo%FbKrmn0x`gI69yI-|TJ#P_@l{fBF{nK*6
z3s6xKYabahQ;fwd?}kHWqxn4_-r+N`$~|ltGy3GM=lP~{Y+2&sql1D~vFHb63{@<R
z5mE8gx4hTQE-tF4{=lfxMxb}|iE#Rx?~y9snsOF_U<kqaJDGL}mvW0~R%o6H>Up3I
zlpWyu@i7wOAaD-=XBg@(0M2M$N*o|=*zMY2&3FI&XUIYm^tV4U9c%5SFfBY<7Tx&L
zdfWi7u~+HLtQ-4AmowZ|4ZE}2WhQ<5U5z6>#u;$+yeWY@V;d3!bUCY9@3tH9jXrd4
zzgyJ$_QgI(w{`o7vbQeh0fulr<>Tg#8o+3{q3WxzIKk-{-3rA{J8S46|MSP<LaR*r
z(%?uRJ9fqL2wgAF9jj;aE6a(4XM^{({^K7FIp)=1=5QU_-sw>VYVoFh-h;0Th-f0J
zP@o>%e0QvgRXjceAE<KA_EQU)Gn(cJ8glRZC#|vKdG6RU4K)eVWev&NRzJ#46rxcU
z;!vKRV=w1db^~2mm6OAda01EkcLdl)44{a-LcYKE^M#nTT|V<R80;x$!PVT~;7zh=
zrvcj=ZiI6r#eIg}dB0B>q<V?;Buo%f*afkAli0vP9y8sdhy_lO<IdFU2!PY1Ey|X>
z!AC{Nn(|TV*kQ<0MMB5BSiw|hvL%fU=?%iBPe@{i6`N7|ZfI2av`T*D=Mx{f<)Pc}
zR^enPFT3C<dDyB#N*Lt*HEfK0NXHonr69U}_Y`m3@CsL&k>>0X7Ntq%_)Ol*@pilJ
z#kM)_`b9|#zs#RwnzF6haRVQ>Ik?I`dC%7RK148FFUgbmjpyf0dVa^QN!!-Jg|owM
z^!M+jREt11UvK;VDSFZCnWDFS*A!jLPpCy)h}D$-PO*<WO2>s2tEww4>D<&(%Qk__
zjY3r4x>zMKtjW4Rt%vKqMr;F{vb=x_A52PBL9unHi$Tx&8st}DuxST}%d@{7ne8DK
z{L}rT(}VHu?8Vsjz41Y46fWU$>ndCT*wHqjUU(f*yJHB`#fG2TZck<HGMF7c4s{jh
zU|CYXa3Uvt+S&lCR~j=|EsxOwXOk+=a<OZg5XQ}x5~_g}^OJpQ)&G^fnw5Zymf+ZQ
z{+Unnk~Wn+%D9~6suPO~;N9jFPjah3Cr1KB5vgP&VVqu+y%ADrp$mQXMe7>;d(GWZ
zzeD81lJ{+KGrJN)W`s%M#-IrXzKfajEI($$j}c+xBZtb;SQ#AQCS$QtEHkphZ!y!U
z*m|BInN794G~4r@>{|hO=Ft1FaYm|A<Tjq4?rqGb$-Z7G$g*x#Kz?F`Bp3O9HJg?a
zS^#UuYTM3$(V|U_Gz~6Mu3vwgQB?U4?zXlYr&Eu8UTmvNc-=IV0X(V%n6=^Ey%oPN
zz~c}oHlgW3LWln!pTZIF%@DcmVY;iBx~XsU5PUah^R_|a88SjfT?Sw-G&OSU;wwP7
z)EOT|d-*9dQYu*E(T*253&anbaSk-#Cm~L85{BeUl!^P&!yzjE+&-vNu*(s91}#OO
zxUu%?l^gg<B+rwF*7-13P&>!a8Y%@T=QXNVQ!>RxqSs_^h%wuTZPJ(}q)_=7v+4EO
zY&qcPDNw7F78sdW0;0Rs1^M8kd*w|oJ=s~#@b!j}BFdG;kNECyM5o-d$IZ#8IkByt
z{S+ZfK%b4~d#q>M=VzOB)_6nAvZ5P&gAqCDH!wv`c!L{tASc*igd%B4)Cb*d0E7c#
zj31E2PG1n>rNtQ6=dszM8l_(G<@-b48CakS%)8Z3T9w1wx4nQ6?&#-XBnHwX0u;<Y
zD!?oZ${<0I+K}3BvN|;AGa$EgDXYugsS*tWve5VK;b)67G#zKz813r@=OjM-q<a!_
z@Cy5KZ=HJjP}7g$tRbgMCWTBOt);%!WKg4-ebH$HUocu+H3D&j4>#zSlleqCMZIp;
zO6}x&8oXd4s-tQ0E1>`g08u(ufRcoVp!%9I!}D!@n(q=yUg#F_YLUt=h!{^h3kEYp
z5?gZ)SM6HcW;8Eyq8c^o37cSno-tR3Fi+rUHJaeVsL0pz<2Z?>b0l6}91_okX-l_}
zi$Xmal_wvLFZ~E*+Mwn=vnV9QW!|{}AwJ@IfSN*AvD4`UidP$Af{&*9XC0pL(qD)a
zJHU>><;H*Ukw1O`)7v3Mv(GPQ`#uA*b%(n4-Xqt8jcWT4`|98SVfh+`q5r*^f&adO
z>$aOA(`YO$r2&^eK~;&}k&pf2x>;EI$7W#=c90u97|jn@p%_T>q#^FW*CJ(%gQZ1C
zkjzCYx?}A^&hw=*JW$h3qkV1`)}k1Oj;;hR>=kPD7SLgSb`xG~y?SCa-oD{xR~Odf
z);)Z9f%`RX`a0^D78?ipiuoY!XnVlgfi3I<@uVz(gVNd<ulRiwYfOmkMmJfv0^Sa^
zUAQso<A;MV$okldL&a<4>sWV<;$LL3oqPYIeFuMFx`vPd-{hq*RlH#pv|TJ&_1ZNw
z;lOS7c4h;gGAK$F>Tqdvw8W@7Zj82jZv;FF8s_|Tu+Hr2%L_~sLxYY`VuR~s?Q4Tj
zNZ(Y{M}h0*35$)`hp2r-o^<o?$=kPlqE&o%-9Aav9;<dN6Qk?`7gYO{hc&@u7S#z}
zNLd$ccs!e(`5%%yFBK>p=#(ja#Xci<g<tu&vOs~um97E#f~pW3AUdt9XT{i^f~uYy
z_#}@XuGxK!VNy{^gH!x+Px*O@V(?z5D5>$`-UGNS1uC4iM7yhZWAWw0hLLjt_4k$6
z{t;z*hR$KlqA$9>i^y%$_ScCUx|6<mY$BQrTM=b|YrC0`?vlgQ)k+Cu;A7F3d`Z}y
z<bqo!B)u`mmi{!oO@B5NFFg+tuPH+DwkE{+xumG5&Op2ju}$wAT-pp<(O46Bd(>34
z5Kf1Qk}GaujwVmxd07PU67DNCG(xloXnaZ_wQrCH9sNvPc|CV(-AOR?+3_#=)CgJh
zsu5D{YfpwS4{y>H;3)VYh0*M7gnt#KEvaJ$GEHH1BzOTyYF<fy587szeltLea|XsV
z^e9A>)+Y_wU?W;K80ak-v3j{sadHE;6k99l)P|OGTR8kxzZ-xnId}cVvMPcBB%k<A
zZ>Bd3AWc`Umi>qqgVG?EJG=(G)qnk0H29^hb9&Q1pf(OvXc^NO<U<>xh<TUK=lCLz
zlBo0fY@UEXT9~e&K}OlSrcr{Q=f~{%bs>C!3jy=ANO43E>H%cL%gu4W3f#KkW|fK|
z%|zPKY;Sbbz)az)4PvW}$)Zv8hP7U8g@chAE%bfiM1cl~uJD=B5yS2}!xK-}5RNrQ
zK2l+gfk#%GJ{N4TMMD}g+uaBH#9RUjXZP|^Az;uduZW?OJ@a$`+BQlpuIB6>+Bgy$
z{P0B4w_%EVxOo6CvUB<jpEX0YY{@L%<1UUx<bI>0O+qWCPczr%%``XGdZseZkP;~k
zo&~tp4XdX|r(>*OW81k`fhZc@IOk6rV<%7@8vnaUf7`4@NU_WCC`tN~e{oygIGR4l
zTNn#=D8wod`0&FGc7_Ej1%CV*NflVAqCahCU<;gzH%}+a=XPNa(of;3Go6uF#5!pd
zzR!a=JSeciDrxy#VeJADbGizSYZ1R!g=aXQA;X0=n=DMdGrrg7Cc`$|4rE;H<7u#n
zaE`X7DWG<IdN2(W@<&8av+4N8czklTr>Wb)s;YS@eZ?DQKI4Mmb@^Jeasj5iDb%-(
z?-)5)p&BsIrUzM*r0`)~TKEK?lj=~7TBlb0P<uPUg)J}`2eadvN>~1Q%39mb5TM=y
znVVB2_zSXQQOjewd9B<$nrmp_^b6`dk;NIKY~WP`mZck*+FV=@4RNGeMnhlK+pHDm
z+PM0DAimxEV0xV&=@JFI+EFL4zmRPw)u%RJp9))CVZ1BstEFUM&#;+-lGr8IKvxkJ
z*S^<7;i&12YKTw?N%bjUsYXY<(cukNc~DbkLZCeH9np{!gMbd=mwkepqblequDnTQ
zX}Ma`5{rxU<$I2I4BLUDjQ{mtW|Tt=VwdQ#MGJ*P3P;^;sVkHkzO>y+(MPiHWMmiR
zYTPjxi$`I;`+BFPa7H75EA_AqoV7}^Vv0>H4zuv8x8}D-q%NcYRxLh;1#Uip*)IZS
z%x{uTv+Ktxu<*kdncv`>){E!yT7n^`+PbpoT%Z61VD-^&+u%E>)<u2pvR9}Ls)9US
z=wf73lpV(Xh1n>$-_@^RbfG5=oz+^RX!$m1LD0Y=P8rqIzPH$TT6Bg?>l5|`jNYg9
zyuImWv`B{nyklektC%e6)2%=vz!vvF4Vn!m4|+)-9msRW#AW8`m&kP=j*b@N8rLB_
z;{~?Gmg}B9T4!bAI-ZPC%MDY=&(ofum|KmmO=s&kN`nt=PM@uN#$XYXdd&DM=j#N4
zlD^2v41F)eE-cj;fMqKMN6x)4U4O^rlYfyH8A+wxB0<JTz|lOolJ&k2JyEVf?sV%z
z2E60Wf$X;m#&78(B?Z6E6w!bv!Q&bAB#yATSTMR!fSmjuxvh9dN1YTauArbG4?TFp
zhbZln^1YEu0dhkwiZ|g<(xYN4zfd+x;pSO}xpt%;>HPV!qj<%4W19tfh#~IRYZ$)$
z4z>byry(7b?S@NUY#iaJAzUN(b3RTjT_AfaY;0dNZCS)dj$3%QuacntYNYef3mI!d
z>@+qJaRK2L<o{Yq&GL5eB?)yVau=l&wrbBHRT2U7dwr!-5P$-$b2+UI;<ILz<Tx{J
z)75NYN1sJYhTp5;7xCz%7kdNl9QiLs>eqrZ(7Xs^a}mH6cF>No55+a4x!FcwyoU`(
zZn0GpG{V*t_DXPdjV|Tn6R0H?AME|t59WSD|6e~4EWg$spf>5~T1I(W4;!2Q9h9`G
z=NWnL=+{dWwon^nOnCu>jvb=}eIv7voyf08N2nO^bUt?`k;dTzbm0kB%j2VlL9vH9
z(sE_c7!Z4QaE>ut{B^lO-pk$}q1ixYM|T?>TnD#sd8K2U9#`aIb%+;j+Bt&7)&iBa
z@Wmb|)|e3&a=CR)WJV%a3o>NQMRz2+0nWYA{6$LV89%&Z^3VxX#~``JhOcBsAAwXI
zUCe6tgZ)0O>eHjDOd*GBvjj?k5z`_{jY=Mh3_>-*=GcLMoE=L<o|_9rDf$}`l_!>U
zTP2;7Y-iidn=aD<C(0JB0sVahWY1<;GM=D}X2~sfh%>;$waWUCw>GS~sbB4#;^rc#
z_-sC!Pq246;*Ec%k4N|xI9i}G24lnyB;v$0C*pyWBnMl;Nn>6CmHY52HZsR(*Vib8
zXNoxoq$UAzvr|x$nfsh4*aim@Nc7`IomT#i;SwP3pnrMS-S$C5i?&|N^RRzGWs4yl
zzXZB<Vu2VbT{LfI>aW~Kg$0>$Y-@XLD<jlD*ht}X8WQXTdR8cL^=SNTwEqTVM@7Q+
z!%x2W;&+}5Gjxw9tVXo9I#>yhN4Ad-^z0_m!x5{d^<6<qqPVe)WOB@!bZxM8e=xlJ
zx5rz%Lx0vJcXZ)I#%54_vIv;;sE`h3G|<IbZbat>3$eQq{d4-2gCvxEro6?H#qAzk
z$?@rNkfEd7T2&D3!w;)}{?p_KyIPr;2_!J%c=Q^Qj?_J%s;+i%A+kUB%9fD4x-2C^
z|8b)n(j_YKvoQ!PM<8<sPrD#EhmBkS`lJQe!Nj1+gj(KVuX~x=iyGKkM=hqfT6Vbr
zYunw#+H#T_d(#@NY(a?x-^)i?#*O(9JM3>P->fbK?H*qRvS-Rft6zs~wAw)7E-WLh
zK`tUIt<LX5W?F;RP&e6WwJFR4grW8N0<skBp;Gh@m8hg<lA6|}MVnsfYjw&}*m{+v
z(UcXW*mZ+l%lg|+b*4yD-5}>ZRLr>lG2$WO$N$-P?fYc5x%<c-Fw?#>(Ax`53L>!+
zD4vuHpAxPcigw!;jiOKMMWZj%YBiz_r!U7x*euw^i;crDbd6p*REb<sk2SYLmyJHl
z*%=)go3^CDORhn1&*R6hKdztPLR7%_{9j}9>u2LmcwSK%J`hyiuW!`gqzY>;&p=u4
ze=-^+Z*3}qg8~S&#s}CGMmd>BfL^x#q<q&K5;eE|3Z-)-nrdk?YPw?K&ZlXT8d!-I
zy<$~JNpmvYmkh-AP7iS$Zg+Nj{Q7DDfb9%i=V7Pxn*D$V^b8#fd}^@>H@M4p!TJV)
zXGaHTj}t<RGLSy4DRn-YpCLdkNGwlnU-ao+HN1_H4dO&}BSiW$B49~)SXY1Bst|~6
z{Sd7F<P6+0L{LQxy>$s~lp6`l1f<JkyF*=A1uxBo=>m$2kew~dQ2dI3-OQMqv-x9O
z#P}vjYM_|rmcXUI8a(yqO<`+o()fBT@uabm2gG*1<~$5r=i=HO`e@ip6eN^Lru0YW
z4!xDQjE-Ochn{X|&l`forA->nQeri~vtwKIMd3yL@@yo~`*!D-O&_*P-xaC4)-Wkl
zDAd{^YusK?ZgX|=E;AT$aU&<hl0i6uTtdyw4p19~#Ix!ZawLnzDXLCb*2*dZHIFTJ
zlvCh9WxHV9bXUvwzKx`g?W00CZAS-R2rYJRir19KP0uzI+Q7$&cMTa$%JmLV?Zj8e
z-ZNM$kSna=*<`yJ+1NydPI2(JlnR;~QRMwx_I>_zo-652TQ5$=5T?_UM&cUjcxFcE
zD+(dVsTLOfqb>-QBm1bJ_bjMzOV=A0{m#!n2N*t59P)r=@O6n*@8j>D40H@og4-A@
z^366>{1w^f)d#pl=DAK8pZa|#p2^84KYQ-Eq4YS)-^eeA0cGwv8m9#F?_15&tDhqG
z47*<SGx|Rn=;b9c&|UQWd2-O_U08Lg9QA60{vXX@?>rn1Z~X1a!~bNlbB^WTGK<~E
z$h_7mmz3`#Cz*0m9^#|~+`S@Sl{0St$zzX>7uwrs<>6`sv~+u`4OXe|F^|2Hw6tJ&
zA5zmAw1zy~HKeE2rY=RT*ACYz8(tCPQ!StnJwv6?Ud{eBne13B*H*?qNg5kB7#E>?
zZPT+xi2sA>>$CF5KQURbvVrt5EexT*)s;8S8Hk@MaT_vLELKfHY{E#I)-z;3QP#F0
zf;`jnc=0mQh*rt9o3nBh)5kksr=(n?dlKBhp+GUa#COgV2LW4Y;`Ace3^P}fHsy#@
z!_qy6m1-r3ohoUsyf$z2Y9-!Uy;?vu)5Sd@{@cnk#gtk2|9oT=S3@>1j4Wwz@IQ%Q
z<4==LtTk)MHAwb0nAx^M&dns@J<D$tVs{;->dl<ia=fu@Pm^3ezq{<r$f8^b=RuI%
zk)>%(v#U-Goz^))Z`!ntkjEAggM=1Tq;QqH$@Zw_{i8=!wf1_!hYn69z-d#E<xBbG
z#6NqXEB{;Qc<aU>7u)dd4r5l`^3CTu2<JK8@Mpt6%u~N>1gtfxWpPlVwM^ExB_nGf
zGxe<`+P`nIzKv=kQbVB&YyFew>fb+9p{5;)da?7g%!xM6#`HpCnfg}hJa)4d=|m56
z;;MU%1CNDXpO+W+O5>sjD^bIO$H<K|c4NEF$MC0d!3u6(X_RQksA)7S(Ol?O9O4jn
zPn|Ff^;Sh)bM(K33mA;z1=t;{5|_0Gw8-w>uOFOIyHpBlk>>ji795ha9c6PAh0s6=
zTW{$k7(b-DQ1;o16WW-=wCB(>DOEu253*e`N+bOZGH)jK@-l&rX%RQc^zuJ>%Vy|F
z_0{A~yoA-`@hAVNvxLb?AoAh%XA|6#Rq3h#T+cL~UqW70E3NYYL8czD&9k_~77rSt
z3Nm@MMiN#{13z86H};aE-!0VFRUR^q`}qn6_X~GM0lw+<cn>#VnQAlu{of?@y4Dz?
zr^2(f^Q1AY^@6+T*|o?zUkOa>$XcD&#W+Ust1+_aLj$}_;kG&%sg;IE(>Ju(pEDll
zP^u><IHt<0%y8G6pHVCo8yCO%HGi6^c`;tL09<?~S*(4QkVY7r|G4k6F;;AF;%q3-
zn{1&R06%ammaS}c8Ua=8=#HIO-s#N&TK8PpQRmWDw-&}_^*-UO2{RwyHfBs6XFwW;
z_^nnAg)U$xSNCAnkq3E=8Md$80%CiL!xXrVF-cDCBlSF@Kp0>QUrbK?{5Dpt++%4S
z1}`E#yQUf6Qfe=Xu>N$`_xN#Ry(k(-=y8hy?m+<M{hU2FhHKXxoM#=i%iVdxs$s@r
z#@d}!g#g9-E{Ga3(B}P4*M(PYkG+l6pdI^hLdB#tpnC4lQkNtu+GgwQo|>@Yq4zE(
z6PHf70b>_B@#QT@4X<UIo*o_LLQvy)TE3XwDMVP>`u<M3^dt8DU^FF!hF`*@$yHcH
z)B+U%^3aP8(A%M^{9TSt%xv`XIy*-&tvTE3;Vj2>W?j_vw`MfGR>fx7&1#=ixqJRJ
zLq||<Jvyg`5_CWJS%MZlTK!nx4S_+&{W}Fg5ufA4joI=wzjjo2!*U6$<C)Yd|CDY7
z8J*gW3RM_$k6-~Tufd*Uiv~^vmu+JdTx*CDt_f~GYQlht=hY9VxK$XpmEb%ft^0Gk
z$K=<oxp_m;_q;z7Wlzn4bW=H}Xx>(dU=PNNrz_DLE1&(zA#Rqzyu1*+Mh;Kk=m42W
zLtD#WQT_eCS#x?qMl|ZCkAf*eQ^>~RYK=~ae*ES>AY*f+B9CMtR@rv1jmo^uFMYT)
zN=;hNyl=Qh51!mth@iAbs9F1DAzzz4abgUt2s4tJ*pl-n>A12ruP-yx{b4M29GAN-
z3tSO>1d&SG1@9IWt0|qt@9un+?(fSm;d@A<<^FTjY=wa0bXiSc@eMp5O?ME~kw{LQ
zBg&??1}x~zM!v40oF?j}FpCX>T6v%?m$9!bUa&^NMw~87Nb0!6A2*h>yR%p0`2dPa
zcaMt`oaOa5HP{`jU$$mVKt{HRoGt<vGcuiG)8<t09M{Jlm$HxgU>2;7adN)QK`uh7
zd>PuxEPyh+Cf5R`xbO(8_-t}5nA9O!B}(J|;oPFrW)&mIGobt}_s|oVEKs$as(Jft
zF~;NZ{uo!SFkH#Q#6v$IozN)yIcyR5()8vW?0R(_f9s4jN(!}tJb$QS9S1EVHHJ>U
z0<w1GLzLT5u!}(prCLiz)16xlh0O}*3iKi=3DSv=Pp5IVSGU68dT&y?i$00FMku#4
zbs=)kuE-eUbfH^NoUIE9Z(na;v_<S{2OTm2*d6zXCl%2Ra`)1=Ca4j(y8wQ}i4RZ8
z6p|g)B@3U>xgxs3%4Kds<EVvM=nfqK$lGik5WKW$kfICw0&n+~ZUtD)eFeCQ*Urn@
z?pU3_FlEVN&>q(Kow!UB){TgE2(pah1WGCMX=t|u90wBfL~ByJhEL~!aK{iXey=Gf
ziF$x*+YkbjB*&*Fjz;_AgX_3iD_!cANG_o{#$5vUdHU!^T#UZBVFQ)xL_6gjJjg&L
zv1JMR1b4-iP+3;VDIpDhX;(#1C^9chZ0b;1r?%4eleQ3mjsUaY8o+A7&UWfwgqGz;
zzeKZ{eM-wx<}~f63pjav?)Pdp+q24vp<Me;dF=(5X!*7itab4Oe;=IU-hUbf7(2gM
zDNzPwe_vN#2@M1GAufTxK04xc9V>uuGJ}|M^bAqO&Kq2Tdc4}bRE237#7+5`!hIT(
z*qWRrP8=YlsjiNBfp4L6U@^WsJl@drt5=w^r8w$K0`vr(EJjtTjpMop%}e1*PPO77
z1n#)wo*>pD_<@_mUR8*Xb!8o0WhwQ>uKv^z(g9X(-kBF5z{VFJC%mIaW;^xE_U_vC
zQ8u98CFO21g7fBOe53h%^rkU*qs{J&Dq({*UiICMUv3?^5|l)d=aBiZZ`oLrLcbe$
zwSDyVjYf9jEP^z0uMHf89`hKrdkg(uZ*$l+A1@#44v1D?I<U%xiT#OyE1bM8M{t|*
z9RzJ2l?%{9cW5~M)AXGQ4ztlz1}rP<t~=sWtVs&W*UbElY^oIRH%2Jbtsl2mlB0>~
zrP3RQ7aYih8QSf`0)r>^8Fn0jN{gfh+{ubuIZyC{rkM^#%7zG$ly%~^uE8uXy(BHq
zl2<Kb8dLbya0ST?64$N*f5~SvL~4MSD8LL)P3||VZxK;79<DKi+IS|l`7RBVBcZ~X
z6i_8zoNL<gJ=*{GHjDLr+^_uO=6Q^Qd1}BHF;{jf$!ElxE|#avBcG`SjHe1*NMU)1
z)*9`J1!q)NZe)0X0~35PpAgpeVm<*gdS&Z6uZfD;`&>wB&f}G!-;OS_#!g+9WWLch
zP{Tpgx~c*CqY(F)m&N!-7ef|&)(DrF;Rk0R9O*_dn748s^9AADYQwAO5yRVmWAVq_
zyI<y0jMH3|=7G9ucMWENJUYh3{rKjeFD(HoBQb*PCWfhgE>w7!4R3nsQC8)hIsVD$
zO|t6+2Dm<7+c`Q{2Pwi{yKYP2%C~pY*dWt-ir;&gAR>x~AQNt7s9phlkiVG{%oK|D
z=_-4G-#L=LOGF9Zdbo|t&i&&1Uf}$LKezHh-?-k*-(*P1Q~=aFR7X)6fPA2j1Rz)r
z3`Ezn#sMAX^_#ab%&zO~(FEVU0$wNF@IK&$d~Dte6JKHpcUMGSuZF%2?^Neo7$$zc
zuOR)qMn|9}ri^XYLV8+zHXf$nmUa8=Qpts6x`S>{AReuUNgUD}P`3PS+r;LNwbd#`
zO)a_<uY8%7zv*EIm(x4av(CBNt6+pbEWc0FL4cHF_Gmw!Oe7`x-zJi@n}9Z*4@IQT
zH=<ViO&8fZTP6Cn-*ynP-Kb4bwDD|wq6-@ZZJR?_suZ7(+0A~V43RGzd+H)N6RY<X
zdls5PYku)fwVx{LbcJq5oBR$$0kyX)6JVVsq@{}HQy58AI@GkgEVSrRI=1vU(&X>e
zzI2Ffny@XcwO1jd=^=6?{3h-uz7MC=SM@!<;QPJTH=$-Y%+|$oDe=9!_4G;LA1PD#
z3tD5tVo>d@S?r4aKYSdJ%R0NN(Au<_n`-sJ<&(+&i|cR7C7DY=Y7{YTdz`bn=j9Aw
z)JK9NS}w!ZSNuvtXWh#&0$_u`wg~Z+hX%Zg?@E=T%XhU0j!6dPoOOdQbTm$|ZIy*W
z=*)VFnhzFhgABxqOM-(BFS8`TrAaR*GvvgfpAnt^OlyOf8q`3n^RNSuzGXtuGc5-&
z#J%?x?UxgjR>mgj3D4g>d~Qq&KMccDUP~w(d!}D;b#SRbFPH;X+3~%O>{qikC&hV?
zta?CJQZ$)GJZ$0XFUy!I25Y+f`iX<ix2@rut^N}>=*zT4vZ^rQW-L8B)shF@aa)?-
zqG!>#j1mfAuibkW98Qu^XKnp)i>K*zjsyOk9Bx6Yje<bgafX}erf=EDDUtn1%df@+
zrS1P|9c+PKhU<Mg*<u1eXWZ>sesX7P-zY!^Pdk@)@tG_)nb-nn!BS(ZV8z;Ne2^1G
zVUxx94{6v`Q&WZsXC72cT~q$kVM@BwfTob7j;*IBUXaZ6%NUjWqdk1sQKj$piSgB<
ziPtJbWy0fP2}Vs6*_*EEdt(TG4;-J-<_CjO6UYCc=?She^H3b16iU`ew%D|ur9|AZ
za*}biL1ET#!TaSBj1HPg<g|0F`Z(amWVDKh3$#>Z*o_-{oZo#p>+Y;9Gx{s}i@0<#
z+n-=lgx`<%Zxj|lq#@3UO;U}icPMIUOrM#Cq4+%%ZzD#5Xf?Dgg(l>Fl6p9v^0#=9
z9u#+Vq7Y-2o(oa`tBg}Pax=cr8n^SI=4!v;r0u86S^Js5Xg>CMCMr`dl=T47XrWon
z@V-(Vb?wBu^ruUA6v9=DTj~PR3R(g}lb<qJ=}c+Vq{lAnO>$8a62JYocv;F?N9rSj
z7p>m`P2V?|jX`y=(>lBzH1srdxSH!nqe4m@)Rxt|IkARm&RAX7rwoy@vAiN@ju8|C
zoawdT_*lL(&-bi)RcNgkirn6a;?szg8t$y!q0u1JxejfdlmoOZvlzy`uYpCqH4cj)
zms1?b>;0T;K<Ob#LD|H~Bsc*>aLhHdt1D**UGbm9K|2{}jf-jSj^2#tpWIRcKU4Rp
zczP4nB#2nVq}KBUTo58XXlUVPBy@_oy>0U>Zwtm0s<cr}(|!NMb~=X<gt!`W3+Mm6
zUBaUMSSD9!+RB)zx!am7U~5Np2L;MZs~vcM>>DCjz(pKoz<`g)BBbElPM3P&*@;|K
zb%YWf_hyoVbP*+AJUHC-<Mr^Q42}3u-}5Q7&j*6H_FGnyH`N=S9AJ3#z`tU&H+t65
zU;{TNC@e(Fr*S5r9smJh|6uC#5w;=m0b!QprLjua-JnElo)zxeK`jJf!7CxS-77Gh
z-E|^tR#%G-&fNdP3Dsl>P|b=ubN{NH%f(xsg*V*vC878W&eFFOYIio~2-^-C;d4gz
z<J<32q^+Aq?CROZU85d5>T5!x530A`hJqLB0A;G<*46`h-Fln8FY&n$U%BGeAk}7?
zmBn4JbRW97yguN!AIAX#Yq>u=K1N+%K4vt~g8^&do_W>Z)ihj~S=v2A5ev+x{6f7I
zwT-8XQ=B2h)xgj!X^1F-t;^U*rq+lvVC()1>`L1465}VXwz6{pX>2wRKfHnOvdSK*
z*a$VAoJW~$NvBH$K7E85J1t0{AE!9EtZyUv2^LnameWJR0q=|P8{1-SIE9UB7l&kK
z^B1Ez_T?E!PcR-YKDO_varJ=j{Tw84`HAiN$zSbK3oU+(4A?lB8`T!(<`+bd_CN@v
zr19?A(QHrWePXLN4eY~SS=69MWQ_wvI9P`Lhy(1{qwI0yJL~#%cLSK#k#-0=(6W61
z7bIS9lBBoMKcu92Z!^k%^NC56&D?hyq>`{r5-FZyJA1m^M)B|eXYcF3qdJnaf8W1i
zjB}2KgXE93cN4O^HWpwL8-tPXCLtVqkOojJY4pxW7{cLyf1jtmy1H-Q(MaIk<eYfV
zSv2?d?XIq_uBxuD-qxHH=g*>cI^8;<1*3OK`z8firXVEQo=+pVlH(1QLQY49evPn<
zPMw;Y-E(6Ji7%TdF`?TCu*IdolJ~Lu@+LTb*&k`=>&D7^oD&=ju;X?8_sPiW;{UPj
z437RK0Av~>rIo>Aqa|SP>@UgZ3xqe8)rh#vBv!k_QwZ|PzF|ce?>m?T-G{7MRYVxJ
zk#GhYNqUqQ_B(7g+>U&9sQC!Eluhn`$G(#b$&oHbZ`L65Oc(-plyGHPc(Zrtj`D@z
zn;V|#gAHU{Q`XkN@}_prtBI9A7YW0QfGxAgJCCVhL96e)0Son{3neO(QGy9bs@aL%
z62@hLW|g+CcdYa!<74cA!(Yp|`}-fi+=y4mT6n1jD`YC|AW7)>*~TY-xLS==5F?+(
zy6QPGx=OTUHx54(zAp_lwNd{(Ro;(HD8Cae=(Q`zR%B@l-=1NB;=CI=!Ymb$I4jUd
zwpH_@TKJ*t*vZC*%ab-ajmZ|OVJH-iz#s$}es+4cP%$KT!*x?zyc=USVD9#$%m{Px
z%<mG&zlyotVqiI(w}>B?8|T*0LJ&h<2E>lK%cM?R>shI+*h+C>!AHhHpUj}cLc2x4
zkd{_QYR4~5L+A)phLp@R2zqhN3S=@@Z=+$j7~gRBhGJ4A+iPzURP)7_jx!U3X#sd8
z-`NLfNL>rUY}uNRtD_lbYe+}h3>1AkP=M0_Tl0NpKY(11mzq{#y03H_dV6|*NsFe}
zcvqFbJF=w%Yy6@ddO{BmrC)Ce<#ODWT!^?KR8~mEwnP&`Wzb6`MQwmcML=Ylg=8SZ
zKdc8Y(Q-tzj*JKa^W07=JSEFdH3ovX(oiFxTY{F(U9uT8V{1hha;#A3wtbm)%PP4Q
zusj(z2TG!ap)0fvP9c6Md@jk8-ztCF+TkXGhT&7~49^p|nycd^D+2{9Rfe9{hSm;n
zCfObB@iotv8%e4EUD@*bWcd~ry&hm&I?5}UB8z6yM)iM?kcX;3;A*6@*s);G1rx)Y
zI616yA)~!gg7>{g{%SH@qOIVRK^)yyuoa{b#$FR;w9(7sEvufg+)#*2{I0-30kg?$
z=r5CSYVG?vEF=0?*hZ2Fa;j0n(>>NH+Mwn?2LeGh{%1nHm|^|7#SqES{5dM9=pGLt
z*cu}FZAHO-NO0x2WOp**IuXT=JT1$W@Hp0w-`}!}D|#sT!N{Q7Bbi%5^6@Y-<>RbP
zLK^FC6<E6X=ffoYMYNE`k=*^Y`|=h!IWx8=`d4N_S6y}nfWjmc!i1b4{yyxnlA}>g
zJ(dgpACL3)bNip4@@lr^#PKMB*RI{Q&cZ4N)2{K3JkPcXi_$)0X1(2o+>7>HYj<h|
zzPcG9iQaER9a%o-%|r#9b8zfSX2-0RH|@yq{r-^t{Dz0@%MK5U2_?HE7|PwvEITDv
zIZaV(j;2i>w$38ADX;aCi3>~ED<j5S<TRBuwVa^~6i0Zi*ii;!Dsqx&+iDhw?PiQ9
zM%;aQk+KwNd8qG~g-I_~Gm$jcA||k2MZ~zVLTgo6rH$P7z1;YK`R0pzK$WD_8m*Ll
zK^$+G*ncU~UNTs85oY_CexT5(2FB(+=zET19B_p5I-+@O(KGbU^ZBn2^a`)*G(9cL
zg^zEp;<hmu-!?phwJzL2RwumXi><vmihPmZ%I|IbS|S8R9W`4FjD0ZsFUd2okrK4!
z00q|0AN)^fPyghsQ?jhEIOZPntP`Y_F(0I<_8es1M#oV_u}|AOv*`laDQRKC(=1f(
zmPpSmHQiOf4#j^xJNr_G+D23#Z9QO=H;_mDggBCe)D-&z^Al|sNlJ^!)3alV$<pnX
zAq1L%hSLL@5@~s41(rMoHAN5AY?LQc)5dpnCa9vF`jy@k$}Ln1dOAHjg#Q2|h`sV`
zv4Fu&ixTy^Rxozw+uG2~d>AF13I$YHWDuFq>)s3<&G;zT(i>89V{{&fA#4IM+L`I;
zZwr=F7~q*ygIpR*!-&qc&5}zanaGXDWf_)f!HJPOstu`!#kvu0SL@_Ucdj)=fV@ao
znbOi2FBrk7nwhMP%tZb!5eQ*4TN!1JRu|0IAI6y1v%zUb<ITB?({$=n4tY{kFX~Sb
zAJi!yGD|$wnw7G*S=I0Ln_->@JU|x|EI>p(4@SkK#G>s@wcH;(dwz<e9K2t)LDk@h
zE%5>J^cHY+gKb*;J~}*tw{{MjD~TVs&Iw!O?goA)b8M%DcB77B==x-BFn?)D&dKa_
z?<)NZ${f)h86q9va@->mUtoBcwkae2^NQI*v8nW^3`;0H8S;`ngTH{+LvcKP6&*$>
zPLQyC`kz<C)q&yA^O26`XpkekxLIs+6@;*;{ix+LHV)_eI5uB}If;ywc3C8&!JVMM
znV-jcC8iBo(lh|{jW~5m(7k1b^FTO=iFgJr1OOZLVqTkUMC;npXV#!oxXB?|qmjt8
z51jdapb(LwzbI|W!|U`Ut(DWkF3|R^_Z<6~Og3J~W|JA=mI;XAn1G4C<X1N>qG&41
z-T7^m8mPFHL;|wH<*dNdR9)u_oyOY0HTVQ2<Z$`t;uN)8NQio>6IsDggnH&@$Teg~
zzLO4)Axp5aoU=xUA!KWoEhc@~A32Wt<yif{A_V0h(1z07Knx05DD1<$l|TT<BMn*;
zh?=$gEQ;0K(ubk?(F<U@Y**n?b<38B3z^g&PzQAb!5DT7mVybl##)@xv9m=c>!yc3
z##RZELYn9<I~?n6QJN(^^AS3~R)%~`>32^wlr4z<1@w)wmkgflIO23L=wB(^#X2sk
z<pgRE>iNMww47t}<6ro4emO>s65$PV5E6#rETRNp0Zuwp$R~TQIqlEkFF4i7wbKXx
zVrf924V9u#mrYOfPai@>20Vg4VaYhhMAs;acr1=xi+3<M;jXp8n-1wUCM-`;(eo9&
zOs5A+)-VL$r-yg8_Y2q;gC0GWgL{QjWo4zNE8~d3PpmoFI7&fb%fPNRgN@x2e~D@Q
zM{S&(o~3rn28ht1h5!YZYqP3%$*dI8m=;_w9cW1z5RX?$gpaWiv5|y+2D6CJ9eJI$
z5>b-26Mupn|1L9rGnwI3B@5J__S&<}TdA6BnkoJ)#N=Wv7dZ^`+GO$pd1%h;B$`M_
zsuPocg+no+UiY=fcW4+;TeKA0*zXij{~qXaz7Vx#&gwBpc{B|~7Umc=)=;SlngQbD
z=;sqU#^!i<NA?fSkjfSg{@YjtHnzB}(3{sW^?3t6>|O2<ZeM{9_W@%I>VDJ7xw6A3
z3%E5TN`)*yb-BaC)LEiXsTd&>64vGQtv%)fq1EuD=^+V_dmk!u?K8C_?#xcZn&Ix`
zQ?X)%J}iiVOto`~hJz$nGz<(gRH>xSRHCI4k&_!c+W`o-0Pbkeh#Z-z3(Yu#fkdCe
zVk6jwO%VzBnV)dhJ}Y$QB1*jJsC59n7_&c|J;in42tDDslqfAboa>4fXb(gQjbMz_
zp_Y7-AUDsoHL_7gjxJF=N8@)e^E?v=_GK`707#y!GlJ|4G>DjE0Kx(E1INH_g3?2*
zHYcC_3mW}pvdMopH`694iw5aO?@O<rM+Y8R#hs;O@LC<*T8dn(GQp(Np5`umPbo%%
zHRR7$z_O9GS#o3iNe{CXlpNUFFfc>=NdtjRDt~(I%fK%LSn=o9O-q}^a)9UiXK?qW
zb=GAT={7_8HL+%3xv2)K#s?yZ#S4lOieItrv4C{TFSpK)m(LHLo|<hdnRy&aXMZo3
zHVXsV`KYM9wZbS3jfZOPj+daQ17p)%H9o-3;HK}{uO?LEI(FIrJ41(N5ZSi4r{>H)
z=)3X^>Tot88xF@|gbLZSW>CCqhSNFXxP0G|h;(X<?tNed<Riw>SXUi#0&16|!TStS
zsb9Hm14LK9SUGngI5m<Q=2o3pY{R|wWp<6K3h1s@1>{`yK7h_gr6^8}fFl80IuOYG
z>obJwq9!6F2^x~TjX6u|+|wC&F$?aws@=vQ8T~3w5&Dms07N>_2}G7fh_gx}1VUm!
znuWJ~@98SyFDu;y;5r@z;tyv$d;8+a^%Q~^%y{n?aO!Vnhp;8mxpm8<+5^eWat16l
zVh78nP;N)qA7kSHK^^F%FyHcPVn%7mSE(4rZ6_C85P0n_%xtKgVzUXLdr-y8KGw~4
zY^<R;L=cyxRn&zXBr1OLNg)RqWk@DkJTvv2GUJpgnlg;WD9kYHzw}&SA9zVBdznjd
zEAbDlx@lAjYG-X@ppOh>OK#nlJUw|%)eAzGlg`t14QcigRr`xGsGUPYWz`T<KNRjc
zZ}AJGFcqkC)F9h&Z3Zdi9Q5&BN@;LfOR!d)qbBbLJRzB4YaR6QTk~y(ho*4dhH0CI
zd)c&_-dtDmY1@mswSnf{qEPiPj&Q)V4(}?pB={9o1YOBhVqqv4B-JW`o)~Y<0!|hO
zFKC`oErEBl_Tv6jbQl$tI@^G*V8_8sqb3?ma$0S}vCN_)s*Mh#C#`P~8v{270d(ss
zgcfXe`&+{}7!&s}_)2g=wxuaZ<@#z|CSef>?M(8KUcYkPOuMI*6*AypdF#&oPd@+r
zpVPddpN<Y4;iq3@5q;|zCFI}&+eN2akid6QC3<%1szJ2_tEO6^4>Hn}U7T}<esrI+
zyAkB>%M~CN83JhH2c*q+bTYwbF+Mxy5XToa*J1t24CiY->e1^l268p8wemS^$a<xq
zVN2XnS|JRYesu!h9ra_N#UzoiqlqT&^{U72jhxg5zTW7-cTJE}Gz2BNI?NMu(A(s8
z=U|~5gOS>xdXk87x4I)i^FSr=n_N<qz-ied`9ha0p7sz}yC^j`5|Rf25>;=e&JE4<
zo$EN*2*wV*gTsE%%994$ktR4>d2oTPmoJX+8(rIXb=gFojt^7w+M;gloX$@~$aB$X
zTyVk9Gkww!QlGBH?D7^T@#aaC0&J-%1*xo$hoM2KfTh)JOd4F|J$-q?ti8;_&yVp%
z;P8nDY3F61K7qL=<6q~Md1wh#4IXcdv_NfVB3YeU_SQX>jiJ(`?jic;8Kb`Q$|DK|
zUY`h0L90vE#d_8(OnTYI`G|>5*p4B^ZV(;*LQ3DRgum)%1@z985HDpHTMg!sD27g7
zTJnFLBKZR}M%prZD{)+dnN_feaZg7bo14X}r*S>k-Z)BV82kHNUM7-eWbj!f-}oSK
z@Eh#YM+J+lxjgU-24}Cd8$uOt9tYO+k9MZZSI2uM)NqP}eZpc})}OcTjL<FMpFDvl
zhP6ok?BH)CF@n8fT8OtipmV$(4;e944j(LWC73I%ASWB<Jh|k1((u>55~83f>@X14
zgI#m$h1v}3E!*e@2TKXLJo;X{@U8WJ^Bm!#^?aIc{KOpJ|4obqf9n&A(t!#ykei<c
zI|hSVA%l~oMsv`&hS^mojzs?=)O4wvp<xNi!ylYbFTP$>WGBwUqE-45#n@0F&7kBt
z`sqn&<@S*<w^%|yb^>sK9^ys*W(VOeyyTRCmJjmNEyMxrOV(jYV!9MMk}&*Rof~bY
zwbJ42cYgfUe15tO_3ZfUq{ON!TbB@Vjk2r_$>!Y|D2KP_3zYQHqybOWuSx=xh*}}K
zDr??B($D+D`dLMpiED8Qsc#V~n^m6G5wbq6VV2xp3156Kef5R@APFn3F&QFFeUpNB
z%|<f>+&jL5xRsV=*Ul38%6d<@Xg@;G^y;8jxF|lvwmh94KRG+J8|uKXk$A4xh484r
z|2V@z*s5jfX<C6OuO1tn5j%`qg^$MNW_YzhSn@ajak5ZTglWWzoVd5P5mE!i!4~SZ
zt`a%iEx%USobSO7XmC7O%zS`&J_snL^nmL*8fd;8uFTazisdX1HwgIS*{d3`w8+*k
zP?(~A07hvaZ5$H3QlpB!(WB_N$z?#ea`#w+TfKOUz(|s_1h<Atdwp_aZ*O*T3Qr4S
zUgL3RCOXz@i9v=tbx9e(3`e`gm^VWlEE6rq`%KiXQYu9vI0YeI%twG~#nf1=Q0mw*
z_=S6hkcJ5=elgoPqH5`{jsH_S1~*F(c(TI~0R5Cl4)!G1UnT<MZI}s+wBf7L1G@hk
zVi5hR7aXGKn<ivqvPttZv$<1ohFL_m^HC+LPPlxKHCv<&%AXq1Tvit&CqRhSy!aqK
z$1OiL$SuP{LMaJ)?m*)wr{U`6XA{uS>)ek%R2d9HPYcBf#$M27!C3rfGAwuD8`^gW
zWCj{HV2Xdc`J7ZR{5UPTLLlWE9x|(yoHA`O%`o<nq`nSV=3wTM^LF$-tJCx<4rx-M
zz84f%%SjOAkPl^N2y1Bg%{NKEb1bG~Si*mJ_`KP0jHYV@>!k0u!=Ltk!|mZQ5uAZb
zNL+7&rkXs8P$3*5Q4}E4TJ(qWp|nG(neM&}hQo77?pY?iE^jIyibbO8xFL#qV<-o$
zH?>YT-{+h6bzz1&GY(jW=QBr__YK?F4I^n9#%5bPxaA#J7yfuK{Ynzz@1H$EJ%Q)n
z%;&$P6QOqB?D9NPGqC}~K$;@9`x2JFYMZ7dayBuf9Byu4MHZnk1!WMbLwd+$g?uFQ
zQeX1_rStQ1<Jh#5GMF~AVz<tZ<5z?2oW9`%d)rdjc0EO`sN~Hw^8>M0`zvEP;TRtO
zH6sSm@*M<o=UNZ*g#~pdO#H?>k$C5S=k7x`csH3}Mo9>3-J2aI23PM|T)l0p$c3s`
zSnZT<Igs=)L<S90&YF!5eoAt=J6--VK{cNpSY2TnUqDna6Axh>$Gl-D5uF$SrOB2@
zOe(fYp0xh%hf~Rhp%pn#@(2*vwT|@^z2}xG+X#w*VA4t!(Cns%oKtYbM%N3}Eg>0r
zFJ*l3g`MRRSCaA%3089ps2%)zS%QYgePNecM%Vf~?=M}j#mSzn6#@ch3xHn0(QhpE
zc9xfX1gc2EUj<l?qedW@p^l+;&uP?-LxIoK;(XEoigkxxCIifO=H*>*@qQj7x?@I{
zOLh=Ul}Aj+|JR*+-(y{v4RrAIRYSgk-wCfBFBZXu&s|N~{7R<<n30vMCNx~P>NO~e
zlM;?;)L1+<#@U(FlK_+q5tUhp1wBRaGTM>hlR|tj|C*tq8#4f4fj1+(-sbTk9dHO<
zN?l>gXk=rQJbN}fmXry^-0wE=C+JMwd;;=^srnorQ{^tT?dVgY-5L202xGybsEj8+
z(9qr|tbHTa8S~^!ZcKju)9Fhb{Qgo>t|!mWo-o}Bk**jW7rUZ^=~Jd>8YxO*Cs+d5
zj`d@}UB<tpnu~WN0WY;#z#61IT{Brf2?rBU0;gLNcCTG9N*az>X5a?zW&IPcwExTG
z#T;`EEhRU`UAxQY+0=f7xSy9>(>*!MZ%AbVr5~P>)4CcD>*z1{7UILJ;V%54IxLD1
zlRmh>F)7k(mlrE2d|fF<1g26IhydB_8y}2DRiqE{4l-_|8)JH?3g!26ON5{CwsIXm
zWemL6AjXr6&Yw{8A?t=^$jze707i=ixg4lP9uwn&TBS7btwd{HbS^;!ZM>R=9QZ`P
z=7CQ;L8T>fWA%xWM__9{1Ls=e#8-C}$O~8f8hCbuuLPT6(<5UI>0Ne(cWb0JhL5fT
zFleXHwX6D%BzXH8I3a6rX@%6sA?=~+fA3}6lC(&WH?+KA<?qVI&$SQ?_La4m<!~(}
zy2^}6!Paq1MX9=hq;;uPt&0mGqXAmBRQ7r6dSw}dG)4{AF}KJdG?M`Kg?8Rok+z#8
zv8y!&HLuH`6_06zHayQzLr0GLN=x~G%NWTrY*^5<l9~@Y8~Y0gp<OY|v?-2GXee53
zv2(TSF@1{dmS>aRgkK<oW$L3rUpO5pBY*4T0<RUeB=E{#R+M7d4b8LGU#AoZf0zYg
zc~@1`l{SKFdjqz~VQ89vL)UK$9o7>OUzLrma`Zm+z_bR=l#IpE%T2}kgj&%b&A#*F
zwBm}|ZRCJIn`J)5-JZWxanAT9))Y;KP;%GQ-&(xmv``$!85+d$$VC*Z+s14r17KH3
z15?3TOCVDxQE}mT@*MV;h-M@vWmm3apjd65Fi<hB8GcIqhm2CAAuTTF&ldczEB99z
zlH$`i;n|s77O%omx9hG-QTD46g1e7{gI&zSKgggM_`Fx}ciWxAPugu;8C0nzBA09T
z<yX@~+6!E6bzCRT$kY|22GRTJ(`>FBkg`Ol)<JQ*3@%;%Iz35jk5oO@f3-%U*La!$
zDHxO3Ors(JSmu+ip&-@dsm6vy_R!+hhOgbV$p?`7h7M>%j|$CI0;bxcQph$@>f=JH
ziQWY0Lj76Us#UM5@4V}|To5E>hkS#x^>wWT$<WorfoylL#d%~81o(MCE{L4pnJ(PR
zTh;oD-Jy32m<hYO-+J3IqsNbP$omFr2tkG_A%Lig?e;%LVF=^N<uryYy%qa{f<PKc
zIk({<AIJS(%xOR}{_*-1`8ck!&9ycu8)q<^-Isq>(0Nf~slJNZ7b9C+Dk%i#Dm#wD
ziur_ptd#j<vTU{d+Hr*aTzSYEqKxfS@!K^;=xP9No4+~B&9Tu7T2!YFTa%P;*qR}P
zegmVW&vBJUvA0wwLhiL{8(vs%(iQ0nSUp*$1N*v;f_LF2SnVVb%(ZsrgfZg9OwI+}
z-AN9$h&PNLs4F&C2PcH~+(Mc?N;<$;Bxei$p_U$@Zi*+9F|}>V1i)_M!YayK(p`^x
zc8pfZnoDa}1?1&;^oGq-CC@;V@?NwDRkswW^*|;pZ4$-UiJ)RQFj`w@sHX?0orXL)
z6dA+ORs7j}VyqBG#s9prumXAic||7vq1Z`D@zQ#_(!BWg#zXbLxG~erkM47^B)s^^
zyYZlPOV0npI|^=PZ#>7F6N?pIoruB-y-9V{hHhPU5^r@yBBVMX_E1R%^^jgq4iF?G
z6o@~l4y2yqwC(h-$CE-#!aB+UPl?8uzVT|=Wh%kDNe~0@De$^rvs_;QJ^-Du!#&Wm
z&uQ4L;|aclqqIqu2-evl>hi%W3hE2%=Pp&)b#giX%e0r*j%A#a6KKL${1rhuL*zsn
zoCBXN5%{8YAZgW;fowbb!FMg0b5V)YpNoy`R4^`bd{(vS;e<y@tgb)a<%GHy)66ox
zS&DPr<G!06{}md>?F;>>>Bj@6xC{ED2W2un!c{r#jaAIm<vkrN>V>0%)q+!Mo@}#T
zl14Wn+)_(I9nOxQp?(sgL?yZS<pd&~x318;ayW<eLsG4eVbNZSuLUj~DLf0#EKB&I
zm3p+gOULXNl^^l-Vs<otVR!M&5AnTJ;e^NLh}MM#-W%1z#baIFhp^yT4sT1URNkws
zyNRMWFy=9hNJrSG1R$YVC-gEQylH;CHNoCQ$*8BZQ`7{M0(2}T!vSy~kkpg%B6RiL
z1E`N<eJy6tJ^7JzNY53WPF6NF!GcOSzraX{y98Tk^+HbTu3TLO6Cl1}*r6{GZs$VO
z6{~{*<(5dmQkq!Iy*;ip;f69`T_w_#@;O|++`asb{zT+icVG@jPv%nYO8u0u{abfn
z8&5TH3n+WCnEwI~9jZ~Hj_M36EsjKv;N^Fky!r~5e$`XfjXya-X^!ysDN)+^U#dVr
zod|I;9vqQKc&CU^W)UOZ!0l0%ES*;?Qn62Rn@5jby-9pkU%0eV-YsqdO90uy)~YKG
z=}6iVRaAE8-_B+yX!EFM=*!325SCXK6x!H;+W167>ITexEQtP>$rJtK3zWyf-7}xS
zodX5;=4`oVn?ssO)u-r7tK{&)mDc#I5XCKSUJf3V9JXlbkG6wT);jS%^_1tWLWNNM
zU3+C=v_CTvX-E9&aovkv>T>nX=0ChfL)6(jMLy{6{N`-$0J+UcE{kAnN{H~8d`icf
z)P*N}S8-(yf7nRyz*nFuu+0idg&)9J`@`73X{>ga5TEFO$wOGsz*lY0Ru@R6TO$5%
zly{0b95DoSC+|t~gC!1c=BBK#AW#?@Ob^GV<BYR1-ATV%F{c8Ai4y(7a8OrxODEMJ
zVrUmw!X>NnlMru=(xGG3sb2sbh%YzUk*Ao<DZ86u1MWz0XX40oJDEVka8wsE9Xc(5
zY5y)yf~%lNEZCP;4av>N$E$Sj&Z1R}MD;Knk^Iub*NSyRNszpOP2D+h8~wUyafNVJ
zw#VKwVY=oA8fK)BjVKpmc!CWISMee8ekxMjL*`kE2T>bXDhrr}j56Hos(B?6o5(;k
z{ATL~|LOE_u+uKGXpa<8y*ot$^QPzZ+9<MDG;sB2MUybyS(|hXgCewA#rp8y2IA{%
zJasHlUpiyF9#*fP$hDq><c~t>gWQfA`}+?h5I-tvsI=gjQS>Jk6H;5x^zaUX0Muz}
z>`dFfh6Z?m3TLUDTlJo9LG<Rmh$A6QscLJ8fb^i5m`+$`e(R_>YKV7Gk>k5H+0fgg
z1c<5#un&Cv?Fbyd4(|LwtC1DM?`x+dh$+v~Arsa)UiY~o=Iq{sJ73@V{-?XQc5mFh
zvGZ+^hB`vi&ors@lnUG4=~B^8KTygND&FeBVp<Q7li20=t$JBmM!}}>ai_6v1axAo
zCAnTY2WNbM3o}{U`cG+{NP2(Cj;31Us{9<Nui*4U+ULE?#GwnFB14vHwm8pR(cL=r
zv^+4%woVzMnH@4)(@kLaQR?x4&ftEmfs(~agc!Z(R!~Cqsn-BzlS7HZSIdiqA_VQV
zl?Mt<LV+8?k8O`YthAyydcgam=?~a7t--ihqFpfo#pDI@oRxvCvd0Z7K20hKt;p6p
zG)}(6F7B@8I=K>VHp7A#s*cd(XkJg1t&uC}zwys))e5n!yL5^!UA*#jOgu<kQ`caM
z@JlJHEH=AsBw`*y=To>6{0`T_vXzx-)jfn6yRBMI2O>4Cz_9U$Tmumm2gl(0O{P2$
zZbvJx-iQTZA+BmK=&ilhg~QKsiC@cgzTUS}piWsoYI+}j+%%Bj%d{j7yio4_jP3x7
zMYKEEa1E=80Jq#Iu~N>`U}_j#lvK%|&h@{*MKzJHaJ^gEn$0Af@8hDG6sPO4kOEe-
zfG~!@#xZ+n1&nU-&R$b)Ey$oM#ucT)63@RcSF^iRpybZxP+xDuLHe#!6Uh&!$qDy#
zF`NB2Vi@FDWAmf&l~->=AQGiO5mK!1dppm1!{GN2IWyea{EJKC=P%_TF*`f@ujNOl
zFMsBR(922nR7d-n!W1{<<v|eXJU>h}94*KGiiRB|F(Y|EfM86il#!s@d$A9b4@^s7
zy$GIyb&r>bo}9pTkou`&!M7%;ZY<@7VYy+~Vza8?K#Vu~o8pM|>c6!G%N@@S_uYgR
zb>ev%D`>9g&cmAD{vFk#Z6bhm^V2_m@=rqAA69bYl)4+H0mOBW3bqh-w)0>50q2bQ
zpz?c0>)^DfD^NGGD-sl->TtK3AcUa7jFe`aJ~2KILc9_4Xqzle$r{C9VFJWWrhk%$
z+XCfZz-)|-ffSYhU1uKTa(3tV)Cup}1a|=k#ad#-H@5x&;>LrUx9>f0m9P{qvz?;g
zS^DM10I;rnoFl^@r~(C~eHH~XpvlJ7ie{h|@JfEUv>1r$sI+Y#jWvKL$*>~ZQd_U^
z`_$Utbs%4^OUj^&ikP*-alZ>)M~{^8lKH|)m*;DbIz#Bi#$HW14c;2w#)rnphML;J
z#zDnbB>^AmXw%pam<u{1N?J`&48P?nmpO&TV522qC%A^B(<44-H~cS!P(Dt*3UafD
zig=Xu8@0g>M{m7jjgXliKh(I7?_g}WjhlLqSpOBQ48MFYm-hsL9`;`wMkJd=zi7yI
z<hxJ+Clg+f;ELhn>P{pe#*mcyuUf26){4s!Xn@v{H#UBF76tq5Ikk=bf{qWCb-I`z
z9?llu!`1NSI;!lqdtb2p0G9?Fpe#*M8`4w_xm|YRc|tc~=ifPd_6!c6C~jj)f{T)h
zCnSx)&&1)nmhr%Sdwuo}j-oy*Wm847zi4l3j@H3^$}Vwz+7aw~NqPNiRv*5PyPjs(
zP>K2_D)!u;El|2ge&IQWI(?O%qP1Bsbbhgk2%_&Z?^1NfQ0P<2a~^3`qX7V;jR{v3
z%BQeg7$5tcRUTO<h`%DQIQ^LR*j*UC&KXoL_{Y}pKYgjnT_BFx3USpi$u5sZL&Q~$
z2gvC{Rt?6BvI=<^gb0J{;0wZ}1AufefXk=qRB3pWLLEUlX%)NU$>I}xZEvPU^gfcN
z13ehU9S%@L0=loLlKZ$J3~4fwa!On93*4nvC;C!xrQN2h^PQFhFAwz4{k|t}Li7F7
zZE8gQkq$+wD54Ulo+n}Srz??Or1YVUUg>}6rB`D(eMOimmc<8wYv&KHs*0Veo{*v2
zTc)l@%v#!#!9X|m_u;D*F<bY^Iv~ngzL4PKY7BaRZ}aQpeLD~Cmam)6XfUe+X0lm{
zYK`xyD*8D_m%)XlWN=Fzzxpdj5?PS_UC9(zn}7gyZtTkSEvx5q-UKQNAQduHw(En5
zVY@(`s0a3M3sUO@C`um6)yN*)c3kzy*cUI+9I4mlC+H4D$HOwwga_>jF2K9fUs!8R
zE`hO~9(z9x!-!>iPA9XY69i!3>@9I6a#M-+rBseBnut^O|DPS|Op1K7<-I_Gef0RM
z-zdYy{Fn(u?qmH%2fKN&<Oy}(yW<su*zPQBhC`Y)+CfoX*u;mW&dOJVoC<6<eS6;7
z<q`_>qcSdzCBqJ4m6$EkqAp%ORvnF+d;n`)e)yH}jscHHlmkLb)Nd;0Tl3a|>4X37
zBb^(@oABal3yD7B!atcIf+V(+(1LZ97?I2rp-3<?NZ1E1Hq;QRB|gASpnO__TFw(4
zclIGTP-sF#0t663W}YJOM?6V&fKN{h9HGSd_pEDl^9*4sylZrMQ>U1Tu$cZE{+|e6
zNm!3XFfJtGu6yzo5~a2IK6-ckRF+7rggl<v&LOxwfEAR=CMkkJ0vGI4{YC;zSAD_;
z)fW*wqWWw-7FsH~YVTYuL1LP;h#TzN4k@3<xXVsRQ>4>w5W<;s=33x5E^0A#esjT`
zND2Mx0s?KkbDF*gdcw{wp5fAHJ&Pr7TUNP;QzU+4-Ft6fGoGHr0V5NfSSV^drtuWj
zB*lKO7AGj2b_H>2H|KFhn(_SR^+Hb!^%}CfG?-<cbZCr;@OEw7GS8W=p{j$LIAG2`
zobJKAAouqaNVto>5c`Vl1g^%|r(ipS{qzL}PM?CcY7h2D;>qKv5G1a|2Up8`Mk&1u
z;$@UfIVLouhER9p=~fORfyK#fc!D0;<Q2oyk2-wRd0%ie!OTDeVIgq)u&DS5xl6=r
zq9_TX^Q41t<tnRNo-pvWEIj+e!Gf{?VgzE$q+Cy6Aig&3<I$ONl=BV`LmQdEmh8rL
z7$M(=q}S!DhOo7A5si5Wd$v#9gtgLg)Ug;PJlTp~K32LmU+Mf4HiNADn2EXfeeCbA
zSQ`2j(s~<;JXpiYQc&}b0=B<yC|4>7#u?c|#=GR}FR9lYA0W4e`7R()_~E1i&c3TE
zaQNWu(yrtEu$+OZLHQkunb3u8XmQ;WyK<*iRsM?0aBo<BunmVJ>~gX1O{E;+RgmvF
zgCr4<2qW(noG8PFYBmhtCSQfD^dCu93De*V9CR(wyP|Zea>+D)(c`3Fm>50qB~b^r
zSwt}v<=LBVY~W<hLaw##UvTk$lV(RvZFQQR2STy_&+Ed~Z3urGLM1kk{V`yjYDCw&
zyB3K1Rj1zzT4xZ}eTu85DQ~BFHwe?w+t8FgG~7eVqS^&3xC{h^4X9$5P1Ggb^j^Bv
z(7y(`es4KQS~t3N6=8!i7D_AV*Kla^;(_H-oR(CkC_Nd3m`0PD5yJ3r<*i(1l4q}T
ziD7h6HR{}0%?Lv5lge_WUo>-iu=AsFuLKlPP;qEJFp5@$?!Lr(OeuTAoiv*foIF(J
zZbsq0eXzuZ^(eoBo4;=&3_UAE9Jd?@lk&k}ZqUP{4;IMJ`+${zK6vrL<H#tA4ew_U
zK_qohTOzqs8r12OOWnlUU=xRhl2-Zh_!vnTsb}dMc@AeD-4z?X(Y`nfo2ZNnIB=~0
z_@$1BSaFLFf=ksoy6q1?PGyQoy~*~nrZsZ`ckEti(Zp1A0$J+iGM}PZ<?eV%l<m%q
z8YvDDqi?If(>`1Wma@)DDK_*CO((hd(Dq?>=rWe^$&ldZPne~GbaLaMDOu@acGst0
zZ>8BBV_VP<iPih$mrCMcDY*{W_Y~|}OKo942zx605qrr8C}`3p@vF8Zl7`0!s?aN<
zY^pN|>DHrljF;fO=XDf}>0i<{oDek5R~~<!ov?daE@4r1`msXmd!5^j!d9&7AvYW5
z^_LKjtgXdVua1~xk6&yBtxUiubPz#EOsY()t+PSBm^i}*fu$T~y*ZOB(CdxGv$G?Z
zfU4u5aKGpkNhK&m=t4Z8OiWC=CP2*vO3*Jm=(;v(>XhlU5$hHu;s_b3LvA&K6h-D5
z;$RjZTrHs=O5@;sg;vJE7?wH{lF)EST{y8VDN1*d9Q0bBT788m3#SeIOeJR9j+{@W
zfNYZoTNl2WxOG=F(IFuvozIa?WcC8Lk}Qim5^pWWy*ubOcniV#G9UHj+kt>il-96@
z=*=-SS{t0BC5cSkT;dhH3?*LsaiR{%Q2xMD*Cc@&=aJMNHJ2QYOQE`G0kPt~QwBI8
z%}{9>Lr6hy?40o<r_HK!;?((^vn&k^HjNl}<hZ9?ZAJMuh00f@*;wPpygoGLbER^r
zX9Jelx%}{Dd*`7dp}RX|u2x6vXtqGvvDa@PIEonIIypkhMwZbHK`qM|EOn57uUn3N
zDNNVp9n>p3#I@0}z$@&c5#wtwLnWkzqdPW)xW+<ZRvR?bVxk)vp)cO!K;C9d2fuSo
z5kkm~-+RBz7Q1EbmWKJ!jbr^n4%6G~!AJHqf(A|bFg<}vp@mbc_z3=PxTa7%-oMT3
zQM0LvB?~f~K^3(_c35#zp${4nbn{tVHp1Sk92+e1wmT~mc3RdmzQS4|N^hkm6U9!l
z9JoZ$)VB)i2O?3aWG!#c$hTObDYBEE?Yu&W(-BJY%54RK#?_P-2q*zo4YUb?iD|CA
zKMH?>uND!e^n+0=vg^`MPzV!G@O%GE^W=H%gIdU&5%iSHJkJXj-hX;HM~eLMvrTlw
zD{$-%mBjAv&zD|QtzGXfsi;jyS=fqi$7y9yxVS-c_aZ?a!KEf$>?LX=x}QwRiEYm}
z%F1D-{(&{*T!UX(-xaE@G%gq8{SC|h5oU+_wa20E*1H9kBD<ZVc|ixDt0mwLas(&~
zlp0&{ymp-vTO|~ZwO}ZG2%eQXDlz-%Ved{nemW3$_VwU-zk?(_!S;Em7!xH02c4~c
z0y<B?8Y&)YNNd^i&1D>?^%9(0X@v6~S*3)|lJuur45W+d4{}X`q<keJKmP(Y;k{C%
zn?e4#`cv>qF3c%smK(Jfo0?b<2C;eG*ZLQg95P*1j;Q;yg-t}lPk~X2RC|;KRf$LU
z@5GkN2(*Rm*xbYQiA1?tf7ZbIgYgDANAm0qj{F%mR|rh9@<^9om%R+uxqI*Cz3Y?P
zNCG?sH!)6#EAB4LRFTh#NQ8sa&FS$gr@1mo|4R~0j$g&HW1KHfmz$alx+&{C22w^$
ze2*PybyyM^`}LH}w#pOlwA9_@@ak5I&cS<BWr-){<cqFDICh3^M$RqH88S6hJ#Q=Y
zh5;D0Io+tVlPB@b>=0&jU-u3o!QD_c0ad$rartRJob1fca9gE~oY7H8IrrD4*z<aq
z(rzoqUrG9-6ZU<ea?j%y5`q;k5QN+!qun^(CX+nVSPW7^Wf3fLU<YN|_YfBfYY#Q$
z{K<Fygn;X6mQj|j>gq^neeP`A6LoBX5ILrIGx+ZUk~Qr~6_mU_mIyR!4Y$xB>i*sd
z^)p^OXl(-wxbzmUZb4aF%)Zfpwl%sLeiZ$&UQ&k=uTv7Qq?PF5w1_FM`AtFjetK?@
z%Io-UAcBLRtU$={BkM0oYLV0L<JdGxYTp5KyuoC-(HTmqwP?)7-bY)iY)~(U@rEG>
z#BQLhavFC&ZNPU3-bhLs6dvH;y(@7x3TVBjT`RLKe9N^}2gfxD<pA8Nx>L~Jx5h=b
z3NWgoLi;<h5Zgj$hD`%!bP|qjSBo;k#hqVr1$x#;ivzeeOS@hxgf%oQ)m=C)pw$Ga
zch*<5T0>K`1LhpJ&Y>LjxecZtL6P20U>iMn!+0tsAfBMkWy5`j*e%TG0g85{PcjUe
zUX3*IUkrj;xNnUgckEso(HQtWEDwf<Z)dN{l2MyA;<?TffVJ5ux&bg;ehdqn8ebf~
z=rLuQSiyf@msw~9eJPJOB(QWlm7NP#Ht&rHF_-T(G-#`5z0aJedi-t(r)`wN?}n>w
zO$PjKv}MijSUwOdI2;;QCMZ^m)BDIT<ALDMCMyla&`5{h_`XINJOnceHA6%%=4a2I
zqk!PDIS3*k7^|i$CgeW~GQ&(4r+1zXM=bX~s?->*&5w-3^(JapG<kN@`-pHqxpBzb
z==OdA9-uH72F?X}jyuo=*+ydTYi+~fBnGSORJ?i!+s@S(qf!ni9D!#IDO<raIz)me
zE$TQU8DO@eOhwk(z>Pw6eOzM|fMY#Jd)UJDWT@oD%9kL7vKK!%O?*5YX&3Isk^6z_
zM*AZwZ??Xd6Zd*rk`6Hn**ikf{5Z^|HEKfc2tD^x)Q7y%>3S4wS(iNMdI+@LcwS2K
z7(izIzUXEi<!w*}$MmC`K1X|4hdwvsbR2~GcKvyfrLWT4^`;TX?+7#_1MAJ#3p-^L
z(PdBTP8prdJ6fzvw26tNMQXRqwmU^2D_nQ%Q|LJ}7;Kt6zAtJ$`ijWgcMpP5LJa{Q
z{-zUmlBtK)r{@k_xG~h+a|~(5Aww}9h8`IRAlHG{FhrG}tDqDe@1vT?kgOv;rvWHU
z#l4rkI)`m~BF;~ZWyat)SjhvF>=ZE199#{UXEt_Pg&aA5Tply*gwMLXD{yj+6+u>j
z_Bg8_?*7$7=I{&xmH7d$Sv5%gl-Ip|0a2j3%!aPC<LHbWc)O(8AUrKX(kdUAB3w&~
zbS?@?3qF2ZkD-s9n7Uef6j+x`F5M0K(^wvn=2bzq8;8{VUj?%g&w^fnO^det%mF>s
z!F-hIZatmDwkjvNJRhYvu0JGt;fh45A)0SoK1nMaMSc|{rULc>>iWGnm?JMHeJ>@D
zbRNYO9g<1*I{Ts)!QR9c?`R`PCT~i4sawa)t7XtOs;x?M8NzPlJy<T!tm?W<2yy-=
zET?5HEl8TR2$>`xrx<Ui>$aSDfmbwP5p|{qtQtnbox`Q^K+~lrKf@pKv&M$g!@)7o
zW@nD_)fNtmvH(aA)<Jn7j3i7OOcOp)K!BxwQFzL_xS-Ry^^f>QT$j%DF8ET*^tE8i
zSwt`vf%yx+IUA{6$9soosAs?N!LcM@qN*3F;Qso-)l^!-zTphl`BDc~`g0`&{P^qX
z5+y}$qjQ{HuTRR)N00qv$v`>TT<;@cHGhycpl#YmG|BH)tv0SICks+643dq%!zH%U
zGAisbvLkNJo=(pW(_r3B0{y$`tJ&g{@~upueORWEL8MIzF$70#Yaf1Rk9BN@Z!4yJ
z?%kob*cCsBTTEDX`_x@DNUcNAp4qjHUC>OMIYBWe{)>DXnKJ*9KgLt95bd@dR`h!U
za{(-CiLrEfy%;JJS7RdtBJ;9n7X#x}R&BbxKh6}G)RTrf0|aCNAQ)uu<|-Bn^|FXy
zrBtCf?Po>FE+qe;gyYB^Eypm~<8|z^!8I*R{z)iFYg2Rx1hUrIRf3b=h>rxAGK1Cr
z*yE3UT{e|6b=noN*ihcEUB0U<vX$Ux^T6MrqbR3AJ2wNi4iEl2o3M3-60(|}<NFY2
z8A-^vkV+A|798Hf8eiv+#>gbcfGFn?Npt7vfNUOW&_g>~9)#>G?Ji5~K0``X?9TzN
zfFgx04QRVFA!zVfV1@#j+nWoNBT9W^xb=kX2rK_hvRq7+RSh(wEx^^RihZ2yx2l6R
z&G;eRXyEv1N->wzIyQmSYEF$S>LOCdR?kaj{AKcS!m+Mn6=J3o=S%2VScTQGAp`M_
zOcN6!YtjU59wCq3KaaK`rW!O1bmW+)BA@qI!2(~jKp-{JCQ!?5_Nz`^${h^5k3Fot
zxn^VE^jESP>}sjp6Madzd(#y%rQj0&e`mNdqkbboSjWo>vWw7xL{~shr0^<8?cNh6
zV{C!dFPWNP9Z~0A!TtkM?aY??e#s^LGb>t7kA}sB<gtjZ80?Wedn}v1o|?TeiYbhO
zu}4mV)s~f>X2=k*iXl>V#GottxWa#s<6si;rUoh=#{>rO8SV!?3IlMh=-lm<z~nv{
z5V8&HqX@oN3T^oy$e%>!NZfez!RcI*{HBLzGyXwUH7ESxf|{e*#zrikf9Y{{`}cLd
zLmSqXfvl_gL5!a7^yHCXc>w>5T&slIXi#MKk==|_OTvLt6c^Vxb2?e!ym7(9!bpTF
z7#dlxsf#-S)J?$D6I>w*Y*qEpzt-o2^$gssU`%d32@W+<g@tf=H!R@-mNvhpsg~Ci
z!BUsZ6oA;yRG-R9aMIT&H4?xvUi;e1siyLr?#=g6Zn=DMi>J?RJlyiyOF<BmiN;f+
z{RicP$-dQSD!bKHV=N8tp|S`{_=Jy9Q}R00Q0wwd%z~7y%XqLXU7Pb8S7nwN<i*}i
zA^>613&cpr{y=zUCPj*fq^3}OfLsfpP+sjGiza;=bCAMFTg!^FfYdg3N(d{ERahTR
zAMK|ac?)f!%vH!W)+xN{(ceUFmPBD}kOo;j;vCbv(>Z1|A3m2%-RqXHJNSy*_PWwm
z^Ui|kLW(<S%C$ZT?c{PJ%1`10dbNSlpa{xdH))Ntus{|UZV{!aL%C)`W<Z{XqF#uk
za;!}u$4cc11&qs8FHGPwubm185UMP1b$mMagj$6NCm<^rsK{bNC8Tagq1P@~D*0*!
zd_hH-aiQxGsve{1(j)27W(_JZ)D*->Eb&7<9wamx9D|)#Z2<NXl=c4nSZxdpJ*ZM{
zw0Dm&>7nnLSXXW>VQpZwF9Wi9`rUk5>R=xxqlPpu(OT62Zp1YVG+n|9pfJbK{dPKZ
zu^Cva3<O@5h-K$;>+-k@akvpm;C^hTmv$nF-e{$1gk9e}vDsDogg-hXC}Ko?3@*CX
zsP^GtY<<28f{gV3P`L$Wmw(nBb5ix5DAY_Jj28d*YbBh3&9Lf^ufs}-NY7>4+=$q<
z2H7bgu$w+WJk4MRsD0ffF4Zxr3oM+2|4nY<=ubN>iK*iKb~eE{fQmS=>9RD1|4G|Z
zHOJuq`nr$6=-+^m9oc4+oOhQ8Yv(lGfAwlxgDp!Qi9wt=Y(-5Py4Q45;*v6ah4yxs
z)3<RI$*US`-Fz-c^g|84(lHFOb^G>kQb?<(2hY5WLDe-btC0&9Z1^?qjByT_iL?QJ
zNUTkR-}dGgp@bo(8*I?4BE^pkwq0hWEl&1Y^0nm)t@V65n@lczYs?@!&1enAG0mfR
zW_g5~P{*xPp;Um^l~gq-1UP8u%Hub``%hjqg|jt62T{`*elJ{30xLAiR?U95fAI9_
zWOMTwicL&E!cpP$qrK<wFmB%e>fgWp?B3mPxBd&IMn_)!PU|D!Qgvo49pO+i`Q+n|
z|M1yozf;5XC;#;H$&){Rwl{q`{q)K2fB(rJKKtj{ryqa(PoMt&(|`K?Y;XF<KYX_L
z$It)p+1A#_YyS7U&CShGIDhw#|M-uSkM?ITK4RIM-+lQdE_l86>F1w+Hu=YouYElE
z^2^_CUO_Pk@&E3fUilZZ)8Hx);KeL0uQuTG!sRch=5*z!pJvOu^Zm2K*%c(#nX1ln
z3AFEWNAXWmh-!ZF0OA691m?QgK$R!3G<S937i)0gpRLj>G9LJxjt;wy1XtDJ!JB`X
zy!qWG|Mz0LnEWK`asR=?@9*wDxQW&Hvq&Zkwei80FP6Q<V&MqietT#4_dEao{eS$S
z|E<66f4g(@58Hpeee-tzTYsCs%~1dN&1Zl7;Sakz{jdFP{<_Tg^Kb7y{PfO^-Tt@!
zw*T!Pzx%gapMCqykNt1`ZT_~#_K$!3bo;Zr+YkER``h~a0{IX3|M>aNU+?_T|JvW?
zugkaJ|NFNOw*UIo*Zpt(ZU5W9KKT6h??1cu*Z#Nuw*T$!zux`f);FL3vHz{V?SK2n
zyWjqB^FO}*_x`v3Hh-IG<kNrq_STJWe;Apuzs+A4Y~9?wxqI*K?pOVh{cZo-`wwqn
zSN!4A{<r?N|Lv_Gc0c|6!Os2uxBj;O?GJzW;j_<v{A^^E{B8f+fB(0g?XUj2`>;Q*
zzwLkf`~P_G&GwH!j_gH$o4?Jg^l<mHyPy5ro!|FI_P6!d%7@DTmvwvi_3f{2eD?Lo
z{`9xGxAN`H@9zC@|C`V5_95}N{cm^v@Z;C_?mrx%RDYYlZF%W`eD>9MyFZRmoWCtS
zz>K<F?0wX=9&DX19mR5ATITHeCNLzl;Wjm4?1F|<x_qgAiwwvuPhXZ+XQu~;W9|5^
zv}9=<D0FstP4&$Y>_<n_<u4zx4I?70QAinIU0t7e&jBh)^=0%_I@y#~1rEe*Np4*q
z0=(Un*Z2SiGYCd+|0zBgk;2i2Qc*rS*3(~sqCc87Yp1MTFenA)2<D)Te9ab{)}%}j
z3Z@u%M=*oenoX=iT*g{~$Oe02CqFtnm4JYt4tcsMj|&_?9F_xhe;2c7(D<aRLVQ6y
z>sxr{^>zA^RZ%POrA}%B_;9|D(6x*feNy^3J41c(M8NzVZ%HOJd!oVX-)&ZwL1q;3
z5vr2H8wI%4NPJD7O%W>e>ImUub~hoPzL9r28QRM(*}+IM>&1Kf-R2u3L%(ef)BH)d
z_m*EpxAoop7#I0k!|fa2Z{Pavrw2E7Z=vlcTc6nTo%^?L-Tdj{{o$KJ*}R4dA6@A(
zpDWhU4XZ>UM^dy#nSw8W`sx0|2e*FuY4YJmlZ}n4#iyFgN9@+mA6?Pkv;8X!Ww|ny
ze(?+A4BLJ`w;QUxIjpRkt3Q!iYP0<x52jz`R4>*$(-G-DKzYy27YEZ#&HUQ5P|;1M
zHYp%>psQgAh;Ode^Q5ifHT3-7Z9Y9amTI}omonwPi%>h$D~;MPua!0{3RI$ODH}c)
zZ97hEI1_-R39GTPx&rPs^1!j&XS^InbXsa6-hoqj9J|GNXm&BW9J+hh9(FOcuuAA0
zo{Xh>;nlDX#kI-s*-uZ8qwSsHJT#BkKOAk4dl`l@W8I|2g$+O2z<OCXNeyr}*;DXk
z)ro4_<GNW?tdz(Er_pIfiiGxy!0hvzqUg*z%`&8;2#WC?((_veq~|vkNY8JkJ<`-e
zX=`gc{0t}g^V>vU6;<QA^gG&omz)$v|7baQs_oS)mN*6rM$r>`Z5U(auk_1v0&}nz
zNTB0UVcN@hOvJUx_`3{y?E`hN>!&`JqHDxe!~s_}&|bJ&wTWI=uznV8y9QYKqWh-#
z&Wx(5y*<%(jfGUM;Lavfv;sq>rj}NCJJetZ!aXo_y}IofS-3ydy7tyrP^(jOkrxP7
z7g6vbuEaftc6PQ0jjJjnUcT7Ume$^a)#qC8!fJZ&6=>{*edMw2{xs*++qd$F&O%Xj
zVLOwXB2M55l)~UJDQbBUT;l-sYNTI_KQO_9o;^e!4sm-&cDZ283L-`14l7<*RAdt3
z8dNJ>J;Dy`n%s|Nq+3?s=kQgG)a%xVJ*WF$ag9|Ud~jB)jO%sYBqslOvXpPqn9Gqd
zK=gG%mR=F)G<Zrcm}<FczqT5g9k?6%lg~f@=W~a$ZMObUb}G8aP%9FPFr94+&Sr1~
zbf(1tjuTMtkN1hcj5dv{@PwhsQY!qcK&JAU@c)ht^$c+pPiIKca3A$J&MKbtzz<HF
zldpM+7t=f(IeUi(I3!^@dU!gwN7cMjM@xE#XrQlpjcq*MAudcsNeb5PQIa6F0zBOC
zu!o2X0Tb5$snsde7(BT+3<oOY11wo3hZ}o*gdJQOwy(Ig&UNlfKBvQ3unCq!ms6K3
zF$T9OF{DsxN0wvev$wM4*uU;7^T~|#elS!W2`D%wAc}H~#vn0OT#cqWbEY<@@3AqK
zcafZd>*R6$frUU}2>okP6ybAwDI&D=;=GZpwW9xD55RPJCFdD#L`PH~otwal25!vu
zM?j@ZbcU#|1pwRyjV56buSPzd9~;FBeL^at8}x#tdnC(XZcmnbi-RY!Pw8Ab{dK<h
zCHJpX3?wnAY-9}E>AQv1uU@PUXE+DT?)S6#$4{4KdJvJF#z=?7;VaJQmY176fB>FC
zyBvWZcC#~HOAP0cl*6MB2&{x?Dh?u2*^Ai%SLLzmX<pWADD($=3zi4&w}U0FMPfNR
z=D;a`9~%}GurbDMKbiVuScN%vKZbT)noZPVkZT$teaUdZf{|Pd9Zdo@(^8H=(HsH+
zkP|O@0!V^XHVVFg2+?21Ix8fQPoP}3^2X)#<Phmgrz1T{@fm(sle;{&Pd*}N!d6h_
zYK}ru!m8?0Y5J&EUhIr+4;y`>c}dA{kJb|IgSNK)deXVHT_Ijeqed8(7dC{(ytqso
zyxt*sl&1qJQ(k59ke)Ub<rK5dc+>jQu!x%6_P)bq|2%m*JzP30J==tS8@$c>>hUsr
z)nh>k3TGJBdSt`<TkJpoGvTb+DApoz_ln~GJo)TnYa%qu8S&10o!RmXvfAktfdeq{
zT~Aw;CO`X_(ZH%Trw1kt;)(41Fl5rUinMHy>l%ix=tI7djub?ItAB|3jD4yL+npo-
zwS*7cGD&aj?{7(%4s+}#A0wt3CxEa6<%2y<ac|StsDb2dJH9_wFy!(bH^!sOceJh<
z>GC72WmCF*_d0=56o(z^@*`jZzh(E>OPPv?LoF{4I{H@5E=H)g>StiQx_ob=2CvI^
zd5)p$@*R&Gz%JjX&cEpPbUa<Yw{t9Jm+zQ_SzFZJs;{oC?H%-J*0{^})L8J|q9e20
z-Vzt6=IL)hV*R8Z&@Fj>OU~bmt4N74c_k5p>e+(&pOhWFVYqd-@!YqA%a5wh-K)!&
zGGy`fZr!EF7vo)8Ja+W3a15zbzI@*&1KBvzwP1<Im--&4jz5w(xQh#zFAvm+;)Pr;
z(LpZXaZew8>rPwc@vS>71_}_PR8e%_+S|@w*!1l+%2(PwUar%^7YeO!Ye*~t;B3J<
zLgNJ|UFjTGGQXakc9qOAOd#rZUDscbVd%Otl_nA$WE>}w%oYj{mLnFLHBWM5P*-i=
zzG-=V_^f{*W%|9Gm+Efpv@!hLUW|OU!vpQ`BYE6@GQJkzZQZr#?w!s<j<lh5!WoHM
zvspK}0wcjHVO~-9yT9DJi%0W)KkZ)KcukwVm~VI`oRX8QA{HYbXmxq2Cjty63qv4s
z=$M&U?;-DI4b#4?{Tl7c{9$zBMKCCaDR<-|m$t<RCSX0TuqEiU&TrRXrm-n#FYQAF
zQP^U&z#_Jy#r43hpnVP=H-NOpWI<%}u=!+#(L~2w)u1fEqsP@0Mr;G<apa9bb&1U~
zG;)Vr?TGU=ju>Oxa>$copy8{x7-v)_kG!Z6PqU|9lzVBE4#aHpK$1mdhh<ut`qhaT
zUW_$gY?ViaPzK*=c#;Mo&F&r34qJNYy*#(CZAz^B19hwIb*vfsAHSbQSz_k883zjP
zeZ8Wq9nT-HfFDc>R-oR+qNTGHZA#D0cC^^9(uqGPUksR1HlBZjFh*o%i%tl^P*EIW
z4I|<N1B~xrl{H<7Hw=OD=%#EiK!5?%5%_u}{T^v3uI{+Z3Nu`G-)p0gW@73_lFoR#
z8z!-l#aIkufowgkM!|A;x_M8lhWt4ok7Ro9%W=(Mx79YkF}^jX+NEQgrqx6e01i^_
z)2sDjC<qSM!O$cflNhW=rV&J{Qp3%U;=>NZHXeIDoRfga<MZ67fO-Qf)-!s?&Z&<1
zU%g@>wKmhQ1a%VKrECy^Zgkmp)w}E78#S-@Amhz3%z9A%w>tvla))XXuDiu7*R^wA
zzuZ<`w|kF<8?`luy;8O{oTs=H8aTe%Ok~K%g(PQ-`2MXXa(?$dk@H)QO=QU3E(!9m
zqfs{5!KZ#bx*l%@(`c^_;An%@NE=1^TR}V8t3x~5U<}%xQw^-;5FuQ=4yffRT@m78
z1hWm_^<+O+e78r;%XRTD!5D~Of-A9G*w%+D-zN^D4~y^~7t~*moJ+?9$yF3773Vps
z2!;_r<*YdLSKLbmSsSNQ5kj6X2FKVf1_P}4HVY#ylDf+ZJ|Z8U;>*6s@Pev!TStyD
zTv?xk;mIQI8yiR7xmwQXPH^HIZ6L(g(|@wM69jP{>U&c@87R%hY~N0?8{JMm<<SPC
zQy!=o83(<oJuB61FFP4X^5kREFxk>;4XSTEp`=`%L;O>30l~mKC2$O$_My>Dsi@Gv
z<iQ5?6jf|MovgM?n{7Q^t02Y{zO(>Aqk+-w;BFD7=$|>#<3;`&rxvkRf!CVKPOVnr
zue^AP@ZRzLdU0k4pnce)4iB`rfO4SG<8CP>(DwdWa4fUtQP&hMUse8$&j$2lxEef<
zFXqQ$RaK$!js#Ou#LM!%rEoI-n<>=qg>al*IV}f(O?5Et7cn@#&?^}8IgZ73V)d`4
z3nvuPiUYI<hoP+RXQuVhIX=lTYF^ujf3*g_r`MSABTj+}jVBC)Z-6(m=;wFyX9%{e
z&-+(yqQW9?)bw4-A~>SQ=&2BU3p7d#a`76z8<&VM;`#Ac^ZDua;cR+*R@`P`8(7ii
zw?uidX(-J|$WU{$NLwA!E;~kgkR;^M;%*C~JRVwA+Ml3(W|97+>8CixE}qTmg+ZuU
zHu&&^WMHvUjEV$LNykc;;?Xaq7GvF~d{vko85&bkujoxGS7>F^KapFhWLK|5yJ^g5
zwb8i;JMo0uxRPbI|8s)gQ54+JrX&A&rTuuBx*`^&MsI`49<YN@kI>?WOA%xBH~ss~
z+9QAyRzbTuL6L&kXVk4(vYw`3l>w`U)_MaQNv8==5S%Sl60jt1dd2y!WLv%hItI)g
z|L_{*W_j?8w|jFvq3<@11<U7L3vWLhu7>vFyR6Rpyt*|*&_Q4x;3aT4yRC!$H`k%S
zTnH}Nk6L=w9cSMmi546L#Tyr2y*fp~9MsKu*=#{?i*ey&!}ilknzADPZtJkyk%>Vm
z80Jm2n;0VuQ^AM%MAIy^DRx?si%1loE|9bIplR~j!Y0+W3wE-2hArxrUSBsiK3XuN
zvY1|nm}NabX|z!T<|O8c!42Hkx}Zw7uZ2^Vtgs!VmM(E6yxs)KJ)!ogWt@ePN->91
za|S>(3cC=j<ZV5hE}l#g&A-Qzj>1cGU^Fh?0Cm4&oiWA5IE5<GYYs?Utd|j+4BJTv
zl!<<WxuLEUHV{KuNl#K4fRzdWqJb<R#yu@Haat6(eGG(vU?XZ=S7Iq~;<<ZNU;<8n
zn*|)JC&<OO6bGElEpdi%D&Qx;ZPlglbKNqK?|@vf!}zcBHVuUHa>nah>m4I;KU;Ri
zYgifN$|0vxCCk@_AdaQwi$j~XZRG`G<?0{>3}f9(mC6+d60Nqy<4$lCl-`xEZZ{hr
z-tGq7tW4Hv>ahAA(2|o0lAtsibZmzda30m8JdPRJ&h)AIhO2StPy5^}`jQ>2@~paV
z!(m4)T1Iq3a*_~<r4}p<>tjW)A=_hGO_MjY;!7saYaeNWXnCWCSaO-E{9oA}6pvHc
z9B0Q~IU%bvlFuP9PwumjxYls@G$OyS0%ez{GV+J0mwbSYRds=wZ2#aHZF;}}KLE?Y
zX~qA&zc|>NMLXDP_E>g&wr|~np|j?%887y?CU>49JLcy<oxX%%`pfkK{Ld3y?KzQX
zy6BCfjhZw4ZOmVfL?`RqGG0%u>NYk!M7`X@MuzH>W(Lmmm{~ou#q8`TPchhmG@r~*
zkR>Oohv#$RiKNAWqZ${5rx&?d;08&~$|X_>yp&tJ#0F*;clOcoL&fo(o5rCTONhek
zCrJAN%0NKE+B$hV%PrKk1D?12>cM-=0J?FET7I0+9Im2$?c-P8Y^99}@zaCF5z}^S
zcstWJ(nhZj?r%H8m20vLs`YxYtU}Gdu^*PonDJ$OqEN!w-gDN)Mtyqt!-3o7DU%v{
z0P-7@JW{v$^bn9n!cjdt!6RCtSF3I^dGbn7fV89qs<rF&N+Krdn+NG1B2jMQ*Iku#
z;Z9y1tQ3~@bp!Q~PalYoK(-U`=6^~JaBs!p-n<*8msZKX+MMNG%%yz_DnV+jz>7`L
z!;KWQ1kzd8lISk>0ul#4DwzIYj~Q);A27%4112bc(Cbh$mp3Qoixj;<pQXOLgetAJ
zaDkmJ)NJ?Vij_h$Zp~Py)cGh>q|_<;yo-N;Sln=inQ+uR?cUdol?+`F*<f;QuB~S9
zvRlf9Znv&Js0bC_fHS;i_<`3kG7DtL$gHG4q}eg=7WZ&JwW$YVOIie0ZMUo=>O%`3
zhjL}I!ug6FH3kgAo~y{RAG#y$N3)^qsS|ER-tn#?SAWXTK*+zy-6A#Gy9VcDWtGX#
zd4B@p!hCwFcCKk-xq%RpI%OO+I~`-Lc=&IOv*K7^P_FoH)LUBx?~~^hV`lEP66yiF
zN5Rkc#&zd0v(>oA2^2Fj6fa;9i3t5kZ$hNfEar)%#$6$`H|rsLrzLVw^VuQHRS?_A
zIEMOlynn^J_jy;xqPA15?gb^iMG0bW#xa8Z4Be_hx1J_oBkN`uq`Do=P^+8)2g@d@
z5~qynsEXm576*q&^9@`!^Htn9W^{sH+!Pig*R^(ybeb8)w(fxCeUi#_>!y{~v-S9J
zg^=$p4xSwx*W>zvR@Z)F;)8fgAJ{fDb#&2|(Y6V*#QlM#SKn+~a#>1wuG8?}KEaBd
z_8|^-&R|J}CpoGO#Kljlhu-Y8iS_ZZ1Drgl52;5d*kWmV#rpfC+!)&|a{U=d^@p>W
zRL&bG=&vvAR3_nB&&AKu01}fj&=r+&)X-@qNwX`pt|zDbhp}&&Y`lOksC1tPgd<c!
zPBMp|)>IRioj3-rUX`-ccIMI1XD<;10DhdhqOeX#PH+BtaQgg)smL2H(;VBpJ_mAe
zmL;KeH8u!XjM;qm4(G=x$UHl#=P>f&RaRnlx<uVhh?KB2Q;E`h7WkKV7AU)y&{Rts
zXbQ{O49d(ikd$}i6KYp2e)ovIylj>Jc*85!eq!mwtrwrv(<_@$sXjhgCD`?RE2ipl
zA`^3U`3aMC^o1)uka&!9@C*j=U(?190&xUT<-UdZPT9#)R?aFkMqg4K;b69Z@A#`j
z*g%A=+cu<Lc>D@WBWXqt%?`00VI-MMkb1y}j~C8N<WZkOr{3sMms20v?t7!;62!u0
zs%25;3m<V@W1w6aB5`jwTMS#$>IChvl1Rf=a#9SAN3PtPNuY=g6h>c|9BbGAI8Hic
z76IE3Abn*>k0fw4_Pi%Z8BJlS(9)a6;GD#u`brfgYs3AiJ~@*o_2}Pdbtz9`Id@bn
zfiicm*$p-c=<aCbkM*_#>&x=_yh&^6O~R=v;ilItM)j)77*z>(hkAD6ob|r<srT11
z5yIFm0uSH-sbx?&sRyga*N#2&zc)|Q#~^SyXeNN|o5AzsNUl1d<44NZ*oTdGtjsu;
zyWm(T4)~?C;3;wCMprs%&O>tljU-T2lrk>wG1Qm>YYSN2vou;tFB!&RZR<$CGRrrU
z846+)x#h(c);u;zQB@wCtdJ1wRAP*Avk8v?hL!y*X;jC&Ah}tUt=41K^_dm1lIY_G
z=UQB6eM<JR9UNPG_pJD99KI3JZG?jp`5tIVEfTneu7}h(S1YmKG9Bjn1pae+&v7$E
zSF0)VmR8=%M3soy^#BJiMZ~22NMgmM>76Cl@6;(JGlo4HNs+^NJ;p9!McWW>p3jjX
z;gmv=)kw{y-&{*GKJTt|P?dKNN7BeZ&CU!{wOhK46Wij9@0pA1$mdPm!EUFg&y{Kn
zgY%RB83>%0z>L2I{#H)=Lg+&^uoV~#8akJP5(3^WsmxE#0a55w$U$9q%BVY&;$6N~
zklkDCsHBn}jP5Ii<eZI_4|BZ&I~U(xD-f_YX(TTd+&4#bs_@t(>OfrqZNh@6^zWbo
z+HwNF2n_WI@!;W6p3v)ta%lMa%3?;xEDDAT7$1uJN&G`>J1rii2z4m_Br^uvhwd~g
zhY9h`&^iVHI?jrKy)i1o3HBpz_od5-U(+cDV-FwT6P7?z6EZyQGIhI+H}U(XLw7cr
z_av1mJVo~x>*Srdo#^`7f*D3GaNK9L+S{m>so=$9SwkuOIK-VzFj=)(+$f3s9OT7I
zU<0Qij$<4f-h^rvsEy^A!cABX%qeN8zM&zQRG;&*uYf7Fjb}w&k4sHTjM&!_60Ag0
zYwPj7t1+&*rBE|B9HN)Cx~PQhni}BtVuosx*g>{C6LHdlp7%&v90z(}Y@z}KjC8PH
zFSK_+^uCuy;r9v4s?^oGgnk0MFs}T4cAOfwmhUUL^-M}49*JH~w;#+~`&*&N8oqQA
zFns~f>df|YUs?;05`+Sf1$HHkZo|prI%2)F&L*2_ZMkV=3u`Z3gnF26dC-p?Jqnt)
z=a5PWJ)%2UI{eb6h6!Ehmse?`h+hGUp;*U*^T4~pKxiBjw$agris^))7wYDm-GvwI
z=<LXmH2|aO>)IqC{wl9sNWUwnT>ZW~eF-K6Gc{l&sTC3>@dTE?*g8rLtDZ1I)5%~q
zmssu|eCw`o2Gwxfp}~VCCVqFi_$AyE+IE0recUW{9-~4Bmb*bmZff9MddY`<$&%+0
zW!Zb^Bds=zRY9J<0a?M^dHQN?(inVD^{k@~+Vu9_+mXs(hzpR+;M?DjbOvKp=u#3I
zv;n%X{Da4DOH$5Y$NLT>j;y0`S+bjzG!*nVm_s}LU324M%I$taCu8{eqMWknCWEzN
zgqzh~G_Yi|q>r{olY)fA2qm^VZ@%1WFiUSecoAQzVgAa;FF)1bc4tu8Ss;1uE9NHe
zOONvvO)F>O3+mbk`Th9i$L61YlYKb9Ax2#$3VtAmfS<kOj$pXjib=e~`Br3jc1(3=
zwhtE~f^JL;vpC>~`CYgTTJkZMVyp$|)(N|(nCNgaRyxx1X^c?86#cg2hHAt$>y5OS
z0uXXv-g>t6<m@T3U3cfWn!T2N4iNkWivuVmOwO%!Da?pR7}=#hwMtW<BOy(@uOZD3
z_s{EPd@F-(6)ClXOq|GUja5fkQ?1`Qd&1DkQN{kX^H7~hER3Qje)_s-Mu@RE{j_m7
zyE~X`Bw5Yx#u@?P3ThTt`=~>Fh{DEF6VoyB9)4gix-*kNt;!i^2JYR$t8dR24{&`&
zi4bvg#Lz;(@vEW#9>wc<ERA7Dt5`Wd07s|i%`O@?=ozA;X%HWd9K|OR%oeTIcTG<Z
z!8>o6d0_~KQy=$W^sW{maDC(xYILv&p7@mo&$yRb+{srI$MU@$f3u6*$h}AVwk745
z3u`@>Mtn@&MRNuut;d`ttJ8|qaZ#suH8g}W;H|rjU<KZsTpAjG3!se0{LP`#8Fal$
z2`9G)8BbmO)LZZ3tn1w*W1S0{m@4{a)#b?y7Sywo#;^**GOZPq00}E`nwN-Z1gjtn
zVh`cPZ*L)WFdCC4wyvrB=h;ZTgA8ud*=qaf`W;-tHY#)yc}51vyEct-B_CeQI_lfn
z_Ib;p3HJY4N2Q9`TUkeYwDo`X(PaL+gcT&QrOI*_DtE}P>bBdOWB;Fpl;H}Bg=ESo
z2aNwM7SeOqI3JsSLqk_!&UCymiD#n;PB|TL{?A5gHu-mKP9L{EtwS_}uYW`08I08-
zqCp!arom$a^U_46d=gQgqZZiUuYVgWsUPRm_)=}B^-QF=n`lgC#8jYf{x2|%>e^J+
z%HLpezy+v^rbw7|zP2AWbVZnzkq*lvhr+iq9Qs=KgtZ&#Fwk#oHEgJb0RRt{FMNU;
z>9Sj_IMhNO?EDzE%jWZ-F`qzha_`<y>8Ko7DdUB&bG4>nqKsx)Vokot$1G0VkQ4sX
zdbojcX3)F=;<DDt5k>p;#0-@rWr*mK+*gYBn-cW*%gh-dX=}`ocAlxuHmO^VbY_1i
zLnI@#noWWo^jblb%io%PVx$q<r9G3zi**czqb59JBYJ91!4u>*Gvn<t_Qg{*4I=Vn
z@k%U%@>jMhdf&TkPKusl@YI&C+K==p)T{<r#KX(U!Oo%tGJM0Qbf(@i#ZHe8MOO&@
zSENRUu5LHbSG@h;g;R<hz+0*J8%@ReQAhYi0*2T48Q5`$i{)GKE$pRh8F7ar2il#;
z8|Ls95Uppyea9d<Idm-E!u-#&0j$Xg7=og`>FP8_Qg<vYJuKgDsAe?~E9H|o*LfCD
zi+W67Fv!z+8||u$_G}E64ga@3?CHdA3P%BgCS25ejovg4PKy<BBrm~oLiNsCr5H>9
z{%d56CxAP3LXD08-9=|Z(+bb)Krgd^QNbe8XISuVDTd7)0R7`1Ki&T9?)C#DOeGA|
z9%84yj23_9PP<G~9u+!y%_Y8m9z??O---@pZQ)a57Kj(2;gYM*8<lZRpF=<QT2xXk
z0Oey)bW))HQ2*cS&!ky)=vQjqNUXA>YlMu;DAr4Q(2#BcHHcSB>%5z-&?oY*BpzUf
zYWhXOBFc<6ItXt5_YuC7b_UVQSr&yaJp>z%{$Be)_axWXUHoakfmi{Wu0y@yYS5c`
zl_hfds+_K<ml!VuV6*>qo2Hbg;vai>0(UIy|DZsUWo_m24yq+tJ+E^%4K=!8+Nk<e
z$cro+q3kFE*YxFE52<sEl)u3;8mP&$fQODSK^9GyyknguoAwUR_N4=E=-fG?o6+~H
z%-IL0)lBS!6GV=YA|BdVD3$EgHBueu4@yt?t!b*`?oTvYo!YotP;<v_%Jlrk&a1jQ
z2SWWbKuiPRR6yvz9GqC1EhfQ`?}MfN_B7N9inwY8X<Xzsw4ub!Jq=G*0ue^)naq<Z
z>p5Y4EXSF-8`BKec^p=<NV*v$4J-5!s|q`b%=~>1qJ~n26tdH+PL*ke==BjQ2!eDZ
z!hUs=m33y6RJ(v&?+-me26ZYqb9{DqxVqv@L%*bGk_Ws{iQ4K}JBK+Z<)F<XP%c9!
z%g@`>W6-5<WJgfDN??%3s1{N71M}{^P!&q){OmnCKz1(D4Xe28l)ErZt#^_u46?WO
znN3>hmLV^3nEJ!V03DrOzi?z!1O<}rKetf~6J6!~!R%=Mf*kztFyj(RHX;O-d80<T
zWJpQ<M4logk4!S9&QQD)mGw;L=x$sDDS~@{uQ`2ylvTQ={>gIk>vM3s8H#_+p>CmS
zN(%!9UQGV$Y<UWzn<LAM?EJYN`ahiPHDj~h;m@oxhw{vAM<_kZ%84gY{mX?1#3}d?
z^UClwPDOhMPf;L)McGlCE|J#K4IL8cC#c~*pzbK&TlGd+-4AsnLfgWq??tyFG-(Sh
zH!3_yIy!r<ctzDj%3j&{(W;`ml?67d$uVWwL=(>JzF%A=w>Q=Hv6*d;R`u~tbhp*#
zNl7Om8)1yuEc+UkD2aLq`Uul7gpJwoDoZ4<0F906ZdqI#Ha*>Yjz}D*wm(m5lpze=
zdXsww>q!IxteC~1yM$%3Dbt`xa_LjU5*z5$OE))+SpGbD&*=sLxfMww&%f9@oqsp~
zb+*{XHlw&jinz6{-=q-@j`s!wMH_?3mqa+YvW6~+3|Gb3KB^-gWuiqm<_?#zsr4Nf
zR2nJC_(f?19#{hs%M8O|6fDi#O_e@sabWU5qZijKyuQn75=~RtqNFch$P;iHpfeBE
zmR3xCJecjx4o*(%Zv3I8V8%4kca0W8jv2;2boLc~OBN?W!sHxyepl%<X4vqXQ_}>q
z6y{{BtU?3(n&glMG(pk5T`CAOc@LzmF=7xH>UF(#NvB;W^gw;nsPKAiP^C5qR=?@X
zNPHZ9i;%8)i_F}|PSutSZ%AwA-2m|`+nd2WUmBh&Ro<R?r*6ztHc_o^;FH_G5B^s5
z0VY%Z4h#evk<EI9T(s|*>~Pad*e-9PvJ&K3UUXd45Z|Xgo=L>#Fa}*HAl;}>!&-+D
zK-SpRWmBi+9;jg^qvm>>mKs~hMdIRsKH|D_yN@!qUri4gkh`(gXJcW(1u-4fE6rxx
znNhBu(jVEobim&ra2VogvY~fZ6e<Q<QNMJyCC@jm=p_?mfrjrcS`ied{n(NV!L*DP
z6oMMk*dWjk@yF9cR8)rC<&l^DU+mO%lZ+7O=kCdi-6<Lx?q@P~r>-LP9jXn%zNQ@>
z>JMXst~0fDr>2X=)DP;ezBO%j=OjYyw0VX4&E3+z+2Cu-n56@`iA_j&ur^6Ms+m`{
z9dF_aGF4KWRyup04y)2y0)DU%9-m|vuT#xy{4jNeW7jJWy>;L3wCCYFYx0TINq%<y
z#=AZv-t;~3?#_tqBrkh99E4Q8uzc$~Pt&qLj8gEm5zhB~LSrS6uAE0ehH1wSSp)82
zsp*8;SR*^z7P&|palDESMagVBuo6W<jIPYu7D<>eEuj|44R}eaG~-;KJc2E$d3cTX
zrRJIJjmM7OB7%PtId|S7fyFf7xv(DyJCoynRyfCYV*8?D;}6xK$!$ujFbI;BPrxoO
z#=o62UW|WZL<^AHoWSzzqmQxsXwKkb;AuxHcf$8k2$pZe+}=ov>QiZe@8K6eVwr;p
z%I`mczKmJp{sfe;!5<ufa76u=krLwS7pc0Ja4mGN|GFYhW_UPzHr=bw{-bar&}ZO;
zSC|Fl=@BYA<3<Kk^8xC!gBP$r&r7L#o^N2DhH%20RpW%pzOw(5>8mJ(lQ4eGOyH8E
z0xE(xQ*!uu3K<>L{Rt0g@8J~y2hd&oA<*<<b~yPJ-~;__rTl_wZy!~L$9j?r5J=%S
z?%%;(1y+-I6gazC;Ommr=Cy(BO@Wk)3V=qt@+gzk7l6EHaV_ij13WD1`m5-M`Vt1m
zjX_AE!@N%DCfjFD5Sx#}#Ftp{?*z%4lUwGMGOY707!a=%N~nKZO$PJFkd+^s7Hnhe
z9fTWK_a%M^I%pons@rp5qWq;EH|6MfAv@9D_V!hI6<fg`br#Ux5K;A#q!*4~LQsm~
ztH4cr$K;#HnZKpgJAptZaVbmp-&&V35^8i9mX=Plu}1kA?<TM+kg5<157YRS3C12}
zqT!<zgk!IRctVvhl9>2yC4kTOn^Wr~xIiNE@~|cIZd6<hGfI>=lc#O(@S#BV?!BA$
zu1_A!P7bHIo#*H2@vEOLJRw5hCKI%qEm4s2bklVE&12Z6Ht}RO`SKJEmwO8svo^KS
zN5}I`zlCKJ9qMSVRt;AxV%V^3UiJIrVDFc&Ue)^ViZ5NI9X7depWc;jR?|ssqdIi!
z-a|PA$9q3VwM@gt+IDOQ16|VTe^Ug5DRb6Y<)|qZ=5w@0Gy9BdjfgORaWF@DKkOn`
z;QmJHqYsT)Lmb}k05YaYrY}QdL>KQ)A<P4SaRg`3K}IyVx7V<mVSf_^@>05hFAkPU
zFJ!5V8ATNU5oK1KQD+;W$A<q;%#N505(5%b!NhC?gXM^FdIKFLHO*o*QCcfm^8&V#
zF}PV@p1NSNldVXezo&#slgI7Q%IL^#RtqYhMZ*3_N7~Yb!aEi@X-psCU5cI5y>96d
z9{kS4kJk2uo-E!9-n7XQ;B;h<hX$H$WIQJ7>&sm4QULI!c0l}h6DXP2xhqOxY`|%5
zhG5a@6I^5@Rt3H6aXnf3QsS0)BD|OdMh5cZZEyHd3Cf!pap4TFZbRG!|3TA}DdHU>
zx;4>%a~joQ&5Q%7yS5dkim)5)R8)5%M?_YKjbuFwjDaR$7~*)67!1sfRykRvG%X2a
z>4SkU&j0*$-v3xMH+(PFF&xpB^SuLjta+2CMGhw*qKk7RbA&M22g&iPdz8mnlHYw<
zTijKb&*)fTW8RR_<*$57BF^m1>D>O1nUMT1c?<>&&b;20J-;S%#M%5^PQYmaE74pp
zLL-+QbX}n=kGscQ?oL|=3gWar{26P+AF@uVZCPZ##V=WCXKyB-{Y+PbweES&I~(~r
z^UQG<K@!F5p33U+oVrx_;*JTq>WAIF+X`rY{Z6TXc3%EqtVSbDs`vrYPMe{qn2S&=
zotfuFU}p5$ZhVaUz3~h;5G`JPii^XZP7!H;b;A)*qXnV8IOPv=H7<Pfm@m2M1iQ&_
z?*tsPc7SU-=zU4h;I_g)=C98AB%l7<x3_M5`@`390Z$tAyXmXh;u9!zIG@$FhHyC@
zrY5)H;zss}C{csw0k>l?9yB}sy8CkyAkB)cr>3RvW2~Pasz2wJYZAsODEt25H97j5
z3)lgI`8GPs4kF(em(N@4afdqoruKrY>1>PBi{3e~VWbL;QWZz9yEl0xNQml8hX^IO
z_jK1QvYIy^52d(&Asp`r@)oxVV*9pU2gH|B!MSIJ_@7Llg}@Y9FZV_Bs$0?O&~oHL
zVurCI?tlLk3gyAmf@`}OG!uO}Ca8lom~j6<61WCxTEZnWZt2kyFgBX$Gl-HA_5o&7
z4@#NUnsp^Lhp{OtW_p|4h9@&a5J>ETM8enrHEa#-QcBki#;&9>-TcZG+qEWClwG0l
z+bN2FO1;p!yGI{Cwhy%B-u&nY;jkrmd|MuDGnnSt8Lm6W{RbP--Ij4(=WjG1H~iIl
zN9u4vK-0uWYa@Pear$9|mm<vRd%JBUf*r1-di}mXwL50NdbO>Qt~u;y0I;ID-1n9v
zev&KwLWJ-X8F)}Cv2_SmiwBL;HhgJFkYlaCR5zBltZ3~|xEMas_H6`WF%yOg$nHxX
z7RrJoD$|v0=&2!x8_ON93cHWWu~>+6s>uc-4Z2=cS<<ZVT-}z~84371`%7|%0&xRE
zzPERTq*wNhqvLqrMvJ6U7Nsa`k7r);A0C5y1gmHx!V$J4M;OE_`<{}8u&-RTvRki=
z3;wxqn)eVUT*V>BxIljW)fc%INOe$8fOHP)*C#LL2m6zc8<1om3{nQfwV<pWEI0Ul
z+>{NDR#1mts*M0)%{z$9!bMu2`~k~!Jz+pv$9N=w_&)6>zt3Y$#`;hyHA+XidGt?k
z&%Iw}3v40zomLK)j9?9swZK$Z-&~Q|4kLZN=D>xjHutfvxSV{eW;ZpTMD350jks_e
z;oenLJL6GRH&7TH&4CiC{YK70zO0wh3C@fGoUxWr`Z6D${(cMoC6{9((*s;gE(uvf
zq#>@cz@?FGcx1DFLp}(cX2$QE?2D}hyy6J27Q<8S1Gxrcd}AM<Ac8$MUduXsTt$wd
zyIFK;(<or3<xLR-h=9v|2+FK^b@eF_;qlU|4?xSgxUI<QW!kshku8}=LuW)24gDx|
zExnFtv6wIJ!gM!%7FQAR5o{Ft3^EDVmc#M^vV(|1e&!xS+tVy0e+YgjJrRfy6LB^&
zB1?@J=sf?(Pc^gDLydgSyaf!Vc$1)4eXyd76x6xx%al0yhzCRhZw)i1))Q9yQ^6p)
zT+*JBslbW&T^UyTBym~uN)M_n9pV*?LPa-g<5RCBBqM(uCk9edY!&2r6(odx#WWfY
zYD<lBX74?6uC-2~>MKgCTFF|;HdUg&qRN)MHNERYp^(Ys@s?!~FKz6sQna&khz6;Q
zee8?DP-k=<CqVtn&wxpr)NWO47@o1u_kTNBuiwO3G@)56T;9aJ=sh35oN%5adRcdu
zi;YaFedr|J3mcS4O)C~Fk<C~?UXgqkw_`&pZXl!M%b$L_|M0=BpMF9{hgeUb!tzoA
zNmWI&xZf{P(OCC7F#)qj5$6La3<7|urk|>}A{FvTu1nZ`d5gTXwrG%N$zx3sFb)$J
zD;VS#wmeiTI~t<U<A30#@i=cuH;*)S3hvBDD^~W}q`Sk?-g5d=+R|V3PJ<*@`2$5_
z=hYIo9<Fx}Zld&I#qzOq7zf8`+jY&0+_|u_aJi(}jF92M{u>@e50=mCyL$W0TTq2q
z<o`<Io!mjkTwl9(SSsmAvTV5}I4|>(ewiigIT2<k+>ol0+9#%mOC%}2*0Gf_*;y3C
zFLa6%hMk;a0~!Mhclhqhi{yi*brgL${jT^+nUS#b@{{}lawC5iFoQAq-xMvm&A}3}
zUyFM{h*&F(G)+0A1#Ls;b^1~mvBW7Wo@e`*VPMI!pI`;6E=tzV(m@-kYm%zJ^L+m6
z1Kf6uFw5%`xg^_H`VFtIMnchsCluAE2X02;Ltkv|%~Ab=?Cht-$(}qz;U2P|ZM;~*
zYpw?MEykZcu-iXv%mjBiZP={&z<3h><or__lQ6Q${u$49g^n`bgAUtVCTdPLMvshl
zX43^?k<;pg+f1ULk1Pw=bAGzI_If7Ar3|%=3(siL06V;KJefb?{iu>1GsRZG>_ow2
ziumN|+3_BYS-P__gg`QA=kx&EPi#5Na?Vpw+ul&KMJWz734BMps_M3>U+GPu+(K%-
zcnIVft-X;-1%XzqprPe^vi0tKTho-x=!H?jzDl!`f=ZjIT=hNZ-VATe_(+TH&E`-d
zp>-aJ6KcH5?acJJwKc&Fllmbdr_B!%ookyVmqv2L8sqa4QK6a@E*5Yjc9bwsW3zQ5
zj1A0cx9FWqcLOy<fc#TepwiNqN~PEuU{uXB)<$N+UECOmFUCL->#~0U1~3D^LCKgL
z@B*vCkCG%(s~7b=P|hW~s4Wj}Qh>7tY%Ch7-sTj31(i+9tLu|wQe8J>_1y%mlJ#u7
zkQt!jESOwC<%}|TiT`1oIxY3?{I-&LSm0#4A&p86E3$zyaT<Hlo^;W{=Tnc={toB+
zI2LX#=Zn)eP}X7dHa$f<kLLhl)zag7-83P2gaSuI9xaC^^17^EMNXgLC#m=7m)Wap
z1@n)&2k!}=+_J>WLTpB_S*_z5QeL4Kni0|r!%^Kpr|n~@Gg9Ic0`(Xu!W2bt4!Q{I
znY>PuBs@v7ai`7>VcH;!-7(J{%J$T7pfpVS)3;!*E%D}R9NVt2T5A(#PuP@4a!u7(
zn`W$(Dz;3rir$H7XLcG&nwy+YMLA2=L1fWs>pnm)J;HZa(&proe?g<aOg8!N=4OJW
zbS}D5zn@13?nB~gDEP0{I;)knMA3@HPOC>uyr(l2uYmm7BR6Za#PxNPKdFGJpya^T
zh8_UzCk+&I@!GdDzYt(iC#EV3QqfadXyA7XRl%PhJUxY(mgsOMmA-Ilc)7H}tpg`2
zVO=%*k%rPtL-IUJM;+-d+0sT+L$gtsaRmEi@_pNUVb{f@fDRiUnMkz2pV6B+*X&a=
z#nF%r<qNgQBKJiQ1pO3sPq-s{@N7`*%vWX23B>lY>FejAit3CK%8Ynp@!eWq1%Fg{
z1!<@oF@|bDvmtGnbwmXAAohWQ4S~L!-`)G+{x_f9MZg5mpliwoHS&D=4ahOJ9?+uq
zrM7qa)4@H$BZj`n(O0St%8YmEUV*Co&Fm0buoz|Fhg^N#V8FR*ITShD;k=b7M|Z*a
z2~-gjSv^ku*xWTyH4ARrtKh#NJ9I;20ognP+#X2rvRR92MA@$8v>t`BL~oT~mdPiQ
z!toRrYmyIB$7f1uB{5TAs_C{eNCa)r9f-|qM+yI>hnmo-^^9OIbAcu$=ixadjmq<l
zvzsx{M+UN$w(d)qtUPDAFqHA)q!ShqZi&ieupZA|q9|LjRCtL9pF^|M)euuJ{k7*5
z;U$AH6+5Z7<K}ZiL_OzVC8x3kYsCv}u0|ORcwDm9d*H|PcfS?yn*qQ<9&C&t-~Lv#
zjWQC_RiCOdifVQhd~^`E^$y~>qVwWZUB#w@QR@Z`S)2=6>8g+UTzz>nt?K%Rh!j0V
z&lhk-#A8~B7GU<p8hi!EUyegF2ab9?0VAz%f2;M3D9a8Tb3TvQzIFNAHA$D#i?*(p
zXF$ibpkQcUP-g1>V0r7#{ZBss{GWGA_jSiB;Ju1NX7|c##0ki4)YM}wWB<dCDyccN
zk_HNb7Eoql#o$5ooLc+<cmIwi43xWfTmBHwjGB)x>OE5d`C3B|Xa^XBw`#vu9F>h%
zFOT0mlU9MNb#4rh)BhNFF-z3x(;zR?P3z&+?N$%2>>}uYqXXhK!B5>)?Rw`V*1D=X
zQ6H?F?VZ)e!Ro#R^^H*Wa+%4VoHj<TnwbT}9-<N!4~xaS05h<kSG}1Lo!*dh%Or+7
zj!`7`gD1f&1=OJ>T$k4oENh`F{jLfF=IQt_nTZy4XXkW&B0`q5A~s_+k&C92By{T0
zwTNBvO9s1YNi2jRoaue6jjCW+(O`ll)6!wy>;)vGG0sogL3GE7hqmNJpFV-zXSXc%
zj?OEaDw2;}d3PGvP8Y7jrjD8(j6<k2DZ}ym6*9$(><W|){`q+pv4%=H3bpjHji8(-
z(DJb(V^7~83jBqfRaU@W^|AtTXGz7oKA1y7;{-)vSWNiWDS}mDtEb*<6gF0@rvfA_
zB4d-X_@OkUr^D#+JKb8H+ElCa8|=GB1xqZZG+-dXx1nv+G~*vWj-}Q=bT-RZ$9pEL
zzGlLSJ2mpUR&!Gd2`vDDzb9~@F@df<rJ0`KEe;M3PG7a%wrLbs8&@8O4wKN9=p@1e
zKYsbKFu%U80JBnk5JcfND{MPn!`&w)4)UY#wF8Qy%NRHgmQ^<>*i%1fO&blozEld6
zpGa2%^YvwtD&NhS{eSL3CZAx^r3)$&LGQKV`r5aOBRn>hEC1f0S<Pst7QgBsLJHQ;
z!tj)#`u%@A_-6aZA9o^E22jB|Gz!_l33YEo)w&w)+v~8Xv;**=y_&_zQ)$wZ06r{F
zVOX(q+VDmGW(S!Wyu*S}mk;vOttW_dmtgN=@xC~w{>LR1RjVr8bbkERe15tO<?#6I
zqy$o^q>&gW4YR0CyC#tu#q{<Z_sgTg)Dsq(^1y@4+e@&AP-m6!qM!8#tHV3I=iMSS
zev9Z0A4ZtA|3Ku1;?UWh_#%|&HA0O3C;u#in$!yFOM>YqGxRgNp@~WNj_<(T-in>t
zc_3d|@2T_lBNQ}V9igFKjX}tS#Y$_8n<&B_gp-$Z7&AeOk?DfPUO|K<$qm+9hn<vV
zB;$$r6R-=v&c&Q(wuNa<J8*1G5AEq7RE0_)d{_3`Lz)GcSc1XANnz+_Axl+g$*+(A
zgit7Lw%XBa2?7zx2_1tm-F5>DtLGdn(?XF2%KN-xuC(c*oHEK>BCnw0FpM7)0u%QS
zVV1Dxh&V^k%Zu5@k*M3o(5P%;L#8o3=Bz&?X^|aBP5*>@1|g+k19eo|QUJU<Lz|_U
zQ1R*cJr!Nky}jAV=>tJ1CYKK5W--+bF+I!>S2Uu&u1=hiZc=@nNRkgUf+QA@11C6$
zOk}vm>!4<SYG7OFn#4D>pGzE0=cA$Vf?wvIP<LOPZ`H?KmEosp5eSxt1g@KY!ialr
z>O|*SF~H%GoJ{QQ*BOl*XO98uN8dBqp_iYkao74@uoFU;AM?KxsTt7y)?HWin9btR
zFp0gSC`q)PLO*n%A<_o0<N)yP@ZP-N@F!U5A4-aXRaK~QR0CUhAAt~_r_iK7ol~Se
zMb&8cW!c%H@L!Z=a3DE<SA8{<QWJ1*=jrtFwIF%(6%M8I;((42?~V2zUgm_#@S86V
zrkg6;Hc!r;Ao1w==JWad7ZIsD+UCcD=~p8C?rVc@@ZRDho2}T)Ww4XCmS@<=OPI5&
zEtGKYJ9tPO<SN*ZLR_`8prNd^XYTCh)vpJYj?NDfCKfx<&}onxsuS$zq)&b|*qZ4Z
zPNuiTgmq?^*-;jZ{H_00NXt`;7df$XzNpsb?@Hn%$#))eYHVkZMg9*n+euhw6%<Ei
z#uyQ*-jo#j3ML~3BqTx={A?KY+R)u(a)rxxce?y#f^26R@{nn?02^jZFx)Z6Eb5xT
z5et(v*^1KXy0$fN7FN{Ilh7~il6kU60KiKAk4-hmBe6ewX8$O0K((13azd1XR8?AK
z$F}eii7C9VAliRn5!Q*|B;%_a)qlMZd&5h<u$vB|U;Uj?GgvbOF57Z>JbeL6Kex1i
zS?NY$)3Xh<L1BFH3v6x`ggtf^;Wmao1{XaKc4uL!sZ+(a!>jSoun(0O?9QYL(!iX?
zi0=58<N2@0^i0E!cEp^af8DwFJr;+t)(1~tHRKz3p76S%qVYF8v}7EWoFfwL$m&(|
zDoFSJR=qYP2^Gr!6|=wbSXl2fXi~UBB?Ss(pMJ1(k49Vq$qT!<Q6Rp>zN<!)4*@Mz
z<1|a`77gNxNP%awV@C1Afhrl6sVzIBad@WE<wI0t6<rN}1U{w?S_&2r{|xCy;3HxZ
zupBBwHCdlg3UUXh9Jbw2abxoHpWt#k*#Aq(?3g@1don?xXH*Ku=(y<!9Za7xI^1Yb
z;>y7dz;LV|A(9B_NbsNUtS}X$@>7US*Iw)v@@RAqmwHOo^k~6ou?v>S^FMvnH+Vru
z$p72`89K}78|jE~gg}j#Thl!`OCm|j=z~YRG#g`49lhY*LR>x#gw{)SG!m^$df);k
z#${5aWwUwzHK0^F>^jc*(w9$Aw-d{;Os>Ewv1v$G*7W_{vT8s8;migrFQKP7A%)2C
zeD3q7)lQ`eE^upi2`qRkh<)NjzTjTxiLI2#%WF0y(4gT~Q@K!~3{h#hTXis`TO+HL
zi_T|Y8`!PSz{-|5TGc}a2aj;z_1DH{x^k9`9UU2RxJ$f81hq?a_sX8Tz9;XYETL}M
zM-sn!4IEN(<mDjwI8*?|_5BAAzrVZt;HCx^ejh~|_E^P0V~Vd$d;n~r!YxRTX@_{(
zN14O8OXN~s2!UKu{0k(|rLE3ne%8R(dXGxeLFoh1LO~PlGQ*|HEef)mF@fOm=>uuM
z>21Gdf(a_<%H=t@5Y*U_)A&#(Fl?@@d6-y3$>k-%`wNJ#U5#aKDq1KZqEeaFwW$4U
z>BF=q)6+=sn_Q_lr~k-o6ZPB+9N`kgYP>F!*E?Pvmi%0|N`BJ1bjZr#6|q<#pHLO}
z!zOUP>hfPGB+9!J_htn!_8g*-B>L%7QD_khdKb6DL2|lvoWrIQ0R9YYCWDUfmGL{+
z61{L|7xLC6WS|TS`y`o8R-0%e>7Y$tiTav1u}qHmGHj9KYSJ)+Mdqsl=R1%erpJlm
zmuQ{$^vT7yVnivBnIf@{y<xSr!KQ?9%{o(?9U5FYidtP=m5aBx0Tr6@kz@&E;VUHD
zsp#S|Qz^-vk1P4)rNqRoL4f%nu65vfZ6!paRbv3dPwa)GDeW=pvq%@(eQ8$|22OSA
z>NQaV=l#?SsAv{jBN?P1!SdJXiJoNfM`n0jp0OUQ1yg>sroGyO(778hmCXbgZmyJz
z7b6OlY$s1Q_`^?_uiYf4rJ<yvW$jFNIzWv8*Z>V-(A6F}UfFvZox45wg%ryw4Ih`?
zX@-vrTItJH%tO|iV+BANkZTSBR~W}PFcMtXS~j#TCyr^1W-U%B`_5-rM&qJOnH<u_
zAm?kM!}bQ<EdXv5)a&jJGJPxL`SJDX*&z@|APd+DJw)Tmy^jX}t97KXIIXKBWxYk$
zR<IYVQfoFA)3~yt%GjrGQ$~f`ac!1UgWT|l{4+s%!7b~4qA?~V*{Q*a3n?Z|DRFMm
zj>bg#YB9d!Sj9c`uYJc3SeL(8cT8`8p3CC4xvjJA(Cjwvs^DP!fHEd{!@5Vi)$;1r
z3{fW=z)KnmWo(O)t2%RY%a_3~tBAVZ;mW@V#T(|aDS~m-RU+fI=AQ&Vp=|Ehy{LiU
z4Grsct-9(IiMW$nQx@<zg&9px`}m{S!-~CBb4^TO?2hv8@**U@p-IKg1qCt7=|8B-
z8&V)sNR)w0);3n%ZE@DLM%_@Md4VIcyHLylQP|=R=aUkiePv-)NR(%ODCS_&n6#a)
zw4%PfjZ{5NZnOPT+~(n3vcxfWHo>XB<hg*wGba!4$llU}*!un|XA`OwHY7-8knZSV
z2=5k%Yd@5Sjn@;D=S0pJqW|#+^?}rroBDm*i7ubs%a(LFoXm|Gn-(BYs7bz?958^M
zcHu76tS1t1!_HMh&ajmPnM0n>Im2EZOYndk?H1x(A_!-PvCsLO7)3mT_bTW*x17vF
ztf1%M;yBDF$b>;SGbKo8h-WO6%hV(%<2al9QCyHYCSSbI)pBOY>H8DV-hAQT5vxxi
zHW-0(BlCT4xDIS9k+K>YUbQI8+y=07o$|h=733fefoj}P(w~^3yJ3pEAWpi9CU!9_
zViXgMD68{)iqK7@xH2^b<+9mSNqw^Ye75(CCTM?1wTrLnYtv6(#?9_<BOT6<pRv9W
z{Zc6LBu*vxs-%_|+~_hzWX?$~9@dDLhUgc*V0^up9ic`$0h&$bhxlHq9l<qqL<`8G
zkTrZ+*42H83Z4=1w&WYt)00G9reYvjS4WVGP>Embgzhw{uC+D6#+@vuPiLpE7|IEy
z4zkFYKMoYA{_1sT>awcAf-!=9BpuR4NAH@IXZru_eQS4H$C2&#{0c<AYb?bi<%eu1
zoN;Ulf+R+7k+R}AUNJ;~5-bv608o!8{_l71T~*zEULZ&*nVGw8W{nJ<(~o*rb#-+g
z+X@scxGw%B@|eSUW$P(_A;&?>cdjF6i9W0@3>NVd$D<+dKLN?TGM`r#ftd#f`~)xw
z17Gh$Rd`MrAe%Xc=jZhs<H_mya6DZ1Y=(nPQy|6~IqYcoa4=qnwoM6=J)6&7g5~(M
zBhI*u!D)V8STj7?J<Bo1&8Zdm?5q@GEPb~Ye+gP0C-M2evj}71d#RIS3JI?{uHVDt
z^Q(q;Jv$wi*X*;%<L4}JRS699S(li&OM0`|pWPXcPtb#38!z$uNtg3nzKlrknOrAw
z3cOSDkG*I1<6B%`g2SetU4gfi-@+{&YM7jYO@iZ(ezSvzF_5@OEcY~|3d`QOPqnpE
zv`E1k7gaVMZ^HS8<w<@yb~Lq{ps)P8`G4Luf;sejh5cw;xxPQUF+P~!rpaoKMI7TC
z_+Kq+1^3D^xvi;-GYRq)+|A8D9E2;s{+ysU_-h=|Wh(%@x``Lj1dKuDMwDV-vp$Yr
z$Z~#PRj~FpBoO!6D?fjQg%7`#A)hSZH-|?S6qwVlgIkA&+jqpOK)w^Fps>eGsa<*R
zPxdS!n5cUN;}-djQV-g3IgClJrmlID$jnj2&4?7((~3j!hqeH5FJcNCYHMMwk-&r6
zasYb~<~=ESx)=^dt8CsqpIsT*LiW&ZN7f-xk~88at?A+q1X1K;*$xtKUP%qpUo9=|
zn5UZA&sZVWsM>`e5-~k^XKo478AgFQ7I*Nq*d2w7Qe{0%eXE`Qx6v8<qQj%6jMs?$
zV+iV{M6?D8Q|`O9yeq#A{?wV3TjUfNO?LV#Ma9JhutujMe6p2qqb6P3i%76EZ^>-j
zo59tP+&`~xu>`^JXct@ZmFt#32XOWs0+`8jXpUKHhWM`b_MV$>7_DJ?W7vJXFTbi$
z>Fh}O6*b%i-5p^&L0}+kPWyC~CA+LveWjr7_{74Pyq~h{+pt-W?VguQi4E_f1B`dM
z1#B2^2j)<*26_)3@7~(I|F?UC{hfO|dw0^1wi{XeS)f=vWjJ!MTs&6f!VQ#Di$LLq
z;wHt;V+4gLfPMRUZC5VoP&g6-9(*i})55r!R?*IsFtT|_UWkb$b!|b~SW0(-)LNG0
zIi!1bY5v1G?(X2uY5SJ@r5YY49EJRL6Tq>umA&u2Cze}1WiDFEqJR)X6}uJqe%<Dc
zn*|9GzMf*4pqt7esr5u(*GcLivA_|4GPkXI7!342Dej>TLOTkguXUIwhI75mOg=v`
zbKk_B<k;=hQG6Vwa{9=x>rHCyF@XV8oInVGCX2f5E*RjY4@QN?>_x*02tIcZy>B7v
z<@)L2Dy^O$&9JlQZ2??&7zWmKZOwqix5{yJUt8r#^+<CdX4EkdJl2nU=iVEX+IR&>
zwKwgcNwaFCV?a`WM0?SSKvR0GnUmTT*u^ANhgNH)`EU7v6^LKK=sG^ekT(Qs@R}*W
zNyW0ZH7X0U&SEu<h;jU6$~uqnXuz*XUG_ypUh5<j9sIK|n2Ci=u~~9BACLcm8W#o4
z$&DcB!Z*a=JxCE?h$B1ryI(>b@OU+s2ihWNE;#=AJ4h`q5<5NqWpQ=+=4aISB809y
zwW)q)0U^FgQO<xHLuN<CT7Ch?hJtG@@NsMt#qy#^`g{`iJ?A4V{gGmT`NRzex;%Mt
zdUAq`F^X|2#m`&4>u<5lKLn7|0}id+MFkENHDkOXRx)q@VJ&bY++=(-id2dL#$yRw
z|EHB`6?d)@^etno>qq>Q@iDHIazp^@=I393_IruP?<&4PK@hrtaILYfONB2g;xFq!
zoRveUpwn1p7zb*!w>#<#pt!Gjl@wIXnjN3((*!=$K{(ix<R2Z#ZJv=^jCZHY5T%VC
zK1-Ek&};l}J5#rNw|5@jxcT7m9aEyn?uPIi7F!0RpU=D8fTQqiGn_s~Cvddz^XaZZ
z1a;#G+&t~bdGkGSQVn~vB1K=RPC&}qZwW7FRKUbgJigW$X^CdGlUe>B4Sl8+kY6dm
z^hYgI*r%^7_QW>?OCMXk$G&@N%<S+~w?a6nwiUE{Zd)R@kq*n;GNaCMWE9Gs1`g!h
zY@*)7_0TQDxgBTM_%;f@ACsPntd%4b@DS%ZlVZ)O>w6foakJ?YJ1lt@i`1KAoZT6Z
zu48rj^8V@ZGvpWIdcULg*DmEcwO~EYCtZeE$Kb%R<Bbz0XGPjPUcFSNWj6rd=c#Ls
zkbgWr7~_u2!U5JW41Rl*WM@NeAmzDt`usU^-|4oB^c}SgXM6H?3JpvY7!mj{1_Ea-
zrP2^d&MKeT^I!nRQj1d*oZ82{ai{$oT%hrAJjYEM8~h8;G41kg@f59n9cu>9DNSHw
zAng;{jI41kM{T}pOi^pX`G|9)4#_pB8?#XhwIMO@!k|__<_2M7inbA0j4N_ssQ4Mu
zmJd}_aL!|sk8NbtvHJC<uZ;Xng}BKYw8GswuLfwaAn-Bs<#aj+jN%!oQys`T)&`v#
z)?zB0H=p2KJK`vXB_n)|07nPLbHpc1jPbN(^?W3P0W%kZ`*-$lT-jQzX1Mr69C4qT
ztv#1CY|)6<xbgF0bdUU9j@(O`%Y9@lxd1LYdf1^@0=-*5otPaHVM*#58X3`z@<r9Q
zPSI#t%-fNWu$IMVIO!OwWAdH?Q|52W4}@AzZXDg@*F@9jYxi?+`sre@`1VKIhcDA9
zR*I7Qrb#uYbi9PJ<I@5(1x_B5&gvQuFk9{xU&jG#tAU4uuT%}JgqHk|&y1y68tKh8
zm`-dL^Ir;4N`DHX^jAuT29<2t{q@~H53b$0{XGuk;C2fsSw9HZBCqZHJq6z>#3`Ij
z!~w$TVWvSFg`h!&P)R-U{k7TzTX5mrd|`m}<4;%OivSdePj$tK!kx+Dwl%vkS#T9H
z!mTQX^rMGgf4TQ`_YshWTJl03+}G)i_i&3Q%AA)~Oltt}JF>M$u8n7f$Ywi=zS0|p
zB%RUOk47iPdx(CU10>3_{Jc)R==)Q!J;gz8f}3613^4XX@%<sLYdxRr+a$2aFo+`@
zRK<-DX`e{xIK-UT(BQttvoW@elPu_w50y<otSfytxk4a)YhC-oX&1Y7U08J59l@&O
z@Vx9byaV>g53$p)+<SFLzqHZEIOuX;U*kQ+el)**v$$cXl@i!U1{d?Xz)A{`L)gy<
z)<$q~QD9f=pL{@sY~HpKt7#LlYH~SuvZUYIMy_`S@e$vthOA<xYhBo&(j)CUTb!4%
zVaG~KnpcsoKskwaQ)bU)Z;=pg6m3z>3%Vt|s~)7Ym6Hz!!+zC93$I(an8r}tsUcXG
zVqqYA8-Fy+t+AkuOgO0O{;5GgEn-83O9^Ut(23ty5^7GtYMX3PF_veD+F8boxt91W
zU6u{jWi&ZnOyz~$EfT{syP)9FDQbdBbeW&83{a_e#`gBf(eMC^QPwmRQb8&Gwt9;K
zt!UAr=n9k3(s?p+F=t2D!1N>8(r!YCge$4h#i>=as0$+}Ktv*OY}<*h(9S@r7^gk;
zZ?SbDP8nrNV=X!dnR#nGBV&}!6x4MmQMib+>^3>Zyk3?jJ*if*aXiH1wAL{2a4_zF
zN>dI<ia|Q@<LHSvrlQSch(IWkdDR*pzD+LJ7=bcP2T3-;e<za=t4=YZo_mi>L`w#u
zpscg%0_BKiO_JmmDqhelMeXgxNa(h2GJdpz_*Lcx=ltkONSlEAASIEvY67VZ#<XIL
zip*B2jF$`~rW2efV?{Y64;vM_Ok)%=0up%o;z@)sX+_A8CB9%)s)bl!McmaG;pt@g
zVn^S1MEO9>pTyGxHd9~bPAf^iYKpQno>q6}!`3ZF%%VkC{9!U;+>owYk;K}!4o2QP
zhnR7l;pNLHFXVlO)f%_%EkH1^7KtNP#uuCF2SgaPtv(<U^%%7y;|@=}P1ZhXi2tbB
zJj;Yy3F{o+s<sW2SIkDBG*X}8gwYx{Etx)AXA)rB-MUoJFZRbZ^xFL@rKMFk3sWHL
zWZ%0iG+0mlOQH~3(_<eh@*p-B&RJV;YzCq32*(Yy;luETZjBX4#cVnrzF;)J^pBI4
z*c&cs8sooJZn`DuAc%KSro>v-aCyA<eJRs2x=yTp6imJ|ku?imfXjB&s>cg_yD@z*
z@c`w^;~S{htch0D>x4BboI9%~!PXxy&2doW60iEW^y<=2Y5Leo5E&TLiJALv^!2_Z
zS#<c`0^y^j`j`#O&!(tAE(X=GDDo}J8&f3Gj;kgl!gd@Mi`-A&RB_d0sK4|w2y8+H
zx;}JRn<`D5mcpg53@~G@x2xB-f)h^0C*QU4t>oS24bs4%IL?Yms^5`aYf2}3WyT#V
zn?A>k-lKKKAe>X|Y^<=@@J8K$)G16+DpaDW3z4@=G&Y;M<}vI&3@^3M?1pfsF)Kuj
z@2F^t9xReWYTdp!rK|+pRLI!;PhmvNQ~DkBVpar+d**j58<vcWA<}gkq#~YB!%)8@
zMoiB>wEK3GBjSBE{N8faA(@i}QNG<uu@FAuUKS@L=mDwcOtttdo-<G+5|G@T(Fj?l
z8B2pP>dyT6=`l|>)^W)9#GvPR8s0Ji>5OpV5W(6fFc5kb0N1PoC{#da_x~97DA{@4
z(+zT$FNG}VGZhH1af%K*@$*YpGH?z?@{x&LHE5dm2Z{etZDk9=-v*zO=$`XvZn~Mt
z28vY&76w!Mt`*Zjg<yxmMt;R@a3Hn9l`#9QJ4`R?ODx|b!R8fgBz0W`Vh#iqc#Esq
z-;_&VQM%zFyIGz_3thxrlZ74Wr;^T(I9u_CVXt<3<FYusPAAMW1<z+?cq=T;OqEgT
z*k<kK6E~>c+j<34tB(F%U>h3Ppcvb?#1x5KnfOU#(%R0TxAeML)V{K7%$c~<4tJWU
zgF$8r%iDWviz$bz#fo;XrP@IW{+id+tql=PY&|<YMCH)_497sKA%#u9|7NS@`&Twl
z+hl&xPkg8PcszeTu8xbZp_l4gaJs1J5{!m<)heBj3xwuEe5f8{w!OmIs@BC>kjmC5
zfLfb1$vVmeTr6#1c@WcU6f8v8-0;v9LJCZ{u*gmxyafBRIbB>f#lQ;4Z%B(>xrhxI
zxOru0Hf2r?vme!K;jq7Wli$88GdMhHTLMrOkx+Nf+a?YMMDgAsjX%w8HI~x$+H}Bq
z1Uu=Qi5c;_;Z6)XmrX=G!h5Z06`>@42C`5ThGBWmn)@_SSZmj!wWn&vG4<YCl%X8s
z8cki}o$S==98{u7F8!=QS`yMjmi5Km-EraY9?lkVaZiKxS)nXfVQRmsM+kr8I?oys
z#aEu{cOxZ^GdXMm?NFzDX~d#Pkv=*dW6P2yJ1<VBFaL$#IsSKFLuJPOT@=ghSH%@}
z!M}u1d!aq0xHp0%d9r`)-nBpPev!UCMD`V({L-eX>eskc*tC{UC*w-JN?tfu`xeu*
zeI5w0zk;EnnfGlxFS>`FNgm0Spv!ni`_@ZXPFjhPY<cecF8^#8_A?KuQ<6LQm4}s4
zWXp&XIxj&vmnpOxtnKqOA}fs|(Jn1ux)rQ;cZy)rKV5g3z=J&I<<0f`s2T<~sddFP
zn3P+cXPK5b^U{<zL8Y(}<#kJ)l;cW4wy$y;W#<TI!$)tE>9r-B4%lSZDjw?Ibqx>&
z7g;SK#dP9Z$ZQ>qb@acG>ty{o%rbYP1IZ$gaiUDuJ|~PrNUtU{Y)BQ|RSRy=XGd3D
z?UrQ9MiWYIOfze9mHlA4z<t%szoN)MjWvO9=S~(2KLS=O{j!#x@0`zBD~?m|y!=3@
z;m&I_<BMJ#)I<}W<7X~^)ilanUcK7ee{kc$cJHxmNcMgnPT&4)Y2GCgs+<FD_GUbc
zZy)qSMH?<;ut_QIsYJmiv%~eMedAGE)ZhCM<HZp&;F}|>Y}uTmY;6-y#=Y-2&*ES{
zIazL6qpQ=|CJxA<o?(Iup{H*-!rC$wPSOB03Va(k;eVU=YH>Rw67V4A498Vp<CGcl
znZn@PEyBJ|m+;`+9jm4H;WU|_c#5kO?hWxFGi%W($9-_Z3=22Y8?Bo<u%dAxwYQ5?
z-fiPf7JHN9(<9vhF_>DFQOoowBw60dAH8cE38O4=zynEj=;Fak$inUM5ifjb8O|<<
zD8u2R)gCfHq)@XFjvb+0+)-iG+RCnt#&d<tDqPm|{=nnu-)zPi0G9*O_wuLMh7sFA
zFPW1Ppes=fo^;|SjwMPsrD@cI_Y`7Y25BGK@OU3Xez#mu*pbiMGzBt!tj*oPQ*psV
zFV4#*4~G}JgEiR06^GMGTC@zTvtehn(J3)~s?aEA!9!ZxB;L?Y#}N`PwPF<kMot&D
zrB{3iv7EGQVPQ+_Oe@ZCTYDu2734^HP4ae|_3{mguF7g>k2b+=@DS|483f#5!cS-~
z%QVT}>=b@ZgiAyVfi|xmRXYViDzHk{6}I2lzp?+|-u`vOsGZ;@*>AuoIrB{n&;92R
zbPpGTAK)|qQpNCWQ7{RPb{x0ZE^lz>%67cfaRkC;Ca=SBD90A$D2cQ*aQvOY>065;
zob_QQ3%7KuwBuIizHOJ;zJibF`M^GrZgCx;bZ<U(JN%(%Y|h|Q^ZuX~8QSixC1sVk
z$#3xPHY8o7f>{myE!|M4dSl_S(pq&*(jxip8Lu=y#HI=dU(9slv%)YUAJeHdcj0RJ
z;S_GAuhXo0h!)3^yX=jHs_wZuTft)%#;a+vVH)V<Ivs6ik2d2~aa;{6(P5;D6hiX9
zcqSSCe9MmxUb!4&8`@^yvgQN+Q1$buKByC!jFX0&tdb_%$}jKSd-D12&OU5qCv}po
zY-YE&QQF0?ftR@+*4~!K_loV|<^Z*h!U2gHSMdhf%{ZIY^ERN{z!NuNZG#KBMd37{
zg2h)g%qACV95#KTt19><-S@DhO+F;WZH%9RwIlMl2;gOa+O5c4Hlr(4y%JyCQH;Sk
zu;g|(a%cQDB0>m~5qX>07=M2`ovC(Mo6Bl<P0bfg7sZVv@Zw#BGj^xHR=Q0|^l?|V
zX-?5Y2_n|d<A;_rtqkJNicSWIEo4nGyUD)Vem3EE^{d*?vzyiJXH%Yh;EMh1Y?bUM
z7t`Q-69A<3_m;Q^@8RqSOV#IvB~6Puoa#8)IpS$ut$>Oq5h>PM)QqcVZq7)1a18&B
z)P=ZUmkTx#Y%*fqmUUjNM!*<i$)PT%hjSty0?Bo}wIO+S%T^>i{qb2^a(?4f6CFu_
zT>iQUw20%nU2AgMjkVdV&i7mRm>X)=d3`4IB&q!6OUoQAE<CGt?m^5*U9!M()UoQ&
zrY4yq(ybM#wa{&?ejk)*v#BRGtE6&oBV}s89ie8$O)gi{HqUhiEvvIXS$Vp?1&%^`
z&$dP_Trfd8yK9XRCtVSso8Qj&>qze=B38e1&q)1#qeUJ5hZxIGR(yz|TrQ-kp-5-*
zp@oG|q_g{dQ2u4%E^JQ0wW>_FWusao8M(YJp_0(FPa4cEr$hl9{BSIs5pdvOjGvbH
zVDq{ll+*H2G4BVPDg>pR%bu;CO+tn6x=i;q1*OcDM}&2Dr<yo<G@t4}+zQyr6KkO9
z2-n%P&n>fCo3OxZ5hgpGVs4yicDg_fikz84M1N+=YOuuF{?)L=sppnf4$c{qd8UC^
z0k6P*gNJ!nK=f0%SdgcE>!4s*(V)g0X9jl@yJOv39m%@dwng4y3=~ryLb=iXKizvY
zxc%kVSnuywHaxCezCv`oD5Aadqpu!ayY~IHr|5ha8(G7Q5_<E(E8lU@Oh5d2uYdjN
z{u4C5F+Ln(>!i}Wq}|=&+wuIf{JKNr8_nA3*be*sAMQNvKfQhn;BXCoJXsvq$7@02
z>EkbNesS#qG2T0vV^P%7Ct=didE6mo_h01wp%949wl$pIktNG)Ed9fc*zUAsIY08|
znMZ_sxR)GfL7rh{<}$@EQMq|4bT-|6^`o&|DsIhM?u;_U#HE;H-dPECX*<=l%hzdJ
z`mEbCEs8b0@8Lq-O7#FYu|IE}=|=%!FjuG&T>|?utE6{Vcnv{8Mm?0cH^)imlmUb3
zWAWX_DU05YCjTh+E{vSjk{82p#o$#E*gW6gzV`K_ulDyKZ8-a(iyro)Y+cvATA6L5
z7~=B;a*%Wd&$~?wh|;xNrtSCL!-fn!v2d8*@I*?Xy8)ycw+lixRWH#*AmFAAEJWJR
zl%L`#niQd>+<}r}C>1wG82SaYt|IL`YI4av7N?`8QFzLN-%zPWt+f|OG<C!!7qGSp
zq37#O(`qf)=Y<_mC=ha0E85yeQjCx!W0wfT;qpKBK221;kW5s{1WgB$ICQ@|LlQQE
zwgs*>wqYg;yM-^1r#?fSf5ra;mzAOjdeTv`P$7)*89izy8NCbOIJ48y*vBu~Ak$be
z+3EDjHs^Np%j<%gW63DlNKt3v?c3#`GSQWMH;~4m9Q?L645~h&kQ<wMe?P5%AfVb@
zUfmgx#3ekeSz@uoAU=sp6(8sb<rdE3EqH9j2PklJ>3o=vVt&JW7l+5SONlP)p*9rK
zI6vyyPcjZwX#EXstBH#V_Id}b%pzCxTodt9%mwPfUXAUR6bC&n)vhqW4Mzhze_n;w
zA11sq*iPWaFd(2ryj#6mq`SLuO|T10DAh?7ABr!|eTvkNmzFb~s~jGkj`@T2Lznm+
zjpMN!rh;#Qg>e^I8M`{d7%QBUV4a6um!8n~FiE{g<vsWW3yQEtI0ufBu>u_vEi%&0
zODbx+kmWOsa#hg{%o^0HK0U+QC7UL$whi0D&$ed9N!yD{#X|)F*0WM+mALe%qw`9c
zFm;DGYz1#V+pv?d8^!>;IN!uZI?o6%bBW{vUhhodR0CA(10Bpp{I<21&5g90Ot(Y*
z?rL()R-ntKndH6H%f^m<#3jFo<E6>i%))n(u=DiePi#cW+ZnfRQRrHGwN#cBQBGcp
zb&m|bbcI~T=KaEt_-Y~~t>sl++$z_+V(HK;Vk`P6C<?#U?q5Nu?ArP#2^w6hp7b&S
z#>M?f1)aHN&G_#A7kfY4|I1ehYq3zy++x#eMCKxqb{`Y7C1=J{L~FD3Tt}qSUn30Y
zj8B>sTjIFYzjDPaH3CA|7Frd0gT3q|AHQuI;zFh?5V_PJPFc8WtS*RXYJ|g)1t=<U
z)fN2Vc`9+MFAN#7R+(Xw1*6Qf2q*dN|31+)xC#Ul1`N5O)`fic^AX54>zB_#X4FMO
z1?cS(-X-681d68-%7|yAS}&F`=Y%t@c{l^8vh<NgRy2n*xreuO2sdIYN4cJ8#ns{#
zX492DYQFv*$=@XYa}~f27D$lrW;JP6?b+SgFs`6JD)Kgf+jZf;Po!!Ht!?cX)6}p`
zdJQVs$60C(z=7Hm$x1p@)H0?~PGPHA(K9FU9*wE&d2_;&A<e<dw*bHVvm7cHiNad@
z#Sg{z7Z9#i7EjGaZK77YWnvrU^eBp2)W?^=rPOdpltmkr4<!Kp3&|OvwelK-0h1{e
zu>Pd#LrwKd0GbqeKR{~Z6#&)Vv;jsbYo}ylzpo|QTZ!*-1RUwNPI;aTh@ZS(uR{6y
z!1l5RYaZ99m!GYlsZv77{6NbWEchLs+OXH(I@{tnqeICtlIctgt#xj(nO#k566`3K
zsGz40zsH2=<tsQ*ZKc7rSwRUI^fZ-YunHP)auFz^vJf8gaPmBE@dzOB#hFu-SR6Zy
zEilwt)IgZpftaucPM81D+VR^O%#`i=qb%c2m>PoVP*_BZ-Yi&OBRWq|=&r8D#qZv4
z9}TwVCkG!wOR^vu(B*etYIsUZw!ke&#;Jc~HN)zS@p{RP4jesmXl-1<Y|`V>^qbA{
z|8SxMpEFr(#n&((Tk-Qh`7Kht?C;#~5AOc$@y`AL?~A{3lf8$7!HvH?c^Hi<f9Ga9
zeqL29z*v>PbF<bM63ttm1Fx%BKk6-X6an>ayawaR<GbHzJ8Sdd^&jqBdvNd07M3x`
z!;|0qm7m9gGt`kT9&p3QSa9zYE|VMoW;8iG>}_s7$ES3MSFt8tUTqzt_iV+>-`K@0
z_^dca>>XoO-23d)Prtf$?Kid+Gko^>XgEIn?BMI+=bwK5#aGV`#@F!k+VHDu&#sL=
z{p{M8!{KM6@o;PF(>4G1o6XJ5mGJ)NlTSYBT^)^IUFGdpzxnPvei-$WPd7g8efQmO
zHs4+12P|>A>(cfY8<&iVi%Z)-UfSBax|knaZKe6va&hUWjZ0HpG^(~0K3>`=3xT*|
zV_OiPoI&$T|M{={-wyt_vA46cxAA0W=gG#w&d&4xf9~uIrZ?>Ar`LCOKD~}7{b}Ex
z9OKC`pFI8Yx;<Io$wF<e@?Q)%*y#__ubp*%J=p2rLA(CLjR!kB4+zHr{v6MJino~J
zt)@6~FlKl%<C8mIdz&A2c7E7+3b-~BK!c^DG2Gc1a`>gUt^b{R^sjo0G=4wE*U<V$
zAU@jJd9<N_#sHLq&j&`2dpkS#0)tNm=)TJb?1@%Jox^yKKX-Tfe^Ez!i$C|Pji04%
zI~znYwflbUZi#+2-z!5h4b(DW|0doJ9%R^KuD65F93yAaofH52Iau<XEScR7q$hYZ
z;iI?rU#Qic4Ys<w@e=>u+1a2l-NozvUC0b+16uBoHY8R5&*ei7MVaW2Do^`6JHO`y
zw*dv@c*mvfmi>Bal-)Q*vtx>6|1&Y^0e%`O?uw)vcu%>vXV1i)>a)WQqhawBQvM~U
z7OB4c<vORHyu9u-dkuK+bD&utSndA9hSwbbGyefu--0Do2@|LkQK##_|JTMT2zh$F
zpgUlAb3H4$@oY&>*w0o_y?u3<S7&r;8*(F=M4Rn19|O{Ga|2>GA){$VU{LSb0QYwK
zf7+l`NPpf>zZ_UJ*^%k97muhB80^-@-yxZQchSVtH+?-$-KjhV$IU=(^2^QJcnUDn
zzt_aRAs_7VpZp6_ioa(!`0peBvz!065ym^>0AXL;AlzT6i*;0M{qxKG*3QOj0Q*vU
zzPm9rll#d0#^k!_cG};dVcn%!*~M7*UPvABR+f}cgHT^xM^Ey8Zv!*#?6b9jvbS-~
zAMDC^q4(eM;P<t$2d}8`1LC89j`i=`<xQ9!7@M#9G1K6e8#K6goU<FBW3bPq*q_~y
z*5A>iPk{pP`!w5$FF3*1vzx-<j%?aX^)vh0_JojMGg_Ei{X!n<j>s~*UX1aD99@hd
zvnk`+e`RF3BZ-D$(9pcTo{#~|u!DEZ6N;epPqdlto`8diXmtW}coL%EUH>0G7Wmq~
z?bvG~V^`uC$k1Op71WjwZW<h54f?tg%Qa@tNl-YWA!f30$J=rUi!knpy?-~3$jaZ@
zm<Xa{^gT8{hV=KpbhMJ1QWrV>9m$cL1%nxTM1Fjwkr7zfBX%_Qzwn{x?+MOdyak=t
z@pWezUJPPRg&-+_36>;~EXuG5r^>Z{;Qm~A`GipHJ3E8>X`FqdsQFnNhM+*>+_>~l
zoMF%y5M7Xbf)<}xi$tTVj@XmbN|4vMBatx=&Y_+}_rX7$)e<Zsb!P(>23{Rnq$mx5
z!=QcPnnK$KD!G{=y>?_AHykuc0RT{-(4XI+_&osT7&e6z=nU%@wiZ8qM2yWqr82g$
zky;E*lLnOG4|;rg!@6X^_{*F=r%i9C*JWz1Q9ukQIeh!M6ACE!sXnsPeP}cY(}Dn~
z9SGp3BLGw!fs9HGE?AxZK$G3sczu%=$cW=M)S!XduiMTwJu?n=N7Swih|rlz785TZ
z4U@KsVLaDu=khOl4Lu@<+TmxF)1c1ONxqs;hy;?`>)&wgB;#SLJ>DLC);D2;t$-Jn
zH~?OA(?&Ws1~8>`BeFAifwBJ}<3uSQ+&0y7^KGOfNhI@&Ea-E(1eXu{MHo4PTon|>
z#PU5xI6xfi(l7%e3ZEgUGWr$PKEGja2mi2Ogkm{13OMx*(31@Q4w*5OG$cHZu5bJv
zK>yx^Bs~Vz)K=Wo3KEm|v0!6NpFC!cCL!n^15=X=^$oLPz}((&i*pbD-o%o>(zK8l
zTY*-AL_jF)1dU_Y|Kd79`~b2wfQ$pHp@^42IZVII6u=|5DhVXu7g`*PR;u7Y)kD-}
zgG4+V7u_COFPg8vXCn`GlFz#ys2Gtb?m@}^ixmNlA|1+5ngu)~+3+{;lo<JIfEI2N
z4LsCjoNHYNJM%}6XrlY~Ngf5T_{UXNzraG%DS0SOV_~f^*~S6l@LO_L&ijfH{@P6e
z6)6CPvI|gmg^DN?E)#MohY}JdQb&bO+B6l3dgc<B=mD&q9zIP1lW}#MasyX^V=+e&
z#KAZgaHigvAwioS{!-wHhZxfw8EK*b$!3nejyfbRqc^V(fet0NV1j`7fhh{Re?^}6
z-wez^I_*gt6DdHxXY>krK$HSf?;0Ns0FD5Vpl80OhH~Gn`)#cK-S!h)lLZX))P6Cx
zNL2X3eY2a*kRp--23l@Pa0$$S>#F4afd#ovn9`Pm3NLJ2&6EE@kK+f5MhHRwv6cYP
zWAMK&?zvOjFAVfZ<h>X6D--z02~21WW1%4oD7l>Z>%J(<pEtP#zh}5etL3v?B^VOx
zwFZ;UXfS2(vMhiJ@O!|bAIk$XngSg#z_oEIVV;(1{X+{}G%3eVt&hC5X4dO0C1W}j
zZ_NdR?27=?^aPAk!N{PIrNJ!Hsze*}<Z7XFS(qRN`;<<KIG|;;o6}z-gD;7={``0R
z1KvO$jg@0Y6*)=)z^;z?m80GZ{GvQO3PS`<CMgVIj$E->pa4{Gcjv%0^VUwERO<g?
z>&e|vJ{PtDd?>i~H2g=%Ai^EU&44<93B<jMFP9v;9%G8ns8MJrp~%d{5RVN`h?#o|
zK<qIPlOkjzh~~!9BB9q2t3bZh#^*_LmWG^D7L6W0CN&*707{z2252!5Hn3HJ-S-02
z`T|Bv$e2MXTvU3$^jNpl8+1dQLGzQEIZHZGE$o){LCY780e)t=DCr|iq}I|kY8X2A
zv1$`(^svGiu)x&<V~Q{4D~jPmlHlSsi18qsQqOK`YDpd)6lNX3wyJ}(OJG@sBuIM;
z9t2%><*#6*DL=@7Xeh@Y0`QAr9aI=(ujNo?a#Vj=#7c`2efxh-zgqhiMmEbO20hH(
z^5Wenh3v6OTxx=?0t#RH+f#NS%2fJrlpb~4f6(C;c27hQ=}=mH4otRpjWQx+dPj3D
z`{<;t$vq6rXD&6_)<7I7HBdn&$Pgf+Zy8Pg2`_D_?RKHy9s41I_l~ry$Re1mhol%`
zzNVHpM@eeIAo~+^H@<V>mB?TNcot4moqBu%$Rkw2Pv>FVFCaSzhf3%H3r59LaL1t)
zQjUOrXO^QKI3ab(oiWXkg8`9nwUg7L7G>xMa7keCu0K&AL{eaDgUca=@ibW+UCAP+
z*7azIAcz9ByYYJn!SA!ipEx}=V+x_r8*oKv2SGS6Oz|+nLI)NtLj-p?c~*+M(nqss
z9s`vk&7p442L52}Of%Cok*q<ptWzo8HtcK_q%@6z5lffkg5en<D@bBt8&M2ecogE+
zgu$jX!-GvA@H7(Iun-nJxTSIJ>(>lE#GRnW3eyk(amr<aJ*+`RDMccTVpE6e)%sAm
zAoXL>?98|@R9wQ(C?0)yWtiiXh0YUI@ZETc4liAv==j}^itw@;Zb91cMB;80_2tQ>
zL(T#>x=3IeMKiK8ew?DghiSDf1SRo7gPiLh^!>pDEr>Ln_L%1GX_8R@)CjjY9eu{)
zhQ%-lRbIK$33(w{c(5dYUsoZAAgeuP6hIH2S@;>jl!pPxaw^1z`OJX<z>+v(2wJAy
z$aE@J_GSa*2}Q-ycB#S8Q)39G1ppY{&+%UWq`JrpFx5)9h2o5IXl5QUc^lJSsXTUV
z1jRwJInX7feB6R$obdP`jhWTe!>6K$86mu6=s%dI^$&8=FiHKiC~?OrD{u$nlTEj7
z8bBU7_^3V>I9U=+vIN}V4$@DzUNun#jF27=a)?v~M7jx~0$y~$D9!-JFK_sYilD;x
zsT)iSMz4Vyk*w)bg6|J!fy&(d8lW=Dx=mNqcd-Q-8Zi~A08Fu_GMfx225|cV`he58
z6XjqzI`S2I!O#S~?Q1>>Tr1*%fh$rpYKBy49NX+{9R|BDbm6V<;Cyo+2;}zZ470zw
zIN&Z{Pz;dqd&_#X;eRgRNbUPZY#+;wx=n*To;^-fdC{(5(vMn12ry$a0YBk$VP~G#
zY|s}R4)#IphADYu?qA|hgd@`9T1jp6Mj?U^$KM<y)GjxGAx4Z}%u3UoFbZ49Xvr*K
zBj=uw&g>JUo(ckA|B~Qy?GznKrz3pQK-dEDu%bp*1Qr6ke2np-y)>HW5B(7SN?SAu
z-Lx(wxy_4lJciT=wyl>ys%#fEV8AG#SQpG`kdi>sjI06};m?s_EqIZ-D$Qfk=5ACT
zB8SKrAnSdd{ul<*1F-Ly;FzJu(_2^_>#@%%*-9DBY#?pslL+AxSP|2bcm)qu3|YD^
zz>HEWBiqU$Bb{CH9i5wDHXfEBVbB!Mahmtfz6#8B|3T36)VT#=hmrnY8uXaTGu1TC
z_8>c2t~e!)WzaKNFX%zkl0&2aAN16W5rkL9=>G>ju<u^ansR5|L5~br(^i0#?-}pN
z%;BGG$OpFnbH2$4h}k=g^%wm5pA%eoU|k7sv}xeJCxK008REHiL{d1;WJr+9kc{h{
z{(+T57SERr@dWW&@q{!x>3c+S4B<fW&;ZY9OuU#^9X%{aE0_NTfk&C@fjdKuuBTj#
z1I5mzMc1_$A_YBqYwW@>MQo6s?W`Se9B{*{lyS(dlHU=Nnt|$AgH+)sw_W;?qI%ra
zA3TL)=adF1{%$Nl-W2h5edTbW=`v6t7F80|rnci3loPV#k&~_Q@$?oJNqTH#F~O7J
z5wU9F<9d-(HO#3G`R|ULK!Jf#z-zHZmCk?Ac+Z2K9~kQlX&w-C$ykP^I8*;LyeMCU
zld=y|??MnI-_^{186@X{@C#y!nSEPXQARP4wFIi(U4O6sr@$4Nk3be^e|U@)Qx(v*
zpsmb)n|%)LluckVN?K)coD2K_l>j7-5dpIAyXE**T^Fq{4ImD7&`nVk+`m*|C$*W?
zk(rrV0tq!=#ti;o1+_?>dP*Lf2I9M@kkJqeeFkI&k$}^JPfewRrL96j)i>(SWGdiB
zSr;Z%pbmc%!kc4Mb3()gmRWh$yauB^ON6B9$VMa-z=0M5LW*qRXr1Bm1tzIk3M}2L
zHn9#F?O1}lbTG-Dr5=rq0=-$|AMo)>Y<5!u-zvqSD(eB(`y#L}p!*<4ga<sd1NppT
z4AvW$+*F7lGV)DA0eidtcb|#KCKr4nae*cYjaZE>(JVQXBrXl@m4qgh3NiE#8*&h2
z0S>sE==o5er%1lwr|;pJvt%c1fw5sOyWw6mbT>wVeIYue!&A}4lE56*ex>+}{g9*u
zMIHnN%r1P7H<=6=Tdqq=qoE6$N~T3qk;el<K1gH0o3WSu4Z~?7qd!;w1G0sW;1=hf
z%s-G?&=2Yyx`)xS9EB|`J@RuP2B=V{yr6N^*tio;G`;nYzUfV=3Q*6AD&TJycKniu
z@N-=-e$P0#R$sd$Cvj&L#wXwtHb_hJg2pO`#7b6z>KhV6)9YKP2jXM&2mNa^*3=6l
zNxck~w11QW!d+BUYYG?9^kU$XRN%r~&HM-+Mt%gd6(-8$%412yTadj+CR}z@LVPeJ
z5Efl^wF2*L482+7AGZQ3N0yCc+FM1JeJdIVjb#cXdqzqO%Plp@<yy8jB&gJ63AFR1
zJ2i2xNsJmGV{5V=Z)<Q=WHc0r+Yn~^piwBx_D0lb;tkIxyw4J284#4tNSP&8ZhG|F
ztWknj+;btbhwI5@#ehH%y)wQeEt)_kyuv|a|4aVCB*2NgK<=vz4M?W*0>5(j@-O;D
z;fG@#Cc$mEkCHO~Mxm2Dr4%n%0vYu(p2TjCQ^0tq&gx&;Sm2lUIQOqC3J79v(Qv?K
z(zN3U4#erH`FLMMh6W&Fr0}CCM&8PFnq6b71D48*F&o048V`Q4gD!?X0AC}>f%g7O
zWE`@Kop7uV&mp=lYIpvvqPD?`22_8zB}pb|fRncp_4LF<48GM3EdGW#d2LslU?p*C
z6$zSsI9W0_F$}Bi6nSHK=(qN;%S~@{R}CS^Ueb<rpDWT`PYA$LH1uE*QOzEG8pzhy
zxppSABuSL)MwLaBpJZ(UZtj@L_DrGo`2`5a4xy!LD$`xqXu4eLyeUv_H-PT5d6q$z
zNgOhv0!pOLxm<fyDl>Oc`lI>N$R?F2SH|Na;bbD!CY7t7C7Gr0ku6|3IXaf@vQg2-
z&#&0uXsK`uO$D3Bw33vDpt`*G5nZdXOkycBq*GZPYB5_q7H!>!1R&5LP6@zblT;Is
zJ2p^QTx<zy{sB<5@LO$siIb>mb~@o53qvOkq`@t_$CSKmK*QP*q|~qT7*J{vt44c3
zOw#hs6K1JtY1VBXrAtyzDVs$;W$==tN(gjW-l~qP|AA&<T`P|A^qiJ7JD=x@CB%0k
zq?U=82qzhx^GY-JQCvbdwOcuo3^~F{R2K*{cQ|?B>;ux$BSjbDA%i?X$@8(Wz`l+I
zp?n=FvQu`nl8Ip$Q|pZ&Q@riVEIfT8Z;LS>cznv?|D<{O>t<9+saq+5(4i>vqdIX0
z*FE4=<W)`N*q!73MGIzBR{_OO%7gJh;*FPl304!jD0UI@{0C#0T)xPrtlW=QUtgGs
z5bo22X^=H)>V%V@>XqdC@1XJ@>gO7Wfv>2W-S9Gne#ta3cR?QVrJoWZvx8cF<iTVU
zeKp{2l?6YPl^?iDK;~RRCurG#tREVOK{cyR{gVwt&Bia3!>Eg})<0ss#FIpzVKe0?
z%LXHYvm4f}|IEu^t!&YvF%43&N;)<Pb4Nm8TUhhCVF8CA5<pFYE6QqC$BxoV_U@4~
zTKr%wNQ$|pI%x&6{;3R$FwyyFg5Z__80qx7Rf&;NA!@iO0k<VYV(gYLw9vxT?J<$3
zFoClK;%OLPM$!;D9N@*%*B+JH@6`DZ6j?Vj_7HZ(4jAaqb^n3oK>YyZ_5z_IgLKnB
z9n(1H9=*v;wu@j~S7sB;1}7><$&$>39E;hKg|EORomMk4YbmM`fFcXxGZ$+_f^hDZ
zrc|RL_bdO3e$tmJz#GnEHq~el$8=<zl7WZenVYd}MVvg}f&O0aCZ!P!DT!uNU|dC}
zK^C{Eyint{oG+FlEY?SWOSwX&7gy)I=4fGJYzs4ur4#P8v8aJ|LLH{a$D%T5KqLV&
zwPouvB7}`Hjq#vC=M97*1A~oYsLjIoU@(FtOQ(*M4J>idla|zc!#Wu$keJ-S)exeO
zO@qm!uTzv9NbidBERUU?zYw#oC>k$tOHKk1NiV4UJ^u5=xZ$1!JDv8%t+6bwSnrn0
zEDjttDJ|QqY}F6EO9A#qOwd0lclOkDSQFENh!J5JpW6I1kwA_<x*%g%M)U$bQ1w=e
z!TkKM1ssA<5D_B{Ca<z<rduYI7@8+e=>nvj5>-h`aD#YzGSD5g`)xzKk_`sg-Sl>m
zU8Ar52MAz^oH%1d8ijaQ<T*}&U|tiOxV8chqRN?&Kq(%iLv=fL$r+OM?Hqp)9QSZT
zBH`Q@MGtIg%Iz%3zyqTwAL382xP~2=g>|Yrf+==ZHaDTy%^Ma7?gWzyIpx5Fk?cgL
z-6-I+1{#KD4Z<KpWb2_MiB|E(U=jj|7!#bt!JaIUlmd*=|Jo`pt6LBNngp=Z=mv$P
zMhc+WWObY{9v<DpF*8uYrA#xq{M~|sXImYcGJi_hgTZ3gM4x*?gh0V3Q!E`Q#4mnE
z?+HuGCAt_{1I;?ez_uE3@G;<Fd<^K1n}3kl--3+$0wYniFl+?KJ)Oh>s59)mgKz*y
z-ZL#SQ|?}fk%C^4busR}XAFP#%trfiP(&3CWV!W^YZ$i$K}{dt+f$MV4$d{{-GE+0
zlc=jNxVRUE>0Ri>t~7FlJ=}WA%u<`^4d6vMgET8VNQgrP(aLv=@zBk#(-oqlxg{Vj
zx^69~9iSxj2ER<V$rL;TPyJbnmtYFut%MwPA@wMho1Tu81)$4_V@()CE@M}PV+=f{
zS(X%3Fx!6H4Nhm4!$2xx%LG%n&=eyXNOXgmAg^|O&kb)fgzO$UD^OsVI>!`jEmcdH
z^6ChXKr>3{$(BeXk;-LCAdOc{8KPG+EuyJZnFHz~NaK(WZx~<F8VY^M9Md{NktR}U
zx^?t9s|d&JXaa_qZ&2qo{y~peTi2XHadakQ>c3>}Z|&^bZBTKt<9$gd^hL9@D`i+?
z#bg95*ai|rg_0Or$`dr?klb`Z!Jk=BT!|=WZFEb@aG?A#uSA5jVD{SP84X0mYaq6f
zC6WOU5@o!L>2!i9q>OuVe~L5Z33OhfBO#QTa8s0MaSI+qZ_^W_4s5<V2K&3r(2xlA
zYnhg`Y-n0jHJLaGD^Wlb=%me;J(9c3Fil4ekbA_MkjD`*u}7nOKbxDmYminL+3uOy
zAc3HNoB$3^Dljy1NiCxUMrel3M#Ml#G9;6g)1Ubt@EMV5N|Z52BuHohGha6<1_Y<q
z#P)=X0JeEROvOpS2;}OhrI3K+8B9P5`+`BRba6aDrL(meO>iZLuahyd4h{2y3?buo
zSj5z{j!w#!2%Ri`WuDlWaf-FbX?D@Ew9)7ulxTEUPYHiaf+z*P$(<vo2c_uPlA0Lh
zpq(q$y+q*v4UsAlU40@cNM;TQ6@_VVW`1;sc<JzGy6H{5gfj((;2@lDWl91KrLzhf
zsL|=62RIPy(uRP0x7(Okm=u@u3|U-v0u4fEnGMm?IqD>Kk-_;@kJuFokt$(&2aHc#
zF%%Gl(%8Z5l%Jrc`jstI5(Vk$MAQ4)Z%M@m8N}HG6#$J#Mt7Q#wqM1H4IKDBI1sM*
zz~sk<g7ndtrC~B7J1+BbhLI<!Q$B_yR+VbtRJX|x<d7BCuMM<heH^&6y<8frl)Gdl
zC}_H4%9kXFmZUSKzd&QJHP=}AA9TL+NU08U>PUo&pKkJns^l|k9XNuspwcHN0(8kk
zCE%+IuHo<?y-&k`o2S66ee)fjlyNdk&fS;Mh+(Qb(bH#;pz9w2Qz|nL3DaEoI+|Aw
zJik#y3@|j<o@5UrBfu|GnDz|h@c<!$Vijd0#Q^0B`2%iRln$*A{$wc=n229HUYC|0
zL>R@9VM^{*_m>?j`w#jsIZUI;pMGmbMwZmgYlW!QcYgF^bIy%EPOQS5%N8VqKmhSj
zyfmR8iHQcUb>+O)K~z29T3f%;3=)Z46IQ?Ofu&!><esIU#h_9}%sv@qu+)qSC$4OQ
zE!a2XrGH3k2VlOUy%(0xpWlOg+FTwbP<Duj-3=0;k&aLUF3NEQ9I*M^nGf=qfDK*1
z3@kiGVnPHfqZvR8+(-;gVGDUT2<YKbgkNr;(A=e{v1)@pfUtgJ6>;I82V@KmUW!<*
zaDhL94)DF{MGbj3`I*%2AH8=U{smwmrw9U|1mqM_hy`27GNhH%MuL<W8wCKd&dTDQ
zP2o`rVY3#%E{>}>dT0ysS1;>BtH>r2!_+laVFIg^2t0^)E9eI;yT{xF%{Z6HG&h{+
zTtwwP1g%8HC}-#H<Y&`e!<4%qA3Z76&lJE=23oO@uA-F}_&y-X4OWPkic~60iEAZb
z#ay;vzly~SW{bsz>;#A5GvvMS_aj?Y<`L0ZxjV=P8H@~(=B48elSx}7vg)A-u3rg2
zL-5|t;D`}o9?556b_CRUKtGa}>;o&mq*#JXj&g1QfkG0&6gA)g%RxDi)`c2>quF7o
zBmM+UsDr@2#3gh9hnP5-K?_CmwO}&!da=eo@Q}7tJ_vOJb{25s{#W4Oc27Yth-BAW
zL)0kcc2B4gS!ymSl2U;OFGj}SyRoKGD_>cKF~DX7n*dmtOw8zJAq~hEBhtxL6?Agr
zgkSVe=%I;Csf9GDr~PEp;xbXESgwyTgHawlvCx5&#ACNYdH7lu4aLM11e*?$$FR$U
z)&0MRyBdJF#)6jd1xc{0JCm;^5nwX4F(Tjxz-iYo4Mw6sdT0XOV}piwK!-jy{6#vS
zzP6}9gDC|YkV1njy(p#SpYDiBOhXG)46BHro{NUu+QgAevbJDG+`uEgm>T49EW1qz
zc`X%^S)>6>gGeKY2?1Ww;1GEDOExJEb;RumfMt*dwk)6hiNSd=EFeuFK(VBn1B@=s
zrNljw=x9RQOq1EQeO~*Hhz$yCu%gP@2>e~hUut7D3q>f7cIGU0<Gh?EC92j5gp4XK
zv~{xw+^VL~a@MJ;8xo?B07Mc4HKxQr4~#M5!v<noq65qdNTfA=h^jO}<OhZPYS4&Q
z@vQ+9RNKA*)Rf&qNfPo+uLz97^EpZlRYdO!6ckm?@qJSbLR?oZ#4t_!1rT`Ab^!z^
zft4olCm=F*9-@k{h$RuNCejVC%#v}ky%55Q^oo%ueWGE2;{yzJ#%7Sj7Wx57pGOO%
z3oc_Z*>}@p);<GcY;x<*WklM6@qT1Ffi@Gp3nQLa%Hn0VS{12izkit{NqTcZ7xT1?
zF=>ws7Y*wXmr%+BgOJ+F#UKVOsj{&BWR4Bz_u=)KGyRal4alD!5bV%k8u0FIa$cqg
zJ_lvl(fMiRPJ9545b)iNV@L^33cG<acFjG51njA>p{50gWHZEix$xLwgg6$Lgr`-4
zrOLzoU__gysaX`~Y)m;fG>g73cD~L2E5jq>s(-?6z-`H)_?DhO_DICN8LF)HrGZK?
zs$Pzr`$iW5MxK}>b*|jlDi3Amma1kku7t@o4`?EOc||3}&lJGm7vu>Vq`(ABh2kiB
z&pB&A<ieR1%|%aB9k6qr1w%XCHPz~WF#X=6h+04-lwCmTwcEk<2Y#pYlaLVvB($Lc
zp@4xF6a(s}n4vaq<P2-wfe5sq&mQ#{WibfWv^Ero<2;77I5P)Zg9EaHfOj<<fHmNd
z;iE{H2w6Z?h&@+yDcca`pk>&Fv9PAhz7l`CudJbAf|Q8WlydY8DbHPLTSLkleO)$5
z@ANJ%nao3oi0w*h5mV~B-q~wVK|{Jenf%!p5IEgCx7IOeby@unWb*m-M^ts(w~i&4
zNh3&CN~2j|+J6j&1FZIvmdnIIlBhoc9`X=L6_bqmac2dN5?=j^c05>%gKHKuO0dFh
z`(BZ{(6O1)Cts1GEi4J}&@Mp*j8N?ZYLg^a&}lx65R=-4V4@ECCSw8VHuGtV069H%
z(Jui)l?)reYmb3>x>!uDG@}bFJpdKZEg6RAchRs0ba@eAG-&#g3|or;no<)v4!#QA
zQHlmGC{09ku|Zy&!|;N@Q_o@aFjQ$vIR{_dCY_#$svHOL2o0ch22U*Qt3Nyc0q<~O
zzd(h_v0Eom7$O|`*&aa5e`Cx6BlWYS*T(b&T^beTzX`gwK|qr`578C2QJf~_V%n5j
z$Swd3fSiCK^bqLd(?!u3@_*6+aYFxqRCc-tgCfed*Xk-Jk|TT*%A<#*3m-<sxyDc*
z@l|bHQU<W9z|XU?n$cv$aG>#WhlZa{Pe5O;S{TC-th}EaHAzI%#u36}i}>L&3Y(aR
zb<<Y&osST^!A#(vQ$muCDGMJ-fTWV3^EF~Lxl_FnJ`_76wp1jOz{zA2M%9<H^e}!l
zWx64Rwu*dZC?yVMwI*5;MZT__@gQaR@XyrNdto;)AIRbNemMWVrZ__cvMim*+2kid
z1Uga2BY4GN%%;eUsZ)_aeAYjt6#y|zb5$7jBRrou-npeUFT_&VX+Tl0#BPA|x0uB}
zyaUU1I)1vb6?M_(sVE{_XcGgAtJ40)3{C=>a&|}i0Wt_eK}^<|oUL%+AV6FrEefFZ
zQ<)>HF-6so@Nj!aXNJ@RB!TrhUZ`>}c4qx8b|m<gQGQ0!7YcMnsIf9?aR@{YL>fOq
zRN&@G69L_(Mdb~LsnbmpOA_0j0jtm*VTDW$<WNNp@D`S`a&sA3E+L+^4{`(c1Ab2!
z<L}4%)BK~en?jMGKzk6zwHy#woTJz0`UlATkOT_qVKs(vA1NvLsZRo+5L8No@;_Nd
ziG%r;sAK|xm6?Q35rwm4r!doG`%OY4$#%vw$DzqFXxHbK&W?EaqoGNUFllKQTCzx9
z`6g26GjWlAmmw209M;#3EMUXmw=FPnQIgTpJSke^t{Vk5eQ74M5g8V&{MB4wNW`QU
zBA|_Fm_krg+W}h1J!@$%UKkh%l{k(y2C02@E)2%?h}pzHkq~!Y=e|i)z<5x*ycQGu
ziggfvR;hhwJ!+@y1fa$kh<JSFh*N8BYMsCvLjh<8C;A1Tc|$GlHPzCkZ}kY6D(gQr
zi!x`%#kL0#G!9Dz$_Z27IZ~$sN{WeuBqhXUpfoXJF^n<f)X&5x<oNL$MLoV&!5_%b
zQvxVEtib?`ozqgU@fk=b(EuMI5(=6Ezmx@mJaSv{?{bh{zh;zG*kqbi1p+hMK7<Zo
zuq!2mupkog!IDihMyb*RvZwhSe48J+NAE(xO)?eNOH;9fGv|l_-J%hCV_$sbL3$zp
zB1VefN^eA(dgLIVA;u+YSS3n)u);5bWM_jF3Iwes-Ko0BC(Dgxt2S0dqKEt^VXb=o
z@U~LBPk_NEIUQ1r%H&U_v-a+zvk<9uMidetwRhGBM8PnC?|}h+xt``<kPa$K)N4YR
zVZ_{}N+&dlqALBF!!7-SRU&bU1PwJ=sk^vRtlQd(CK{$(mO~&fSo339sf$P$h4ynv
zzHKMH@z}!S7QrZJT`Ib7GD_U{Jcz_iBI-n?;XosP8&~f{p4z*(rbkj-%J(4T+Z>8H
ze5#r(jm-_-!Zw6#gt%%NNIX{&HTea>5f9~ugpdIVyoes^A3N5;p9w?laD<4qq!g-v
zbP1_h5jUa|G54rQ2BoQdu?d~)NGeg6pUQIC+Wf%ct#l~B=_REVJ|b<*1bPvGA4Ekr
z)#MRM8SJ@uZ}!4qBF(aYb$3HuO7>a%V-Aw!M{EkXAmOn7g9uM+aN!Pg%lQ7l4=C6f
zT6u=_MMe_JAOV#F64zzud~$(m)AkRVJb2`VslwO`^*mizDkNq&Po9hnePnSEvCRRs
z*&>wCm4pP$kVr}^pme{V5c6~#0C2nI7((bI3N1nh%-70e0e@r{T<;<AmY;$kfU<rV
zv#D2Jf)e&IYe#k#fKZ2dOD140cuNd-zzLBXfXDchZh-Nl=97~W-AIY>1XN2hBC?34
z?y|-52>M4ITpYM$p((MYej;N&Rt=~CU~7@2TCedBka-e$J=znl^>Uh9CM|_Gup`tQ
zj5>ft#ZSNfL@-M!^p7yYKiboT&VjD?Op2rzuBCps-akl$i5OX72C@k=r0;b?THIXt
zu|W+l3X7xqM+3_Sxab*W;v6=aB3c03VioR8bYns>K9<-<<rl7Pz&4yF5Mul?-$I`+
z6AdC4-`<Q=!b(bkTH2(O7-6R_fC)JQmmx=q{#G#v@ub5_pSGevX;gPL?qvv?jR#U8
z0JX>INo-uZu3<*$nj<Yb`aq<g#&>T?DKzXuo<H@hqsSdXiWLTaItVbNuI2cpsfy2)
znH3Q!vxg=rK^DLcZ50dEKvTFZ46qx>DSQEK9YBr9rWOw{4Ayq?j#)%pfU{_zRTR^c
zEMcz@aELaZK`32$&?d_IB=VG3%#Gy$S97}?6XYW%D&6t#NE=|7qFisdm6NcKJvOi0
zq$vFL+5t}%n3G}OwTs*~9guT{F{n&x@s6c@urWD}P(o!>r4igin2B;Q3TRTh_`GRV
zy3*?|iyu;0xA;s~0dqGOGRP7HQN#I{%Bx+5q@Uu4EQ1Mlg5Vd5v{{2XpHrI^P=eHL
zmg7-`$TS+h2KDcfyD}x7*(NM)m$ceMU3LF8sPHGOlf$C*Iq&tn56dY<l4VXu;sF=G
zU1cRQc$MJ<`y2P6;#sj$$YEw8%`^Lj`91d0{A~+0vq-$qW|pd$LOD<ZA^ma2)XWOj
z6?$8<PwQj>YU1KrvuhctO66d}qev^cnfKs7a}4KNXhhHjCIAu^=0stX)^+yjWMi4@
zl$@EUZ<{g16=sp5YIB2K7cT`t#H0yG(Fi7!rKajj*iD!!aTjJ)(I8-zyg2P;N=Po_
zIZa}M5=lfibZS+ujdD9k4pcHU@3xuYl7pD7$w54f4OE52q<JI;@gUxznTwm-EI==N
zES;zM1+X}%Qd(CbVmP3wt{OnEQgBc2R)RCk$NLZP58Z337SEg)!DZ`3ToJ<wBeTN?
zn2=npT2G3z$`tg84sNbVh-?6m3{@NWeIT#L0Z>kVK-;DUX88;efEXVxbCLjBHO)S(
zthENUbbm5h5%@$6KlYP|p%?4^0~$Vk6xAjmhdxE$N9IcrjOZhL^^c1bSG}2X)z=0U
z?1<#@+5>X>>iibX@#lR81@~x@?wJq5FXcCm_3tOsn{KWs`zW)<$SGth((Pf?fH2!D
zGrVgYK4hN<O5l-eL%c3G6Y=7fe^^Iv@OR`_AXVuA7*~r}qd^<BUkO12>7&dZKOIVU
zekQ%P^9qw7HnSZ3T22x9In^|0vbH%0@$9ZOVc>}C>?-&xm1HvS^H=cyy;dUFABKeA
zixr{ds1!MXtQ%hf=E4#La6I8};G5MEK2(v^02YLHFURfnOATcr^(z|_Oo~)rVLWNb
zf;xDK-Fd1yc5TeI)?UL9l~D>hAlh}ar49)&sAA_pAQrZrL03u?B0h>3T*yuTp5`?@
z1|*apwD8c)hJJ5$2zN09!{=Lru%jz(QBv2Vrr#%g27`kN(os^%mZ?~l$moeZ&iSMy
zw7^AhoJG9&C6$s?B$C4kn3eAm7UbxCDq}81D?VO|DFKs=3bg8(v)^57?Nk@6sAxx0
zrrEJTaE_Wl-ww=66r0iri6Uui7|eW^mn9>Oqn0+W{mwFsRtP(?ONE&}sJAI7NLw7B
zok!SY9Dxf9zmZD@vf6{eW&;3D1-XP1z%#XPV*J|0*m1zS!Nc?Rxb;x8Mul}=Pg*n-
zc9Nf#eM>dr_C8o;CfE+Z!1_tZo#CVr!G!XY>;BfL4q7R(ZU&9^&{r?^nr;tEZp>oa
z7cH|i#=($wA3<!D*BDO=KrKhBRp8`dd<&sD%r9E(5$Fq0CGEoSyR-!$p(a-IPdHIG
z+49~j9N*&<Ud#L3|BaUQuD}0EiXu)g00C&GjltkdQMS6~E;8#D7^71;YY$UKxs_q!
zLoe$=(;oT)8XZ8W$Ri695Z6H-Rn`p=!cS5bzhuG-t0DY@2!r<BRlEkatvzXoJ3DD&
z1ULZ4?jH1$rj}x{1sI_c>*2Nx42q2I{<I(o`AGP4lo;c&C0DFo0d5rr#|M`p%ieJ=
z8waG(mqcw{RyK5w<Q$#T*89fIh&BuZ65HFfZ5re!=yeS#&Fd+LJe)5{V>lJugzmw1
z)3$&iaghb!^yNQ(ISu@mf<;gfvA4VstAs=h((ZK*5Kz`4iz^o@YI9LQ(qeNIKRs2!
zxJX{nFoT!yO?yje2?4dq{s!z-iKy{^*W6>=Kd4B+%{#A+1~s5dWE5J^|Ji9mTh|e@
z0d^Ry5#6x4jJ&1r58OO%&ka7z9VanpCh*E%QxuhC#E!Z7LW_YHh=KLJab%M?8v=i{
zOe<!hhQ|yU@iReclVMHs;<{5Gza{Ru)}{KH2XVwnncZq;9Yof74{s{9DU>(i78ksL
z*JhlJwJuExAIK3x4Ch5LM3m2BB3tZ$99ddai0FdO4r##xEQ@$h0f*gihvHp929gcT
z4@!NsnAATMZ4AZquo{vxC?=49QPUygK!=d0ut8I=;BsuyEe@tj8lo{bGLz~WIY0xF
zIIN72moRHO{>iuSt^&ow=8BYtBxeNFRpKmgT~0v|Oy<WiY;wq1&c8Vq@odGf%rb!1
z2*CLvVQlO|#bKkwCWK-d4uS)vE3f1drUDX-NZXv?v}-Y0f57NX4J$Z6%A&k8KBE15
zh{x}BdJSoRlNcU|mrg_&3)rnBPeSMGBsX#(lpS2OY@uCI>%}KBb)uv|(LXLD+&j<0
zBy7|=b1;Mn@wLQ6!sK=uq{hj@%uI&3#u)r6v-4=^SD%wRac0al&G;&t3MtYg<}qj*
z?s6$%`xTHABTVa;kR;O*9FP`Ji3=XY<Jc8mKkyYq5*=0G;c$zYD9#)Q9}*JbAc;?U
zxZ)SkOYykj#e{1phkF-6DSi-WzDF8FcnfHvZIyCSmx<Y3%-i7LoSMV{%o1)fd#0AX
zNAp5wgmvmzo-oX`lg677NiBnRbjUcVkAJNoVl0_QGh6?M?<_1?8lp4NV1y%;<wc`B
ztd5SkzC=f}Z>`LSgk$#vFj`!KwWP$sjGe&)s>rGvtK#Ssb%S1xx~wjQ;kD;m&_$Kd
z(S^#+wo&~`$kO0N$RK91{5*)mL7Q2q46xBdSxpfnsuQKS9ub)vE$dnJ*5FlH0;*kU
zP&jV{W(k|vSvGJXLB4g9g_6=>*%(KQ2PG&N^)9e3z9DXq*?Z6`>Rs{E704yEBE5`n
z-{u7=cD(BYitQLRzP4x+5P$eMKqR+o7spfp$>PG!UU_VtX#fz?U?#JnwoQu-g*9j>
zmGy<Fd$+vu!UnsPM;h;(8h`<|z?UIrhRdJ;IZmjVkS91G&l1##7*`WiiD;-%{><4V
z!A8_}Y2(sjb~-;8FZ#3Tay(sL+Wzs<<oIMZU-sVhZV%_9!`b}hMz23RKAufCdds&b
z<6i&8a56>v!^!jBuf4<h?6~*wcjM)Y@qB!G{LA9%ff|4OpMRbDNb2>jw~x-F{rPaZ
z7#=JqvuSJR<(r}-`sC&}(Q7t;yH2lXr-z5*`Tp$o_)Tl`)8*u-n8x7y>$KO~IXD=f
zEFX^-r$@{F@aX8-@ZjZQLvKc-os*OK?A7q-@%Znj<Ha%_TWkE4XmLDV4v&Y6msf}0
zWAgyiozISr#`D%`Nql>KYrNcB4wvH{QAktdmwE&0PoIwmufQz5#`Mei<X|}-<%ajh
zi^UkN=B-dY8!pD}5WVYN$GbdECSF2mMQ4%;l$pO3T=&Pz*N`1DU4IAl(t`(&cW>?9
z|J%L6KC<z9chu-$HhndoFTuC{*^TkR<al`0iUQg>!8XauMM2fU^2H+p5rUZ@hlFkl
zyrOaD{LS(5;Ki-s;^uffSS&H|a{S<gQflnCH)235K+lJZ&BJjAS@SH{k7friA=3vh
z#hYHwsnkE3fS<b~5h0!>9NV9^N`v<eKzqH15ZTG7Hd`9`=43jG=^TXXZ>8V6qe29u
zN$LkNjc4k1{cX{{sRvV&g)X713`O~9k-M{om`xAHPT02Ie7(6e!ngAOK3m)ccSP*M
z?DU3<o?iOs#j93Hn08F{t~Z{~XY>ASG+u1<<|hXO{)wM7D&&y;-2yz?ZmMr7<|b3U
ziiJy}Ue}3tz2Ru|X<-Xjw7hq^EUe~m@pgK!dCX@8+1~Z;L7Qfy$K&S{Sf6Z@sbd%$
zuQuoYuF_3rYj8YSF30nP>6o^x#O+=0;Al1--x!ZiHhRaylkbN|Fu3?Ro<ARhV3UKF
z*WYgR7VuL1?_@Ff`|0o~jdwH~4Hqve^S=6wY=kcv!C8fTo}NxdY?b`fyWWlQ;Si?Z
zwEgDM>~(6qbyX^kM~kbCR+YK#PNw7G86(u%RQl8G98VU<cZYAs^Uuy0sH<^h#JvML
zm$k-gZ(12`9}edXsH#mWy$6gF76-%W<MHuqNtKOoU{8TaLGTyjqZ72fdRCXp_y*ZS
z`P!DT%GX6d*QVVmVwcJEc>$F>ftI0K8s8Sg#klW!ovkiB;ynoH<bW}lEE2%AX<G*D
zYFdHt;dnZ#;;eBC1>L$Dtmtf884(ukm+`^!?(8{25Gvl$EJuo4SMe8~7d^6nyn%>m
z?-Z{Wh-Zvf=6~zLD=WP>d{u3=H$FI>PnK`P>6MY%9?+yl--g9P7&$-yVS!4)?1#ho
z@Yp6Sp2F4*>t5mU_+UIau?Xxb0>$z2#`x9bz(Sn>V+ZjbgUJ&_5%wnQjUg~OK0O*T
z%D6G~Ijlv5AZ74D;ETb+ifvsb`6}j<fmi|m05R3k>}0$jp;+;*?HPlIQ=54&0VwZ8
z=T$hpmZ^J)k0&DpPY5CpC-dX+Xz&KMemXoVCM_gYp6cq@+t5RYIjCSn{{_liS6si*
zgLo)H!=sJf=?Uk<&&IINht)w+O9XkXtr@~qyF4Ga+d6|A6Ko!WErl$<Bk=+4?sT%8
z43Ave_NK#=#fzEAi-A$l!y8p7YZJUMVXco3sEY2TZb+;e6VzH{(Xm;M<Y_jA4Pw|f
zj4<O4^k+6lU|dYSz>_jK()4J19~{;57Mv6yl^FHVAqyHcp~1;TlEbniNo}}3oGnVQ
zt`Cof2<Hl7?7ap93cy?7TChnud~Y;{=)xbAUWy9S0B@Pac9YszjzS=TApF35jK$UH
zAr@=nn^-gt-hjC<yn=E{${tPrQBGA@BZN4+4?p|z%Rf|6=ppujEZ-Z>UyhgF!h<DF
zJ6S+0G@l-7qR>ygDO$$U-NRynClFc&r(;`|M4NjPtm{vY1ECuDZ)7N{4>1>@Ow-lH
zPeNEHS<F_z^I$%CKABdq*ng9VR3Fs`fNkZ_f1O_a-S0q?-!XC>!e9)0$ZYfwjFgtL
zSotov3g3VTEDq+AXJAwB1){;_toPSTLrC!3WAN&)moy>=QS%<+%iil3aL&Dx;e5I1
zLFG@6M!jd_9s?P$dpz1=m#cq8pfO!65z#s@-}GcS3PD<I+oN9e-R>>trzX>|FoI!r
zidKiiBlj-9iZ&L1Q;jY<!qITC)OvV4(t`E=>G3nbf3e|y74^q&lv6USZ|^+5ar43B
zJH2mGifQZa46*sN!l?((7)A76PnIuw(=mvjwd~`CNGF01xq?E#JnqfMi`mgD@(O$c
zSByKkSMLSZ1-;2(Z*ht|&th?SdL(wJ-FFxTTw1>6FbJ`Fn_N3L#~s#T(Wtc{3Q#F;
z7)$?|Od)izpiF)ZpUqB}fO4{^59ktd^=faQZzo91%@2nM<KAodI9d^i5o8KOjjjJ+
z59^6#Z+?1YZQy<+Xcz$!&4daGGVJ|K+w?OA#P7q?<th3f4}XCgpveL-ff(pAUL0Yx
z&Cz5re0DV6oWhiE;>o!89lKK<PL`Y22&ulQ#2W4Sa&t63gmqBb<ge%`o@e+Gy^yey
zbR+V1(D=WY#F{?;BLtvVGMZ%DE>)Bd(CAmG^#5}ds@Q8I)N?oC+psYt(f_;1w|g?9
z!twA8UOybqL7{>YJqYj{c(@s({<a1tC)xBPGtravkMu-uCM!dotLbpGfW)!aW-nzs
zj_t{O_}Y0=>j~ozM<2~Q``gSLJt)x<t2x@O>F{_gqvlf#=g&`%nH}K_@EWdC)HP4R
zC|q*yQH8idrZ$kaF)04`&+s$+g8)=I@*&*K{5j3P^8fL=_v?>8NnP0hbmo65W5Jd@
z9e)fXbGjgIKM$vGX?)-Xhoj!?u=n%nRQ6&#`dQ8xYwr`-#%GfwFw@Nb&wpCXra#-*
z9G^Dv!Hoyouxs-<orCNr$x&%@9uqd5ZGx&tlY_}}6A<QcNQ!T_!Hu^GO9Ak|87K0w
zh7<j>`RIs{ijYgPX*&}Z;($DLJt=(M0$Q@uJ3^pC{ubjv2ZpX`66Id@wkGKk<ISGC
z{6ZtJw(h;0&R$RH@RRlyj+77;!*#?i0PHTJn%*JP{B)m8#P_Ba*hEZLYF7a~e5h|W
zD6NjD<sGG@#Jl05Ts1Os+b|yov-!v!-A19l=JYxMr`G-Wa{M;5?x$^sy4Pf!(mfDm
zBwbEnfavto5(X~602uMpBo-t+co@)S+#4Zx0zE};?qGamX$cZHn;m-lWv{<;zdyM9
zx5qpC1CZjgt<NApMR?8Z)O*9QI2i-})04LO_Z|)gH~#kIVHX6C$0rCbXfzoE_I_^V
z<Tlrw4Do;N*=FS0GH|Q1Lk9|E@u<G~F9``u6I6i$ZEAEMRz+cYD_8>QuTx4yCh0z~
zP!NSIibK2T4POl>M-0$B)-AOyL$o$lw%M})I<0V3F{?m_$*>W8I=85HW_xC7an+eH
zBxm{mh3ZZg3=p4TcVI9jX7ssFUqI_2&xP#vPEMb}#Jr%aB0L_RE@up>4`3-6yCX=-
ztE^I^o1jE)*A==kKP=_tE4^?2*n2jc9gT-vopf5tOmi|Dq1q{Tt9wol@u7yUOc1Ee
zy+B|}E}K;Xu6h<ae1c@Q2+Bo}nk*E<XwZUw9<h5isU#lkfJO5#;s}*MI8Q8bEl`pc
z_DYN6j-hKgR7^2&*9p?c6m8?hd|l%*_0kS7)-qa8K=iRd<Eo9|WBsIbO$q#>J~&jo
ze~K_+y2Q5r>~tC#5)?BOaYmLguxmPFNP!T{I$)uA!ZpmIhvdp8^Do_V_$H=jVb++#
zcQn_UBa*0187A4HQh}zx6yOyz4od4+C}ex$k!{5Wno2)fa6*)gXgXz~yXFYb5&76Q
z7C2pOhdW|o3<#5A20G|)pq*qOV0(%!Q29{ig^LjuG~|pp$htIKGPx}yVIiSSNNjRT
zGDt-L6nrOOL;TfyKEd8(4=RJi6W967#ULfX#WH;6Y~C_-xhYYix!`6+^0lxLu$pb%
z$47{3$D^Im2wu$LGD1NW^vDs#RtIGpnz!&i0e*d0xcd6Gmc*vhaz}?!ctTDagD>(f
zQ?}dotB36k->d5Go>RZMdzk%N+Gl}P0c;`iX;rK5>0!6~g-JY)LKtv@1{P#@Ka6nF
zYh>yO&8DTCS-B0m?;LUO7ic_789}I9Q`#&}?qP!t1vm|baIJ*dPx~Ag8_uJ{hqh>O
z7bRgHRY%~cra!}tSmsDN!iCrT=q)YjAj)O9Fk|FbC&!|FPmL5o5@~9cT+F2+i8MLX
zn3Yg-0~t~C;gco(HPhS&6J#!-R<yT``6kb&82n}o9pEqcyzngz(wY_6#Ez?WUYrl$
z(E^GMhoPln7J&M^#nA3S?_wLCX~2S6;m5GX!MpkpFJ`lsRIHk$>2Yh@t>GbZdwYg4
zG(J2Xc1R}&wC3YCpgwGy+Vw~R@~lGNEi5dM%9~mqn4RdvO#H-b(goBeA<)06BL<%3
z6Rk*V{9sBVlEo`v@(d(~pK}`n3+0~e7r<3>3rQhM1=Lt!C`HKK4#kX31QstRCj!0T
zNjv=vhW?B3!ONy=Tn~OM2M=Bn{uWhRG-1Qqg5@d#@7a7d93603=_Ywicpq8-yB>T+
zv|AzOhXxJNQsy>Aawl?6fYU?_!FHC1l$wIa{`=`<ZtG2oSWP}_VXujsV?`1iX@3|(
zo}@lrR`KOHc`d3GSfQCPp>El0QGFR^Z}+Yj1$YSOdl9v|%5N8;etK7ndfVGDf~~$;
zEBs7L4Bu<`FJEd{P9P8AE~zcLj73V<2rFVo&Q2m|$C|N4WEr$V?a_)%rn@6Fv)r>D
zYel5ZU67v(m4XYN_5j?q2r|#)E28b*85NhBCUCOR_88|S$~Z}?f#r6ps7&(k<HrD}
zweiP4Nd)q1O%U|-E_xR28gU~UTXdLcRDs*b_Tx_p=rTGaO`O8pEaX$qvH{YmDMcC(
z>{a8#0M;f_qX^y#wlL?n+YAC-Q><4rjH`<CWYGxJh=733>tiJ3Bd)6C#Ikzci}#wg
zE!e`SOd*b^<2io9zbuiGF1evOU(F_?^h0B{#8!Z?=@&}0BTCXnl)@(s)e-byxTx)c
zWU9HB7+EhEKhnfhYMEm^kOFz2vi98-jK%X6<*K9=?_o8L@d`%rNmjzpj{4vxZ6X{A
zK>s{E`mbV`%neDmwO?WtXL`m;BZ^GP)&iR{Jc?|j@Rw;%yTmEB$s}oD*Nz+wlEo_f
zZ#qfW5WJr6iB@75&Ru{``Zeb49H}F&xBxz#Q+OzFK`>#tI(+s;VZ2;O35ivjpet#=
z#~t)VCkeU5ep1$v+t`~ARp|X{BH2uFGqmQ$OhjDozQfk^%Th(MZ2zj5G1XceB#*!x
zEHa%R7r5qL)oKyWm+~c+DQ?NVt_4Mzi_~Hgi+rt~kaeZS_$Q-n6W(;j#GZ%qN(h`?
zw%^h5R?QRUx_u~cHRGJHw({&|!ug^|s|K8z<_20aM*V!gr2^A>X?+<z8{+4lAP*rZ
z$=}NO`s|g|e*NVKOYX0SR*O$pB&#x1<dx2gYfCUt8BaU{0p3xL7;10#e*Qo2_@l9z
z@$2@Pz{xqB4BsAMxwPH;Q4zV-6ova>AXZJSuSb`Y*1EqZst7$dQQC_LeXw&;WHned
za*)Kmya!*H#8z*m-s};J?LwH@0Y<s@#CuqE*hML=9l0kb#n7-;=NG&^ZtR^lhB+5?
z1xj;_pKEkIi;x$kL@}<18t0a@l8Rnpc`gdHfl$N#!crxdRIK?vi1ZWy!_!(}_<3zs
zL9{f+MX8ns_-_!J8>lnHV&FZ{_Yp3Nd;n0Bm`XI(YI=IVegK`hiGAz$!rlhBDDpmi
z4fmS1SfJNbf}Wk>i!jwy<Lp(<ht?s)f7k$jKPvhV7p7x?P@`m_>8&#K0VL@D_%+M<
zBUFA5MXHT-QCif7soRu)lVUj(?@x~RB*T9%`X5j#rXyy4-;)|RHN#Q<n~37+1#EBZ
zVNd1#yiQ}Rb=L=lNob5wr%TcHUu8ZXk9n-%y^LoJaZ%Zb{&nnYZs;sxB>&Upuih`@
zFQ(`6_jGZ=b=7`O@>IsTDD^6Xd>9gbI6|p@?fs-{FUGhqfntCULmVtM|0Rop({#S9
zkdO<lD)ULT`bg&@;R=A>JIY}qF%@x+b>qPYNU0U*<_xBAPD#bqCTrz?XpR0^CKK`$
zXQxV5bY7JMSk;XiK}B|OMbiT3SfYz4>vc(s!*ld0mt^bBQY>TE>`+GR>vgFGrsu%N
zd!E0C$2;ff*oX<%!!3O1IcBOjj`Q>jdwN!%GwcwINHxcv_DavSopEL+J8iKdLPJS)
z_w`U0$zsQz1-2_#5tlYGv@KaEUN#n@+JgHV*1`T(`|1!se#{K>$3K;?tZ}@lm&U^m
zEha32U(h(9q|9nShn7?;x0ldjd{WyB7~}j$FBS|Gj<Ka-!)AbdANx?Fj|J5I*|L0z
zN~_Ik0}r#mpA4_-fTj!gZB&MFG*&ht3g3J+8E#tb(&mX318s8il#^6WtYN=Kl}0!x
z#d~Q=W2_t7%A+|#4!VPqdK3YpB5a{Tw6(ipqb$|)VPo-zP1(v((dzP*N~SsUyP%{2
z63Ojjo#5e7A8Zm^$W_Ump#0=VV}7sKeH_L*{t9KPkSfoQf+StJA;Dl}q8%#mBDE1J
z5T`@b^Wv0n4ot0@Fqan{V1CdqHz<bZ&e(LcsNI!z5nU3cBv`F8B|V1N8x22-5W;op
z8=W22AAYOS<twr>I5j?>yrM+oyf6+{qe^(P@QwQ$b`}6zF?oZZHn*jRu1z>kdk}`z
z1LvK|ln6X2=&(D2JnW5^aWokEGsOW2Jn6<!cS~RlmL;KPq_`BUiz-oWzU>FHqC&l^
zy{^J?P;^yRH!!G<M-jb>DYkpLvO>G)t@MW0mE}JuT{us9P}h)U<qU>YDMI<I3sXRI
z_VI}rFt+rI^0h8_d{76WqoR$SaT?X`jf>myu(jpA;)!%e7@Y$EW5vMlkb#hS!On-M
zOzT4WeG13A#yqPOtgGLOg1|(Jp`A5|Ot<KK(R#pEIPA`utQBBGc}oqoCMilXVK9G<
zlMG(Xbw+_(D-128*;QJtgW0PtZMjIr7=g;THOto$YO8A4S}|*mm5gF@EPvIB8Eb)`
z;S^LHGXksb4NuZRR<kH9$NOX0#o<Y^iXSbr5A7%%BL*L}loy6=sd}l8YISO7da+c8
zmV~<isWr*y(tbt>TCJw5l@Au<dB|v0_2+|P{Yg5C)&5n}d0>m-&!Xl!D0mQjK476d
z!`G}3wBpyMFQ{z1u)Yiq#M)YcSu4xn_K<_}lNgmc`13(0w9hW5D`7aq)+m%QP6jpW
zNLNX#ZV27(<?EMP(soXwcbpW~T*tW)Qx$V^257Nv+PsVyy^N9hZX;s(v=y3fuClA2
zE(?$=u0tr~RO-00RAAV9y4WJRI5ogaZ3v0?_>}=H!Q*+IEv}Fitna<W0`7Rr1?4iT
zk<h6)Q~m39A&0)nTL2pw%mkK`OaJj%;%=qNn#4%nBvLE1b{SbgPG=z_nL3pdB<*F0
zAJv4x4vX0Svudn|&+VoVo^CQ4^N5ep)E29~UWJr1-WM6NWh}64+T|v2m5yCJFgEpA
z8McZSu~D25ZcgW~Dzny>I$L8LxJu+?F<M53JldL!e%<EfL)sT#cP_0U^U6oJ-NGf?
z3Dmn-k)NJiKEx^6>u;CihjUzRl&lRFzY%g`dR$DwWv#E$LbYNbYXG$xz8>OOl>|H9
zZ5_4E5|qGQRhNGoO>LMfSp%!9YwAq3>2~kqkOaPLy#of<OR%1HJD)Vz@Y`O}(Su$r
z)p5;>>n7;N5zT_MjSFO}XsXfWDtv)u;86n~H~qF<q+>8R=RV3OOd;Jm$Q2=6K9*X2
z<8hANcG9yO;drq~=Rrf^%A-eCm7c4f3lW5U`*&CP6P}DjKQ0|Wd2)N+g83n!YyaYm
zEblsv`w3uOYKInmG31?U&9_v-DYCxD-36q56^t#vL%;(?KotjpVcOz;fpc78&^<%#
zOc!Rlz)c1#hW}s}8nn!@*227?-MaT0tek4aa=m>jU%SU?<?0m*?NhB-m|~7te$dUq
zV&IyObKi2%K5Z=@&^6U_za|F>bzMHIlwtdbl`O^MxFo%}u^@=ka_7Oy5$U$a0Pt2^
zo<Pr^4nw3-Q)JYkzL20sLc&IkD+JDU1428<Wh$!za>qpo9ivpwyOjfZjv|u&tM5Z-
z8NFrs|9;mZw9U~xRtFST-j2{ZO5^MuMhV-9c&ZH3*SaL3WfF#Y`e+D-t~rDBszaXI
zPVr$B?e1LY%7hm1nkkLd%<}dnWx^J9U~%%{E>LKJzav3JGJUXn6xyccf$Vj!Q)uh&
z7H4<;TNPSHspV_{PzW!KIRY<ja<NgmAmtDVzz#kYVON<^!k~yqVu91Vsi6fd9av<)
z>eV26?2{|(Q=DrzI$id~a~T2oYNHywR3FyjjoM2_3;t*==iX@R4yP@dp4+Z)uenjp
z8Ri$QKCSUu4k|xwc$xgFbPvVTs=4<Ut(F?6lVV{qX|b~36c;1&D(r>@^|6y}^S|3{
znZIf?K?M|HKfHB^!pB?aW&EUy`R|&d#M3O-6^Z|*ckNSeBAM0iUn{v5tP865BBb>r
z?zS4wL!9I0Pe^)^RPnKSsN3!ZD<0%8OmQV>c^)hyT|M|@YikSAyv9Cq8dZH1(xgYh
zVx@(&c4<uvDQD#%`5IO0PXOS8YoXIOyo<ejQZ|N=wC`VHbXV?LgWk8_nwV9GaVFjH
zjn>>f7B=nOD!Z+@lODIu)Rr|zzZPL<_sf>4=Plx~^2U9t-z^us02L*%_K_ho#aPVp
zZa8E%>fiI>9X=DQ+{1=3qfg#?o^LwGmL)De8WpUHML!^8sA6f1h>9=2<GpTnaZxq(
z2S$}P0=?@`gwx-Ak5u{Al(Pr~LkP~^$+Sbblv_-*M)OQi&jW3t>;Tt~kC6}ufja<L
zVW`^xSkb(cI6z#p+m*rU@BaDEkcB$v?|x-E*4j&98hA7;y78s)xCUNruhN-WHTJbG
zE8JBDyH)KnlYacE!jTT+47fVpl)$anhQt7E&Z^S8=|+5`51pIu7L~qTu@BO1?LMOH
zt;>0UAzV-SxW1zXFluh7_sut);B<^`g<_|jHT01G`L?*wDwDo6IMT<KU9mhu+siY@
z>e&3sa^m3G;9af1{nn6UUJYgr*P%T-J?ep4ylJ2J;Ohb+nuuN~PzP?lJ66Xk9<RU$
zs@$>t)IerM(>y^<?tTBHF;+a!9UG>hB4N6$Az9nrud)+`Xq1IGl&2Ti%lXJ|pew6#
za`+KWAUXb)0K13*6p{Ck@9+G4A!cos&%6r;d&*gG)%Q1elWf{)!1jh4;T%bEpP_T!
zpA!bDULrjS6T}pDL9EUsHgJ%~Ot&avfm7tTGxb^m;52E2vL$cuQ4zAHe3Ux27_wB6
z(DE);Fuj#*Nuxu0gRtonlGtIzW|Y1g8Wlc`k{|i`#7Ay<==QsHIN8d}HaJQiHmZ;k
z26=xC8zWcfI0K;+L^toA;*A?#;Yu@7pFP5&G|3#F$$K^4ZPvZmHpgARC~4uB`EyKD
zwskvh;o~-=%j}c)Y_0D@1jE&mJc-|Ue%7RCcWj%qX&qcRTkJ-6|4vFZ2xRkhw(p*z
z6TOZpI@`BR(YE}ATEvA|b?I*v`?#ZYTv)MQ@8gDaZfmJ!o51BpA*yd(tdba3WZj=u
z!}U%hwuMbuUO<HpCZ(#N*gDk3psT(H`AryX+QGqc^|vFlJ;Z{4dT?|)8t>0uj&0u?
zAB0BX5*|0M!UcdWZ4>H+*AcZ_hA>^M`MKTZRMswo+2Z3+S8)cGCG`s@a?+)(HLyCR
zF@x3c7%gztsq#D*yQT?Y+-xbK8dxzu*{4SRU)if(3Aktoj!oyE`7|$SQ`w`8%PLo$
zSX=<_Hm7)!TLn5f5-5sDB^wFj^rGyIkV*?(=(8_cH{jnZ?vDB$A|IB#Ym1xNl^8N3
zObXWqO)&6X%$#TWH5-162pb<cRF=ld;0QMvi>+drksW@6nNG#V^90Fks^z8Go)2W-
z3dl2uK7@@kQk5dN_2Tr|)@+*W>&FFIHmwTCPmGY{BHu@|X(^!vuy(Ar=?oYx+SEwX
z;1cEP^~V`SmH*&wYrAne^*G?gwz`DZO+y*Lqe_5T8{Xa9<M#!490J8AG(AY@@c-je
zI0C*NA~!uudlgeV^^G2a@8)dYG)O!{M#!kk0L+D^LXLfW1qhcq<D+P=K4(Ts1#3Lo
z@e*f&_+c~7fd>2}#3@d~kbH?UabJ2kM8%)Gqbdd49I<E6QuK)%YcGF%17C^cdGgRY
zALe7!&M~xxN<qqbjq2r;OmUIuG}&8X%<f^6G-e4YR6fRRdVMxq_W5}V)GDO~Mkbbk
zXm52+KKSTfd6P>|_Lehzy&<HCa%J%&zWW=|DfjGgb24g9Y^&!WMaUA+=fn9k*0UY(
zv&}kdyd`E?(G9-Ah@A9Wm?9^<!HqhQ6YMZTk+dZ0g6=i|!T~YH56EJtF9`9{VvOta
z*lbaaQmy#%{UPrREKmjJ-Kr<8%Hi$XUO)(U^z$$h18EWg3g#abU={{tkRV89NbNUS
z9UAl*kXyQx)n)Hhi3R~#===8Yvqc%2j<akH4|Icb5+8ojJqbB@g?+hqPCb37>DO@9
zkkciTLMD*bQeSH_sL{;6=(L3|7%eUvfjGjIE&AnTK9NpQubY)pJGq`3FPMmGX`1{>
zC;$RLl+G2PB;g^bzGlqu{8*jlr-YIhx<$NNq_PVl#?#h<!3>ea)||s-yVkZI&5N9<
zMvZ#HI#{4*%#|U`6F6G6CipNa^7Z^UPGadCiB}hg#B*WV&~4<RP)|nX$%o@hKSG%{
zsCmyU3JGzUcP>DPkGPIdQ|KyoI-NlADnm^0(NzDe!*gEx3z1?6*b%tg_%A;4$1h-d
zJEUk1_~mThXF#^@P}kmj<T~2w?H*!Z{pbH$zCmH=AGb5`Klk9e?Pka{8cR!Qz~xU+
zRbqGKW52j+7MA|8Sr~*p<OWB>`G^&YfizDV;tqT*QpPw~T7(42T%@8q)-L2cUn;``
zHQhAY=VoCoiec#JO7Oy7p;m7J9p+~@;l(z4PmIR9H{9&%!g}1ghYv4szs5~pOa0Pf
zYoxE3_v4PX2do{~!9EaA$^tkjt&Q=T-$${=gxGF$lXWZLZ9&_G8>2pc*bjrOkF7XV
zyhgr?b=xTZMHbt+_dl9<@CT+F2np~_UJ6r>H>`rTizTaG+lD3_xXs?qY~WJ{MX5p+
zE{%?s7*)rO(e~L}0gr-)IX@k&GrRio0@K9Mpd*yn;5u3R+8`9tHx>0!;A(loVk`C`
zDj$(2-TZs<_AQ@i72jRAPtr8UsvOJ2DEq(#)js86O)!~7b%GaC)<zp1&t_--hvd#n
z1quf`WlDc+pOO2RU-|fWfdYq*+XmzdszPjl=(Mh$6=Syws(NnWlRSR7X8#R_Nkt_!
zPVvh<<>x7i!8@U%q{fGPM{rpRR5)vic3bb-;>(E*Bj*C@?|WYRN0jLqT8A}@zG(X{
zBDYPOUnj2VPWs}piD)uxMU(-q?Por^OAb?4DJ77Bk40bdC1H1x3vQT@^u`=p`qT6_
z{aI7I^gKkoq6o#?iV)}LlA@wI1MxD%HodQLX*+C1ZB5|qQB%=CI2|TRuDF3YnmmQ)
zWf8<HxUbaE2+<s%_9=nXzD62!^fPhg_1vj-E5Xob&%fkTA!O03LP)i*JQ=_|yiHet
zqu_%SMzePj{`DwrNgXqgX$q?&!3#)I{Yv_K&^EjDn*my!Gccy1M<JrLK557r8_}}H
zKyS&2)ysv7lN+$5*jh=aHng1E!Qrp!-2hz4x$7^MRS^sz`NVH}Grd^=X}WT`>_@y9
zlm@xn;nm>n{l|YqgWuXZr!)NnYU4nKmNB(KuGkPo%)5Ls#}|2&M4iuP^8^Ia!gK{S
zGRoG~jS~DkKW5Lb3*iG?2$-iuiX(zh4<I96u8;do;MNW|t5ghWCen^(&xS`e%oMKL
zAhz0=ENVq>SnE|*I2ftcLf;oo6sUpd3ZEGrG3>rGJn?h`;aF|tBNf&dcx1KdbHN5%
zG^8Q3-F=`>%q5_3b}t_l0tSupiWoZCGfxMgZLQSea?b9djU%ze4^I?*Yo@q^n<IFU
zz0>FTtQn$ZOJ?yNcX2Et_Zuy35?V2Rnz=G>rn#}!GnILUlt`)ZEWovHSUo*D9b*L>
z+s>T|MA7iZIe%IkJAvxZ_}@kP+h#37ihYJhNz#}6i`(kP(ey#y!dS3FAy$FFl`C89
z3=38Y{P+!$DzH#Rf7;H#7C04eo=%o8?7|+TpTbjTIwP-$b<!|=p9gVxP+)^q((;AE
z+65x!bQK)eB7Uz5&u~6Rh6`&pS(s{Pe6P<<hHbcwWL)gyX|RZJj<%*LpmuyZFbxy(
zEh4DdbbMnxKDpe{)a_ueSMgH%iZ{%B#s$Ia@{MNY0!(>RsBaVBF><g%HDI7k53(jn
z;lrx5@CiOA)uI}ePL24X@^*p?TVOCov*U_N_x$semA0)RK(z%jH>XJO7i7nxmdA4Q
zTDg8S*U-S}7u0zoi!(;q!0Q?;OE)l;xwsx0;7GNMhQ6w|T`A7BarON`e7pC-^g2J%
zB?`8+qfTIdA=^%>Pi4L?6}Gs-cvsk0OUb~VVKW6Ku}iFhE+Z<ge6NSXQPCUK5TO#1
z>Qlhd8y@jShqqYeK~0$nf%3$6L_<;x0y>D_b_s5ds-UB|@+Os~<!VVwEH2WQ?>XKv
zYzK}q{>OiqQ4TSPU82VpEffwZ9Cfp$u28D^(q=0~AIZLxk!_T#aK~UQ9)<bt>YbLt
z8I1t0)Warl)+)t{DK@b<%)+bAn%@eM+K>WRmG~GIxc&rYzX+HyzezgHt{<ns!Vh0$
zev5BfFJ8oJ35J|%<I1KpfdUYK)knW=gYThQ7xlTzPN6oa3i7m}i;+!H_89jUW~1PK
zTfc(Qg`U)OR%?l(<-4E-K?938WmHr9-eT=((HSzWPuLeQdY{Jg=BAs`A{`3wj<x--
zVzQ`Dw*rX(TigRRXf~KU=p=n~AkP^Smzk&EBG-L5JX(w^T!-+C7uXhCZhH1;la+~^
zcrr#UH%uWvPkVx5ZZ*0(oo(VM4L-CveZJ`#gGEg0G2=(h*9ih8eUXzH`c8;lSbAds
zmaP;VIrqYJ{T-K2{zYD7B$alH1Q{a%M|1RX*84*AM7bKd)2$B~@RmCVvfnBgzoU<o
z6#QB#q5)BY$200l9AR^@V057XIr%+uTk#H$S}9gsK|w(tc<_b~QQ9ZvJ0q6@<eFR*
zZ^EIZN5xitp=^}G?Nx@ka-<&V{Q0t_c*S>P>jip<A?{ae7=HW-wgPphAsv+MnoC}6
z9pR`UTqE~$K20rMAUi8;Y+p2OS;R(;TX?sxlA!Ktq_fZq8LLC=G&T`&0pS+p|5!@R
z@^<hA3AGZr^U?`hwJS)KM8N!BSLqZ4pg`+PPHTgB)vS^nXQpksnk{VUvuMch2NnDx
z9-VYzZ@`@)|HVk%TCf7m^Dy@RviGI!Z5_$E-~B6KIZs46BE5|5NjT$?DT-RgT4*kw
znP~J_5CKYvNP-stWih<^@As{>tCs_S66GW};|~^bPM_}T>e{-xsyYP$Y~Td#80S#5
zhZHqi7{)Jf;7CVoy%8GWXbNW~C|$!vIq3=55}ObD`tR2!TA}~%*BF-1`3#T`=}5Ko
z)3F{7HuWA9Kh#r?ynd+VC4wyE12S@X0ffehkwag2_Hh#VbN>ht1M1GFlS#O7=m9>V
z3|8^uBZh%(4^gCXXHayAGdn0p>&||?Unf^`_D9gH!L!4)4F<QdS}0zrv-QV4TE*TW
zUevhL35KHuV%DIG)lke9!wPb#bagbtk;@x0c+DB_aC8HlNBzlbcjw7^=!dSM9aNox
ztHwfCl1CqgR6bpdD)qts;JbQ%)Qc`;Q*Giv2{R(M2)jm^9)bs<H^SlAKrd&<7LoGi
zj8Ve(f<*Qcvvga=o#V2z7W2Z(q<|f>p*5g?41?_D7+c0ugwf3Ch#lk%@K9EnFY@LC
zYdX~Ly*NYVBCz;)(w~fQcG;(jf5MMPxC<OD5E+9$>;w{aqK^rCz@6k+R;;8fUVut<
zc+U<phiKQ;$jvjhIX4NL1c-{AfKBq;CqKahtbl_=dR(wm`R~YF0>lmc$69v}24*eF
zel3kd-v=y<4XN{U(B&fv5F<>7=B20p`eQ^`&|)0R-X6!wF!cv(Za#aLSWZk&0wq?C
zhA;aE=Ri9m5*}=S_3gL+rp_>#?(vAC5v46BRzl;^vJVIR>@M8HW~=)CE})X8xHdCq
zvW@Dzwz=_mbL-(RI~#jj`m98^eL@4tG6UnIslmjL0(Fo_1D{CCHT$?&LY!{c_sRWA
zo%ob=q;$lR$n6nS$?@5-p`r2F&0av-jT^oH`+tRgaH^G%=^$Y-j{9#x>2Tcxs@_U#
z70mndD7FOU<+S98zO@#+REqNTEINVYu*u9>(-s5^mXS7qI%ojf7SV7rA}(*p>&`{(
zoEnxjpPCJ^5<j`b($=5x(#Aou<@G&UY(W%>b&rn{jmzSL>~Ov@J71m%>My>x$<C#T
z>bnMQRBga;m!^@blgrRb_3>5EOx0;Nb)lWAO%M+thU)btXvvm`n4-HY#}YSVs;LGI
zZ91v1`Y2Ih^(s-LFe^~8rvf|k`pZdm!br((pz{tarn%oTdx+*o|H-}fT{K&sKGGKu
z(|R({`4yT3B+*B}xHA{763zuh-L}G!eN(+Cz9qL>hP17dH^U<w7VP20+Mx-$;ww(7
zgs-SWnoH7U@y%>J=Y!(VmN4*!_8_S9_~qL#^9(Ln1@xZ&D-OSYv(+)p%UFgE1eOo-
zgBoP2P|W3=Df9b}h9lS3!Xii%fT1-U;7}OhWNHCw*!q5a*J%=!$9{q7bP^?7%7{E%
z*tpYEA0z|IanVUuflA83xLz_Q_Tuai>2Q1F`@^>@1^|vTP|icL^vdrr4e%L04D-os
z5jx<G?`-J{1dopf^ZPNPMHomI*F>JT=5q+Bf<*k(a-&b@uHnLZ7Kk0`f(ZX<7BEw|
zNmqSaMF`ljz7bZpa|UV|B*;MwopA~ElnaNY1F1Awe~=R^!%N~qcmcsh@Xp3C6fF_3
zmlo#kc(Q{+jOR|NHbozs3C@2NYpTynVyg~mbU)^6QtadbvE<h*nqid}SAWoj!_raU
zQzA6^kLC%zgt+vNAON@2-B6EfghX2#?@nA|ncmrzBl-|{kr&T~1HJ2Xepc$RJ<?s~
zs;jzjQz5XmLRM5Sh{s&bwMz>OySVTPQOF>aKnkIz!wz5@fyCq9ukevfr)P*dp|Dnp
zBH-qB#Ex(ZBvjS`<HEbVeeXI*Y8)R0;*=8|+z=X0Z^CP$$945K1a6?mzIFwTI&*yh
zRJ(Qy*%gDe1iDNb&PUr_^Ts+Bn&hBwi7H6kFh;JX*!SY$)K}7WTTf4iAf~g^!f_3E
zJb6Y)R|FzRt`-XVM_dphM-C7{uU=4|o0m5Z-!1k(8yMP?C3!$H=)Odv_wl>K18p5d
zaEs2&-z;6(FY`Vx-@$u$o^#CT&{yqvrj^|P&3(@W(<7C?@GqMHCEv3(b_eqxs^<Rc
zWB8sS*L&Ry{SOcH>^(ftEqwkqKIlaStKQ2;y<DgNpZc(Ox3{+L{Ib9O4=;A|vHXwp
zVs|ZM+UvwE<yH73-6y3cjyvEU1%FlYxc$SA-9Mi4*+%7u%Md8;_NonbsaNR7UW!^O
z7_Ne9s!p@XLtTS<sx~<lRj(DUWe&W|#wWG_Lv(cIrad?NukmEtW;xp#e-t-1Di{aT
zJv;Qw5b^(^`+A=L_#>kQI~!0RxrIUW_ga4A<bn8Dj$5O#uvrxbkpazVntRATlGnB%
zLCWdbnZ7YMqC|4-C9fQj>CW!Y?vyJ&cfz$fgefMK_`#lHLty15_7}Fy5OWc=?j!bw
zQ9YZKsvN|M6+bJ_#<j01$6NJP1yt!S?lAE$dg>`AnuY#PDWfP2S<KM9q_%?pa0JWx
zlz5_8vx2UHvI|?xS_<iEI)!&^zY&PtN~P-boMt{=+qU~4@9*E8H9fKj7eYP=oI5OO
zs$ur{qk^Y7Pf(kdvJv!HA<<AMMunTJbeb%WD(!Dy^m^4<FV>;4QVuxD6nOdEpX}==
zFSz7?H63kTbaJ@^-?kaE?2&KE>mWE6Xv5!Z{wAKfRU=@{u$IVy9j(z>UsFcnK=RaA
zPPG5I&iZ<)j--O2gS7tWzWS?&%Gk8wsORN8i$2jJH>MLB@zhtYb34tNdPWcV#5wNO
z5*`CzFY=3Pq;dFyB2i6(ThE0XyEv}XKJ=*-SV85LB1GGI_1+{zbIMh5Xbx6;>Xgh-
zZ5860?fZKuz#te8U^jLpN^1qQ@a{g&6KA-chk}Zwd9}uZLgL3!GDZl5#*}dM=9yr0
zk?xee&k~$a&m5vXnV!y62DLs&az!u=_czeI?#oNX1RBG_Zer0(|D+?EEp@6dM|ZrI
zkb0E<q?bA~F-ZtSN^XBSLY1r@mkL06rs3p0=#^uoIUm5#)Iqjs6s6ekpdeMCNuxEK
zSa}%e>8x(-dy;;esBd$4$k6KZg$3>=?lcAHrnBQ0sDLG`Q2_eiiR!tmF-VUC&u%WF
zM&Ik%>f+1RCTlSh2-nfla<(q|5sa@`&%zG{cnQNbI|-`U4dKHVT&&N@9%wMt{wdN_
zsgxONy=jhOWNZ|E(=vZNQdt-;NdVe>IxS|`5|R+c;XmqK7Jb<PCvrn6-(&;f0Qdt{
zv1Dh<*$9YY$LBbSrJCN<K~?8UQk|o$t~SOodY|CTh?yRs8Z(Br9FRf~U+}IW@B&V9
zxejJNd7xJoL(a7;ARe3`nF8e)opQ2E>M2EmV1O`uJv!C=ZR}d<jHOBj50;*kX~tbj
z^`;2>PhI*BJuXYn7_}67R53su1YlnC?CD@QD|4_&I`S!ZGsCJ7V>V(|lPVC9y>CHO
z&_KQRyRCv(wZ?vc-JqoXD57l845*I!S^SBU3LmpIKldgS@z7a|Nyw!MH(+c{$8O#N
z)lgZcle43v6bLFS?%NlUJAs6mTdywDrF&w}H~S|9q0G-`Qm!f_B4U98fRyyY3G|Xw
zmG0$e&P;lb<?M8VzUQpjLzf)o%v#vhw<0t(Rz*hHOKk6~+#cUYXc*=4MRRB{LHoIm
zVz}tw>K(o}1OgrPcLG9TpCjW&Wcf`kJIb|TX$#BgnZ#9km97~XO>ReoDulUOumG0I
zU{7#F10{lD+vo*l4H3dMLiM8(1`Isu{l^)q3Zq&H@(D@0zmhs8pI2j3g`($FKNDe3
zWk+18oQ5c?Rl?YV@S^NWe2tyY!RQc`WiT!k1kcc+?i)@ZW7LqWC1a7l*Lt&}^msCi
zqc(onm?CHbZA@1(Ji+?W%6*uOjNw5ZE+LjVcF%exzs;xGo%fPa>)d+789pd;pG^dI
zdl;M5nT7OP<cT6<Q-Uzfsfi;wed6iL(mda0di^j8b{xjjmMKa^AAzKtyP(}HV%6PA
zbnnjhUcWEFg!_>Cvx8TN*)jq}c3DQSxC2jn;~E6{BwUG8k1W%x4g;R4k?w1VP91x0
zW>EvfR_bU&Y3zHk7o?FbBeKhUlAJDaYi%}uIR14w*#x7Kx<}yzUGn@*2D^gwX*H??
zY2G4Q>0r2skZF=ly;8R3C?9(qX&>>y6tFr(=6v))PK~N`8(Mi5fEg;2D~6I4Ji;zM
ziCi%zIf<4XrB;79wP?z$&;x4*gukUP_z6T7uo{OdtIvi$c7_K-lv*KkC3RyDH9^{^
z5x!H{%<v`An|!dVz1#TBIo1d%<Q?SVuEIVJTt?W~QuGDLYRiYFTwB3P2Gx|ZmO4#U
zZrK#pd&n!`7tSPbC+?h`SZ*&@g+Y05!gLEizPf@al`}aJsb*)(82z-S8!%3-1BKV+
z?L%AGu9E1G5I~=!j<~Z3SCD(;cTEsSpmqWDh9V!Dlw3%Xs!L0_Ps$b64R$UQAsU^U
ziG{Z506;F1bb#?v<G`&8xq-J`(k*~ho-062yw$bLPRH`~g(!20LGmzLZ(n5+VeN_V
z2|=Q9WS~Tv_pVhEP(PrUecqEw89vSfLX9C5e$SYbkUBuwHkber<+y6%sDCgV+(u<B
zFY4wfXQDYqErG|BeRRhPqfhThM{%DhS>Cn=2`DF93PB&CR$PQiyh@4*=HNF{DuRe2
zt%Z<H4wZaVGi^6&0|7J)%x-A_sRcRP<Ucbl<E3AWv$0&IB`$Lk?PpUcd0h9q(q8t&
za=f6l_dTJq7g$8`x1D0IizoO!I78ik5)2S_T3E?31GHaN$t#|Q0K1JM@VEO%RIXzQ
z@P%ezQ}$oNs@Oe83Do1|>QV*KvT2p_6NbAu#+TKVB{B|R()3n_RKPdz9F`dO4iDG(
z`O0;2*%CSOO#-9|noEqRROv@~51i-bN^-R#5dt;t=u8lM5&VHlV!!raA9Kk%Qk9YF
zWx2XtLvRO3xOvkrKmg0SXg{VM)iT@7i|sv>@=?;E){;^+X~ub3jITeL^v{dVi#B^>
zVhQQAc-2)MKOP+@6GWu2=3wz5ciBjjz~9BZY90OHPT`%HhmgYeTFil`M}CZ~ZlTuo
z7KNSZc-FD1fJo{y4=htKvD*=Fod(b82x`;rLEyuqxB(5kLxNMUrf)hpL`D-cU|X51
zZnICZCkdF(#QdEks@UEydI;>+J-5oqQO@+e+#514D3B3(XdfJg8SKk7>_~y~O;Q23
zOOfk~2+weu@F1uxNQh9GBeyDp8H-*LF6YrJZ)1ufv@~2mxj>@a73R<MS(-=%c#Z+`
z@MLtq-g^p*s(5&lJgCJpW}9c;QL==BG6_)mS}YXpxR3UqE)rQkMt$XX>x&i&;;Deo
zY_6nKTxZyx&bFuIN1n?CWKV^;5QbSpRC~02G0uot=^#T59Ejk{=>(Ium(vLtQ6pPd
zsZ5lO-lamkIi*(uf4f}B8Ygv$lIaZ}0~HD)`;;5tdj#ShQ?VF5=pvH^*BYUS8UCOV
z2oA3Z2Jsfh5nW))E$g0x9?`x0Ynwmvy=yU_&`-H5O&zsjcLin!xqpnp{kZc_x0V2v
zEHMIEMGU$6X`@2PY<Sa&j~JCVxBt`rxy$u11C-C_;~dVb0~O({ovWqL&bM<=J0Roz
z6y5hSf<<HxfhJUC==}=tf&S7Zm@s7Ry_7w`Z}!CZ5)p-OY(GG;b1i(|37lT|b1x<O
zT6s5plOUx<1wfr$HG;|j<P*Lm0LHS-fblx7AK+n<SKdZ9d&;v%Biwt1d7aXM_karW
zQS(li=q0vr4;jg;y)8Y4SFF=p2qwC|FQEQIts~$PL)tNGpq}c?M$HsdS(j^<;wrf4
zHoWbFJgSFI4*mw1jepBAvFKwyYGp?C7A?k$FMa##4;!oO?+Bmy%4M%?A@pIqpQeET
z_c5!rpE45(6WwneC3O?vrumSO)O^F(s^7HG)@<eYtKT*dSvRUNiZ<$vcf3#|!)@7x
zxJq$-%wEzP(L{b<+mj2)30Ym0?HM?Qr1|9!)jpQhsSI6Pn{*FEfLhx{2Us(NG_q*Q
z!f;k;uxUFiG<*>in?E);`IX9-2HE<6HMM51j7I$-d?a)y?mF&=W7k*jId1TMuJKKX
z88)$Xd0&d%SGVd{0>2}g!Y^=*bc;^;WKC>Wod4l+K-$(xsX}Q}FRsVxW0g-w2d{6R
z$1RysfHyLmw(e)%=V?0w82OT5vzDXT`YYYi(2RRIh5;<_XPXe+d2oj-xK}EYF1^bh
z=u8qQ3-%4V(cyk<*_PQT7|*Q6scC1nH%LG%xg{9fc%Ll+iYC1ojo}jqf0}jv8|@8j
zXkY`j&UOQku5Cj2(zgTX;?b2^`*DCMWn_>J^Zdij=VDmsVF;dBmXPPzG5nIdgZDD@
zY;mwulD^mQewDE~Zs&ora)T^l)WsqmR`b=D(PpyFN|m2y95mln-IuNYVK(s1w82>w
zM7Rh`^-fjvz%_28_zho%#?eX$#Gci?vlVvA$d@*MT&=0UPIkcmB!wGrwH6SR6sM_~
zHh$wbiixC0D!pn0MA`pw6>OMZg6k@kY#2cEjN6*!qbpmvqW~T}KDm5|YqC^i;s~4q
zmWrc-C1bB~At!>uM$_RRy<3l|iDtswL`DD9{htbx^G*Rxprppp)4m2Illx_e$o>8c
zT<pl9?{dZXa@NFK4n!q~$K@Q1Jdk;BTElnR5Og0nuF<9ogAo%)|Dfq9%9yDs4p0J<
z70wnJR=t$4JC=4bF4rl<8VbC>pMz0B;}AJMIp+8{%#EDU96TJR#X*Mcx#5e&pU=ka
zkJ-zN@7ehayL37}7~xQa?vK|y3Ih<{#RA*JV@&mf5KANcOl}w=zinPyvr#}=1-H3r
zLaXmo55*Jz<~8sKp;jjXF~<I!C#t`qokBgA_66^8n-6)c`V9?QKb?*1XADO9SnU~$
zOu3ZT14ttYP0<Wj<?6_}6Z_JS=k5r^mDw#hfmB9|K`8VSjg_WLBcmQE*6VbU5s6m+
z4KE|DHC!KNyzu@V&~)9wEDMx_?fdZBXy|CDaFzQ<!GgOEvTgNVa;#yPIlJq8NFyof
zOCxe7=z(p3xmpW~kHU8*sm`iKg=WD}wAyPHd}_8*q0Z_LiU!8cIkc832WTnGV$15j
z+AQ+cNEU%FCnV%`UMFi%s!0+s>nrJmV=&l?DTlT`rO|;`{NpPqnSs(c4D+ymKAe1Y
zj~)04yGP;aT||?>V&O%qo;z@c2!Bv;;kr3=!r0oj%;l|MbW^3Cst@;kUrsu=%m`67
zrX!qxx|l(ty^GEj5^d3DDo<No0#+xgy9iJwx7t9z$GIVl1r*|l1_LgUg-JnUD_-)z
zvr|@4y(5I^s5WCd@IsXI;>qEjrq@H0l4(Q_`97b(ecBPUwN_bmZOU&bbAZgFCwhy~
zi~h?-gEdr6V6zY{|6(}-xdDU;>xHSW`Z$Kf1;P}P=Y2)hU0}iv&w{#EPy-=MsU!p)
z_c9o|+&L1~dn@4sUEF_0hN=q!M6)8!TyM2gy11ZRc$pjDBxJv!EcHkstJ#<=Y)Lf2
zbw={X(`RmJbEOd}JzLZoRojto6Jq=zdh5a%Jg@_pDW6--2c&iLHeEOIDG^`4uF}9`
zGeydx)+?zGE?k~>`1DIlAdr>^<Ktt*^`$hUO@6RRv2ZUn>TkunGcikYPo{_s=3nTB
zdI@S9o=ne>Lx|GA;4J14#t4os?I4-BhF1p5dhi;jl9FB`>xt4<k{958Q*+b9Yq*z{
z<q-!PA;y!&Vb3;Gr&0v2K0=HgZ%Du&XUJUUyOA`5g(6qu@St$O`+9gTN34ZXSnKT}
zNoG8G-JjrGo($;``lG_fa-SOQ9&q2!z`>;}w)4ziKBeYq(Pd<qje@z>+rZd#gXqx<
zAObFFynA^xe!=-Zc2w&fYq!^@8T7EMkwApRGMq;YaAJ?J$G)Dd^VQu2FjY!B2p!Xs
za{whIDsSS{TYPU+Qr2xo*l)_1MA*z@#es)}trL>$DUP#GW)BejyD2#-CZE~tG`clH
zb3t#K_FV|H3_(cDo`)V>N#j*Z!Mh_xzeHGir$)^M_iRj|@tKK&5W0&1TU-jvc^`Xk
z??B=w{s^2ej1_sDCRh!yYjynxB*^mO|IT&_NBa^05*n<fMZkj50<aGTQ<C!u!i{M*
zA}%xW)o#cX0(oxV@FH~g?LvZ%52<EVQej{tmJH-1X;Gg0@4#%h9r^4?@)2+;8{hv9
zzT*qYkuFB3Sykp43k2dQmdd>F>hBPavW1{G8<yz<22!cXYpY;cQ@!U^)ynrt!_Y;*
znptF>`_!<Y*>~1}3iX5wB{G*$fC)&-#fjb$M#}=rDzL6~EcC_WV{C`RUh}wv!Iy7W
z{1vhm-ipHtnM%7z5;}Rg^3``YvXK&E_%mNu*(Z8eftK{f;eD3-+(1$r<<FVOelQ{b
z4zwWGt{_{HN?RCvx&w;lUC<F`DTu^gft+M(xh%?+AIgrMuB@0oDU;JE*+MJ~fx-~z
zguufOXJ->pLwq+}GquIKQDFn&u20g8Fel6WPJ#UMgxeMcmgDdi@#B2s+!9s@V#w2g
z;HXEG)QM|7Gm{mp<QEovp%V1P5H>8VTLcVAX?3J_yfzv_N1!sKWS&9M^U*9r#&fkc
z5{8TM6?gAQO|oXYuqIA5x7K8wAv;VHz;or!0H7gt%?Yy<Yc{Torjo579d1(@`nsWj
zqye_Z1Im5?xt>fVtwL>I?$+)0@cunLnpWdoO#bG`nhq@Si@fP^JKT+axh0gA;}PdV
z_zj`FLZY@gnh+*~Tq4P415_#kBEu{=0~zPTvhiXohgECGh)^)EbhkpgWd146KoD0L
zs^fD_(2}`xHiKkr&FO--6$0I+Ez@3FCG!HNC*AHqPP9;TxwS!4@E-!7Y4UJx6+bQg
za6Lvt{Zu-`^8l{o>KMuLKrTu}pog^~ZwDk3b4R&-jq@c&66(JyUtXImKft5c0&Go2
zIfpAUSteyv|Mh@8R0V=mBPw%_g?LVwsBhw=VND7t?WGdDpFXu$y?Tk(Tv9r5G+V(}
z5JDJRO+?UoFVEJrddhS~AX4=^2L}nvBD0~rOf0FT?{#=a<S+M)1QlddBZMbB)+pK_
z?mq(pK{obhKs~!*?YYJf@z(qmDyRsLyAmuNk@Rgw!EH!z<v3?|Qo?m0id}x1mMh?~
zs~@|+We->MkmiRVgKdvwZVt)EL(i1=y*3e2S9kNklEq&P6U!I2LMF$2_t)OrEt2Gv
zvE7ruq6oTSy3+w<At4Y3<T&xSVfU5njB09$T*!Za9NEwOf40lZ#gY-n(*Rz%b~hUf
zD;Nx1V;xzZZ4nkFefrE=+=bkWa$l==YB|1|86kn*@4_6JzM`9n5;zNRY)huwthqPs
z@bK;akpBFRHrekxJSfJE?37^0cQ;enDZa|7k6Lr&+N90anddgewVqPq!W8~Wk1=OG
zO-7n{&d>#lBU}h}M8K$t95mXdxCNZuR1o=ydv7mOmLe<<+52f>!i)JrB+NCb39MIA
zG3Kn0S`}JpBewlCHXc#F`Q!;u#VNH)D~T@%$1AG#-?Fyn3>I00;Q-Tj6e`ug*?a(d
z&v1+l4ohA`G;LdC554<p{OgWf;k8b#r)j$I@!bvFHU{V0ie<3og*!;pv8=hZb}&Yf
zFOs+XdlSE=2tkp9nl%cH-5LG|=Nafo0ot^If@r57^dHln{7JJ8$+9fsDEFB5I!;;<
z^G=%L&q3y`ckERZ+qAtq>`#!L5*Ef!nwiSY6KR>HYP&MnZul?fXP@#=n~3ToUk?Q3
z2J)z15RP~w)dzoIer)X`NomqMJUii-EMd0@A<zso%tqu&B+nyNV2M)@S9EP=qdb|o
zHXhPpf*9JNU+ztyTtlUx!~WS3&JQpG`zy~T6FBUoC{e3x0b_5xDGk-lhf(}cA%O~y
z3?dU+-K(Rc7#{^&T0=^1jLZWughe1mIWyV)t-*5&2RtR!AeTndFuZeVGo_{BOyuIk
zW$K=3#)*<Ustw5ri+01(F1N|2cDPm$0rDcvWC}~8vY-Q_;%3q|JQMyqMIgA-Y;Ke}
zT3s?<zm74_XM^30#G4Zrhw0?I9Fj?1y{J7!e2}Mn@GS9EYF09DQ&qo<cXgfzPJk|{
zSb&Ip9uyUi5{t^4;<+Ead^N*X4yRwrpyF@@OI$~u-ULV85Stpmj}DJ<T04f%m53j=
z&aqe|?goB(W3baix{-ro*!m>e;Qo@5oW0@f;0B#9h;T%ABoOHUoVR-<#3vXYu5Hp0
zf4`=_P%xEjmEj4+Nd~{9o*`c#>tQ&~&b>nq#c>kmPyc?6k2)|MdOnuX3=O=6=VKO~
zTm~ULYClW)jFqGD0Ndspa3_&qCBH0^(Qup~!09=U_DYymWN}jm&=|3AlpwsNj&nyi
zh>7qFT5teX^2NN_Tk+Ppr%$~>GaQpcvw9=eY1d8oUKfanqHm=(>ESw^BrTQGL0zEj
z2lE{D)9bCgVP@kQ;g$)gVV{7izHqLtRz$K?rhDVNqBT%)E2soyh4Ws4c2jwsFLdf_
zgQLM0C?SW-KPNNPZXrUHT^;KR8ilE6e1=>@>c}{0bOK!h#xlw39lDauMK-(i;eVuY
z<Xn!b|7V0C@&ndTm>Y;eAajGg&RcN=fIPyWIe~~<yDg%qnp^nLO+PvXP+PWX@QAsk
zOGFD9%pOn&*#?X;a154$5^hzr7^Q==StkqA!ycnn0g^<T=q?^O=4_Fg1v~R8I=`8Q
zd`8;u30o*@Q2i6w8;O?`o_KIX)4`yBA?42AaW*Y`FndtX5B{O)7|f4<ahCJ?1T{)n
zHjF_?7=~uyB>)p}+@V0;J21;>FvfYoOeR-OAM%Sz0|ITR6g`_3J<<8}5lm#j!}w#7
zjD3uEjiQJre6XwW4hkoZYjyCVLpn7kSPoIq^Bkv4v(c1l7((vT3GeXWHN+PMJz6XW
z@d{0qDk~LTsYC>Re9cLWqZAZa27av}eC(F^OPI!gWQ~)gr&7C#0X%f5AV9|D(xU1r
zg_S_+)56h916raCsK*;bgwMc;U?irWY8D>4!><D?5lR9((NB=$f60vB^@iA0@dCA{
zz4UA&D`j&HGsT~Ym`tt3B8To?>-Daa42_wcgeD>+v5853`GI0Uz3{cgcSsmeS+o>v
zY<CLC`5x$UJYlnCOx0tM@~9RFFU$#Qtf5j9ECa;H(K#Q}F_>fj0rL;`kRldF|EVGZ
zjLpYZ=*{Yw+PncDc$YYY*q7nMeZXKr;WwF_89NkZfnyDhQXvr_w%pNC=qykuSB&5Z
zvFNh;))sSt&}y8d$tDSqTOXox^)vA!?ha?}&9LL-8GA9@9%jTqr|P~$!a)Ko5(b7D
zidK@tR6<LpB6}OVn+^!E0Pbjzh#a1&DNWylfkY4Cv0-e(r-%gnC{JkCHY;>yDvD3j
zQR@J9F=l@>Jj8Y22tA>FDWNoRIISyMpgj=9G=ecghf?y1gWN3FR>?*LIl4sg9Esn-
z%;QW9*tag|0U*g_nGtlSqk+{N1t5%I9~cJq0+beFwc7jY4`}qK-YWgOx*C`uEgG~R
zoxZgCc{;MlD&j05g9|y}mQv*Gm2n{*c$&EIQ=u3R*5E%&1xt;z&6F79kFuG~prnDd
z4FzUMKVcw<Ns&(%whZ(I1Iy>RdDGM;h#cT~`wYi@VVz}}S-TBUevQ2uSZ*={#o_}I
z_~JQ5F~!eWcV9p{mY=SjolIYi4rl7y3T_^Q(!}4}sm?-yHaW^>Z*DMhLzSVDyJICN
z^1#?ISBVeMJ-FI?`l|@lSO=H=pEGo*4v|fbdn)$qRo~gkpbV!I(&4ZjMyQZJD+a~8
zVmO&2w#(a^L?lzA=-wSIAn!4bD!THJ6Hq&E4L+kFmHd_YHb8Xwi@9@Wf)gjHVs74!
zMH%kGmf0+-ETB7E6_9h*dj*}1N~$;r0vZX}l7T?x_s$Tmi<*egBxp$Ft-_g8=MIOE
z#Z++5OzkoTN$FQ`iqL=51R$gXoj_z-1mCL!LLf*KNcHfh?=4-0&&yIb4!Dd5h4|AM
z?Y(XB_<9P)3ub)q8j||{@Cd#{I^5c_sCGwkv78P|j@WA11j<bh`=i)6K#&JI3Cvq|
zO-v^Z*(xQ+xN>sB1pzPJxtk5OQ*<^CbPFnf*~Ys1j#V_I0};d}NfmV_2abyGeU-=o
zP8lK-DV`a64w-R66-60F6%^{2wO_I?&=0I6mA;InxP|y@uWlHX6t#)AF3>v$(k0jK
zQ=T3_C({c`mnI#jYZlV*EvojX!=Q2w1(jt(^lejkV6w$7jKWl4&XEOKj;k{WA?Kiv
zhasiGXf42+NsgSn3-Fj^lCQPu<73Nh3J(q8x`ohI3-^7~YFcxhE2otgg|&g^y<||e
zFphA*unt$1TH^AGOaxiUd1|3n44i5eKo5d97Xhb}(HnBlh?PKhv$o>?M0F??r8?Vy
zE@8*O45J1b40>98!@kUHBZ`j>qX(<6ijBcB2LWi_RVXd^>;`Lf9E_@aID9#{Ao|h-
zq;!2XE|bs*gmNZvOD|uUZ6@85mlZl-G~Ifz{nfYM{#%$g?9<MnJ^b`mRMA@}C?SU<
zusw9T1`YfORicM8GYv8h%$iDtKIlj_cCpW?&(Uqpc8tJxU(NwB=@3BUKcH<M(jgPh
zEV^e$ImG@&E_JAWWrXuWwt95x(FJlguch)ibjW<AU}1CIQdl7j8h$kb-wpL$p!p<`
zup@~kcIuUn-5NQV4fJ}Y0pCqVPO=b$<nl02%t3CG+Z#iKu2dtHLG?r;D&6vq7|oSQ
zU^lshD1lkxk$9m?R8I#8tevEq8v)5xfJD}tnsc?AzHuD~HG;E4?%>cL<mCy2?Q#?B
ztt_}e*UJ`%<&CWERb4g_r(?t9vNoApyR-2rD|uQpaxR$Sr#*eJ5JI13#q7~7PJEij
zQ3~*-h7_c<J{E=sqXM2*^)X3sk@fV$DP`?N5xzLa7lFg47Ni}Qz5fF4nuvdySCpYC
zP}OC;3ep6%?umGHa^0Kvlo&&_N8W??PkW5~&MS*3WO!{Nv<sSFs?OIl7h&AXCiX{^
z=md6jEw(}EuoqnVb}sx`KXafrp@euTz1XUnN1zxw^d(RJuYDwcfX0Znl-^PtS2eQ?
z7IyB*s9kf@c=a%@<=U%6aSLNGpyj1R(ufRtmgzTo;5hgQeEKwDk!mhi=YlTTGwX(+
z@;A>MYw|}q)9LxifhslZ;^3dq*p}tzEu7)D1<of=aS}tdNWM4lSArS=uc#GbEk|@X
zUXF*1m@J16p12gu6;_ZY>+U?h<hxhM*R~NNpb6}75axs3H1CD@40Dz(Y=hC1LoSaW
zOBcpkpB2v$E}GA$=*D);{{3&_EcmT=EJ6pO%s_6o7i>5Ta)S(qBsrR$z9q~q+i?W?
zXQd`fT?`FRP#k`AN_O#jGLelqkCIhsOXOq2fK-Q)<>-eesg?Oh+})xH{on-P06qAN
z_{}cDUFeci0yKRPpROSeV8B_2DT(R5&=Hj3Z?$jKndU}^iQn<b?eTcF3G?ja>@>xy
zidg3maf!0b9m#sSQyGVM#}kzFk)#1j)z3--q=;H3x-4tnK$6ef!`fa&go#;k0jVDl
zDjQ9n`4O@<u40y?y%0X1y|m32IuGKo;vAE%(&TKC@h;hDihw644-mIfitPNbgul|>
z11`#s5HvkM=oLp4pMx!D{gW4GM|wjY<TVn{<+>2sD$sv4!zyf5Gxa2`fQ?s+jgE+|
z<5qD-V|vq1wLw_?H~nK|A+89uhy^)*Z*8HZD#Jk+>OxkDB;1x=E3Aj_E)K}yIGPM?
z0DoQu6qEMA(X%&@d^ud1D}yA@Ssbnk_@lj7HehNIy<ea(L45^AYVU0f61)<pioTJp
zXt&FyB3!<EtiY{YJVwB9k~0Ulx=Fj<+c-EFp3ZR6f|yr-+?a`sb-^*nI8L3C4xkK2
zy~UVrh8Rr)E&KaO)Mio&MItx_AzqY^0Mm+6W3fV^W5eJrI~hV6CaCz$aOIdxOM9*I
zpR8j@vjBl5JJbNkr?lmup7{F9KwxwmW&k5Fd{%lu_`e_qwy#>jA%ebsKsF{DEI)Od
z8x=>GS!J6X6{2c{%R5<9i@>1tQzDwv>SE*o2%$ADK8Vk7OCKxbnqk4AlmvS0K;kF+
ze$-8$^*}=xu^)LTIv9i=7K$e5ydce7u-MPwSZ=~s`*#S)2sCcM<n!&~bE1O!<FM!g
z0he#sr>s_zl!3)0!`MdR`Z^Gq)yz5P?f5ZOr)gCjlB7a;&nV88lR)52K8&3jR=4nr
zZ-RYiSPa{+fPX*Xvu5=eMb`+{3Eyw}dD>@%w8x1F;|x-Q<9Z7;<>Zl+3c<k|MF3K(
zMShqZ3LHw7>E2rxIJ7T`J@cfOl}+hG_DEzM7etXWhDgwysb#wHKHtdKNf^q^Xuvc)
zJu`G!-|&rXC`prJY`C_ITi$VX;m@P~ZBB^aK6`<B0<Z3m$FIYVP`WR;JdRXMtP&VV
zQv|zD;rYwhG%S&ciJEeVxq%g4gu)dRLC7}gu9F4wj?7DWN&n~07w5)N(?-f*U}nK?
zo*zeFRqPzTp$WFwlErpDMXV_2%@p$kv1j}hu^e!W6aOV62GQ~gg1KX@hw(&%x&tOY
zGA9z=>A!`1NDZzg^GhiSVXX(lqafgNuEo{cx{9<=`3j4l(mV&89)`%EI_0cjbjVX8
zmq-2S>mI84?855`*Z2ggf-><C)^S2N>;$4?2Ou|DvxrH-R?3r>-|cWJW*G7!$4MRo
z0=?ETpQ80#3S}KZFyKO3$O4vK|A^+~60xxL9CcG@2D+EhzqqA)xgeFe{6m0Mj|IdJ
zzMht#ka4&4QcLezen<Y21)H26=vpBla5w?z2^{%GQ*VcH$vdF(6#RLBwIr$sf+^}K
z)b15IwS7}yGu1esFo0m)py$Z|^No2~7qocKyNK?DqRTlu2(HRwO2_~6?vuw@7s>`2
z9iA8D>-g=_wd2VnSjf2>A)8<5Gy&7Ga@mCHb<19ZqG(bqF_jwANsUT&O6my!a)yZL
zEX0D&P`r%%$T*Wid@%hrL`65s0DuQxo$zv-$LDkahv22q6<9_h8@=S&%i#&9Od#fd
zuZTZEXL8KPAb%dJ&(UKtxl?UBI#VLQGx8r0#)3r=9Z&K=LVI6O?Hl&a=t)j*qxbxe
zv$xpz{VAnf_g<a7pmZlhx?*%(?1~Qhhm@YFq{xY#5D5@F+K&SFKIcnfxmZUW@RGX)
zv_atMT*%r^*oA-)I2}vE@3jX(Nsc2bGq6GTvi^~-wEt7@%@}ibD<w9@UAxm)(bay8
zxSzLc{R7_1uW)4op&!~MhjmpM*05imO!y2hhdarKY_rHpjQgMk_DK=FHf6DZLa#H!
zh=9pV1wsHb`^xpssEY7G<RFzc!WjJ{F(@C8H4%PDx0TEIA!Fdv0x_0cw0J_rhg3H#
zLarWd3SiV&koN;M>0`n;qgE&lax2i96`c!E!5YtI!5coduW7?4ouJYZNn<$^B^d$M
zd<n@l#f~rU%8}<s^-JK{5Iz@d3Y+d2tEPA63hP!$tqUK`13;&pMAv5OKjq-<n~;Q5
zgG(x;K67mkQ~$A*Z425WKwi-Dik81ij2~+uDC~1<G4tk{OLV0f69sF>J{6(r0+RAb
zEo+^Q5F#32Wpibp53W}hF-Xp+dL3hn2tqLlV4rE{Gf`=KK@*!<lTdS!{>)@dp|o-G
z3^TN2yDzj9H@FldnTB-_dNfkwW@lwEffCwd$4r^xXoQBM)fzjOA3cUo!ESLj;f<dQ
zM6lF+ROpkWBg%;1+PJ`LhAj@fvX>d9Xm&&KtURw13dDJs24Y!PS=5y@!qN5$e3Nx(
zntek@za?~7PegoWKDO+j_s{~<3OGYD7LA^6DvmqUjQ+^&J3a|3E~wo^4*1JqlvBj*
z@k>$X6u(3@MS~-hq-*GJDcLbg6i4IK4zW0LQpIv?qdt=g*g4ujO|a4vNU4*kxNy>Y
z1^<gjGZH45E0=Ll%y&;Hs2EorKPmo$N6FC;7MJEvE$F|d-k;-0@=tw-r+ac<ybMdt
zuA3%B;#VOAJ3e*^cDWP&Dubdr^PVH$l{@QCO18}$s$?c2muv6s?fwz@3rue{j!sOF
z$x)CvM7P7I(Op@QGDoN8L2-K&Tsr-=e;ULdQFT}U*&4B3V`&0J!I;Eq7!?V?JfCn4
z1yN0$sxvIIhbHGMwstpr*P-<l9k7U=CYs9>Ova*I$Tm>wvqY+a-Wcda{n6OUO|Pu)
z$n~^bP$Y>%?qhGgE|nlDbTvpI<?f{<5A%S79|xob;r%<M3%BxCrT$`b=)DAHz^?FH
ziyb3+Y&(a%Z=i-Ch)@Lt5UQNr{@WM~?mT%viy>-n!9JtFkw&B(+t4N-+x=F|sYBBJ
z@$wb<Xj~DSOED=mj$jtt7k_5ZSy5xIzKYrx9jwij6kKv8j-z4OeL{cC)%jhzY`*^5
zHH1CSPRI(Pbau+*?UE{VJ^*+1ygBO4uF(@(#HMy%6PIsT8zO{$1*3(}ag|5%w`4m)
z;<bzoFKsu;iZm6h>@35Eec6M8t2ic@e@MWXEB(v?V}uuVIVW^CCs|t&?<jg8uh^Vz
zoDkZxg*1DVbbzyn_ZIYrczT$+Nj<5K$$e9*0QQ0u7FA}NZr$(MQCcO@oLZYHz%RR_
zH*}t&c`8*(_oD4&-I7Yp2U2CJlSs}^1Qp`|qx5yUc{)PvG~~&l$QZV+e4b5DR20Ig
z`1flQEs*#3YdrDK*-uIo&#n7&-HRXYJe2bnb7rdh(au~n3D1Ah-FUFNIp=@>fq<L&
z8yB4B_+t5~jz{6R-6S?@LARzm32%8tBBVMX_E1O$^^h)lBLvAX1>z4f2SQK2+cx@_
z?MWgg79DAWCq$z{Uu89OnP~845<~?)DZD1wRIbkfuRy2R;TGue%&G3y@PxC2<G>_S
z1ncY)>f*-B3+l7zCoUD(WpXk9ORbj+!!q{C0W_8?_KH9{L*zsloCZFdBJf4(K$2IF
z2U2#njqg%A=dv27Jr^C>sGwWr*sOBZLlf>OvAX<t@2AwQm}b=J#ZoLh9ye|_{AXzB
z_Aj)jCLdQqaS!xICn&xCF|NufZ>*wRUAm`(ih5zIptazHntPj6FG-@C5N;_Yp^k<p
zFHt`UQKFn&{I&;`PPeYm>B`X<-VaW-K7mJj%4aP&!r{WRkj%V<pKGZ{t-EwW{i5<C
zzMc$^$8Yp5p79aB=PH~yu{kF1!UXS?YH`G)U2Q{I&|VI2Q>s+tRjRv*qBwBoQ5unq
zFdz*;gr=R)DHFn*#wTk%@Fq$|9S&!x3CIQLsFVy1fct>Bo|F}#%kLgQeH`s;GKB3(
zA906taz%$uS~fJmf=W2A;UvUef+e(aA*XhiuC9U$5Z_SPp)C<^=R(vKRR;sgHIaZy
zX<{)C4rrwbZWsgFRUl0+pF^t`yXU{rAFDj=4#MI1#hA-o$vGu_|JohI#-Su`0c9^H
z<JUN$Lp4g&Q5|BX`5=)-u<|=aUVR2kyXq;`jXym_X%0W{6Qb1de-MR$IuU%tI65XG
zp*uyGGLsr<25xtXWbQm$kxYD&w0Zi>%$p!r<%MZ0k==Yupa~$mV6D93kc=cPQAK5M
z{Nr$ViZ)Mkfj)gE4dHpEf<h}RFdJX6N?n1wj|!sysrN$uxP|gKxO?U+9OuBmy)&F1
zD06T#uKMJCNtGPBaHVuU3q*d4o0WqHCA%-0`y=1MjB1@&pR&udR&GLw{Vu&yVYKfl
z5^0yu)BU;^xzy#xyVZZXKtt5on;{=`Z+vHXFhXu~(95hCixMLAj6bD=HLeR!@ZG?b
zIrKwE!U=o^ssLN85LfsCjQM#O^{*DI-X%m&<iBu2n9xA4%AU0@kZ89+{P#t6vO63x
z1bHW)a`Vv?n>RhC%&#C27z#|+W7EMI%}Q-2`D)Ib5)i6N<O{_?Ug0h5RGo-nU0?~P
zRF$6yaifzC4XZ}|3}B_c%w<P1MRiW%Zc-aKj)Zh39I0)`6DS0Z*g|SUhXqjU-}H$~
z6%>hu_>!t2v3d7+neE+Jv`mnQ9fmEEU3z#SSXY!d$t&1oI|peaUneUr5zgH9;4M|A
zOMW0>Mgm!fanXe*_@HnVA0qGjti>&4o=Wi`Y6DB90khCiihEf#t3;v`sZ_&9TQ8iS
z_Kzw~yUe0J6-2e}6miU}o!4q3$ez={%%3?;+;yjI!Zi$n&}<d+&3_q)FSD`Ku|R!c
zk8x2~ukZ1-o>lTkqVy`aV`DJb;Xr(^s3F>d_Ka*lQ86L$_4JP(AP7JXO;wyp+Y4BL
zBUCsG<=nFObS#M8tQS5=2vf@1Dk7jg$W2U#u$1{NqhhPUr-OnV<JRCqFSimPs-(cK
z+xVLvIKB?)yd%}flH>QnC<$uHvUErY%N*Bju828%vh(2HgU7!-+S=QAw6Xi6lZG6G
zhM!?l;VBtx2eYZ5pU#0omQXsat`<{!fSv@GZ)^3kw2X{RmE%TZ%?RiqSW|L6cMi$8
zg9|gMw)G#wIuYspDIPTC7FTx8f%*zYKScX<?=s=gluptiQ*m1?a#u82C!dxDMk(v0
zA&S`{vo+iVwvAGcBRULj#~KJ(%teUOi?D(as!cryFuEL46ux*~G!(&UudF<fXc7io
z4L{f(fmmThvGu^|kEB0<Yf6W4@<f|q0*Z+XWH~F9ud*c#GC56D;#QHaw_BX_5?tI|
z&1G^W%x#7RQB)nH$IiT-EL$U1(0^y2>#8MUS$63JU9x!TYoEB2x}>hb6=9cBW?5`{
z+la?JxXmYU1^5lF(X`Z+Vbv{!8QhjFrvVX~W?<;}wbVdF#pnc5zsQsa!gXt9)f=%O
zRER6%1-Z3XyD<2vT;e^x&e!@j3Y00!M@8@T$3+7Uz6?uJzzgHv_UHyMdqkUq)oYkd
z1h^$e@s%=>23JFMQBtOV8rS~<7uiH^<9fHmn#Ckc?&G4F5T|RgkPKF_fN+Mu$1&X3
z0!CYOXRjK!8f1_a<ML8rLFRAs)$FDfNOMPbsI9l+Abi)TiDaA8a0que84mvwF$}z|
z(fN_{m9E}~LL`&|MM$y2@69;t6@}kI<kWGi^G`<-&wt>J#PIC+Kc-*I-ae-bp{Kp<
zsf_lVlqqh?i-RE2d3+RnI8u)NoE$qyVn*@+13@vRTt<S9y(a^>eBfGw=tb}pynA$s
z=;<kZ2ce%V7JRLT>c(7d7@iyIntfIo9EkBoe|>DR&i_+dP`Tsb(ZF12UMHS*V+qaq
z+-b9Bw|{%JXq^aPUH$s^U;QhS_UD-%nUU>=X#jD}t%5Fu?(OWCd_Z%?d{Fs4qP5!X
z$qM9+^oj%lDBIl4CkQ5J2qU2xqfd-a8zH(8^LUd)nvgY$zrqEGn@s=64>uXgKS9{2
z7y~Ja{9C6y$m#IG$;=4vW)F7(JH={Z#C=_V0I{)i=kAjoGYM1iGUXHjPtz|~D!`ih
zaf}Rqpb8Wa_{<Atz>@W=71cq_;HCU>Zc(Xfue7Znbv3|Al46C~Qd-YB_sOlnbs(Rw
zONyYgi5RWJ?sFG9I(jOCmxM38baB4=s4;|GY;4t(!{DXkt$S#Utf<Kk*l18btKxtU
zIcSsE54Z~&BXU}eQw)7etDNTK7K4r!fbHQLl17jCoVua^LI~xv&?_T1o=_1UdHp(l
zu=VKW=~$s;#wYs{_wf+UhP$|_2Z{B!;bnOJm@n^f0zGQKR*Y~qiF{FzZO3<R0QP!x
zL4p~E&$2s_fEYzm=s#<*JXs4aJD>qtJKpH{ezM5eFZZcs>=$f&h^*OUd~`INJjPMO
zyLD9AFL|G_yn{;vMkq^@%!V*kMQ&4^Sf0=w`1yCwUcSVEj~BO5Bf(TjCKG~1V0&Ue
zy5{j9eOrCDHjZpQ3uTjurhk#Yt=L+-@JU=^_Ov0`cu8da1yvv3#$8Xto2W$n78QH8
zhZB_U;a_-;p=RgdDO#)dLgwd8L?9ZUS(j`(x<MaOp5sXK8dU&vHYT{TP(Fd>()buO
zR=H!Hp#GA+qUrmzyY9khbxuL$jDN6({b@^;?gBB)W{As%34VDrsu7npu8`A&EE|k2
z%1Y#+5F!k&fiEbN1_0ba1(!|Ls8aFBg*u#a!YVe$<HaZJmA$DI(fWv+R(3FoJB(07
z0=6%kk^|fjhBO&YIVE548{DOqC;F1%N`9NB%{NOMUfR&Z_IpgS3C#zo+t7&YM><d>
z6NOFU&~wk7{&bW`r%2&L9X+%E&`YbvaQKQ~%0w1Da9o>wFjJNNRQZGy-PSU6-Qm`f
zmJ|%MF&N;imep+DC)EKF(Q=D}kFzo8^!F}(eKOGf;9mN==!_g@S-?zmE0I}aJe5U1
z`{+D4i<Ag%s^gb`Wk@0sq<?2R#mpukKn^$d`1+Rl^I0^3i~@)XDO9$32IIpvfjX5F
z*xweU@(>^yc_>%IJh*ANYLT%mUZ6RmUY#GK+Y#*#(?kOvq$eB!KI*@wT5Eg>jB>j3
zei()#mg(fQH#|N?00#En99P0Ol}KMg<zUf3oXr2<8`O~$>CKw;0t5Exvm17!3@zrD
zlt5%>toLQGJEJM>PzTl>T`>rDr^05~q-mpF6y=3aye@T?zN&I6z-;n%(ca}f4Cbe4
zTx?6~4t$j;TckvtzkDV(8d>rVtV;R%E0!IVj7O9MLQCY_l-;*_S_h#I`8z;5H=H+q
ziYqNR`iK_(#SjrB&Q44V+EoxlJX3@s!O6g3AGp|1La3(r05^fs(-hRQNOe3IKyjeZ
z1giunAcV{uBJhV#lJWqbmKr!liSx%)*XYg}!c^$4(diwTVkE-k`Y+^vAbcTV*%raM
z5QsbP$ySJs*5Z5b-Rx6dBK8u}_Dng4z@-gXLMbyzQVblppr6V&9AG-{6Kars;lU$f
z&*o#HrI4%iPK(7z43lPc1HNsL@*=^VI3Y}t4(+NC&R{d=3deAftEt7!8FQ>9<gZI8
zwC>Ky^+liu?CjwgE{&GGSdg}9m0LJP;y2d4^#(rU{;6*;BEhkTBFAGGPf$&y*zQ&1
z1X<F~Ax`OLkyIo%p545j=!rtTYH=3^)6A0wjZq@JUK=-!bEc!Atb?35;LbkkAHco9
z_xB`7h>LEqe?>WgR-@}vh@Fa`Zeif?DMYLEpnn9J+>HuG;#_>tYFW=HrFTiZbdo8J
z2@9zp)LnkM7K2FOaWWqsqlcM16L|7bLyns4bBV^7sZ<aa0=EydiI0%GK)kAof+AX^
z9at)7S>61E0$<a@Q-9c4kS>54ff`dS*HRdWuMK?MIa3;C(dMD{kuhw+Z=8n_(p%T`
zvRv5^x>ly5F%K5c`iZ%)=6a4A9;1LKUD5ZCmCoH)GXH>0C+jw5eD3Wt_Rr=l4V^25
z^;Q&Fu!fN(qvnbNw(k{`%M}EDk8C01P4cyuWY?UGkXu9fE+A2y!*K<ifte~e@WI=u
zUdQ`++5?jXWp^k>LT9ld#dS~h%AMR)`3o+?-O&1AD+Y)A<(%);r0kGY(C;yWBoGiQ
zBkLBDD8hznHWa>1auvGLegs{`LW5>tpi7C~Ii*uYN`~>19moB`#b|*qfjWrIJc=n9
z&(?Hh1v_&p<eK~b85f@wX?A3(%}=wlKq#vJbCIOF4q<OysW=1aAC>47C%W9-H9_33
z9QwT>?+n7aXSiyb^ld+K0}CCw4Nd4n!acYws$Q^y%Ro@rfK2SfL`~8S@3~tE{VR}b
z_m+dCh0(Pu4;$pMP+CF0#(^eXJTRT|p(Pnpq&+DJF^tAFBUs?!%3Hq7B+g#u;={<I
zO4PZEnhu2MCz<C+z9{Cjv-`73uK*OGAd}GaKq*=fy7w0EF{OAKZlqa^VB{etcQFd_
z?amYz)}#CiZvMW5F!X2;(YR?t7>o}J<_0}Hy*@#H-gT-3bp6fsXP!~y3~zf6MkLvw
zx<q`bG^o=kmuwSl115G4C3)r3;}axdgr2!?<T;#KbeA)FVSUjobfP>i;J~*2%eOKj
zV#PH+2uG?W(Um`JI~6G=^v3L^O>^M_>Dau|qKK(z1hVAIrDuxjm3v?%Q8pVlYJ@mM
zjJ_%7o%-Q2u%vYsO3|S=B%S2)L+gjlq0?9@CtZUto-maPlF4<0CS)ax*<7D?y_JGF
zx>(RQiP`&bE)~?nlye>8*^`TFDYXTDVDXgXBY4RMNNAEJv8%Q?l7_YsWJ1r0vdQ)!
zM7I{Lqp}3=Ew3YCO#b4oaR@=q`Rv4>_D<lQQc7r4oqR0N8m|+(k+Nm)y6eqCc>T%M
zBh}WTRIi4bq#kdrIj!^{C}a>uh)*g_tE{s@b}``$3<6I%+<Ie5u0XFFlb2`5Z~<l8
zL6&~rE0Ri3h|rX{Lm7k^cTE5l7bwBLY@q9Auc%Wd(?+bDmxv?Ch&uRIBWO`%t|1O)
za{WdM{SX?5<V&>D1x8)!j7dVmA!Xs%w<IXtLvqlCJk|ONUKUOo*q(~rwhcWWN&zX8
zyI5zr8KiYnHPL|tmvmmBn@HF*+(NQc+>!8BV%)leZG*Q^oNwb+pTDgXbfC0CG<a`@
zq0ZXiG+NNeWSeumf|a4fYuirbAsHecsMIx)K#p@yYWJE;2FH7$I#~g};>IZzPKaj6
zXz4;oLa%d9_m)#<)!1>$d=@NA0fSD%$L-keiBy|YzD=OARVf&&dz;sWCVehc&h=~{
z5*wEvzAf)O6eKjcgXgMs#Eyp(lpVWx2gQ-p2(6PLBr!6Nt_UhcMzz#V{;h6l?DxWS
zUfw}YWouk39W%TvE($fi^fF{hnkBkngNdsv6lT6dLp&zJ$OwJ09xHttG41lsEJY|G
zbABJZ9!~bs+D#Snos6UXLJ!kvuLU3JQx6(c<3sHPG72@ETGWTjcf~a+#goBZx*j#U
zs;Fc^gwv@aKai~}P73r+BaCi(mY0pt_oBzDMc%Z-%7C3x^mMPVREUyWsY!@}lQah|
zP&C<F3H6mq6e?Njw5Q`+tWY1>NiTQL5#n@=lDvFdfunIgr8xppfK>r)KwuD>OY=vP
zPdKYZgejeakyWJErJte@CZ6E;;7s!5Y2OF4kZwkhT`uK$Ub681;n5f=@+U7>(GgvN
zqj#tTalbvDT2Zxfy_=*WJ{=KZbH44Sm8x)Yf#&8#g0uzansm-fWQ_<vsgdJsPj5t&
z!%O`W)sQm_er|nNn6}(FU5xh|mi;4`4eASvL*2`{1)d_kouha`2Y_alKsxXiAT3a6
zti|)nbq->cpfIetK%s|_S)rp8vmYL|?!=={D|M$|SI^rW1nmj2Pn(J^Rg!SfVD(eb
zc>q>Xu`eO5iRX*UIA-}0EUYv_^X*urfX<ZkCoBfiMfC^1rhrqv0+BDifQ@A@7wM)T
ze_Z{^cqJ)JQ;s6nYcCcxv7ii`c|Mc+7nvSXTa~w{gW*Ic!r`aDD5+F^6cts9N4M|T
zmrD_76Xn?0!+MXST(v)Kp#8ylgPbFN_6}SA2%8xMs#$4E7hfk{hUnaTa_7l<?=F%6
zXOJc;330{UrG+Z;IT494nyvOv&W+~MB<(LwG&wo<Wyd%_%%-c747$qe+yzoZjDHUf
z)H*DIjO}_#%C?FVZ?qKdGI)iRymQDNF<Jac+WDeuSB{OLi;-iC1w)3WV&|>7-B5v%
zyVI3Q8+j7<hevRu+qyRp3F(Hi38>md7njfC=45w#hTAH2<cN+$%CWyD#V+cdOS{b-
ze=g~FPT2TB^q$2n1Oy9Spa_XYI=eBv^?Grpz8FLanMW|`fnAhoKR{e4ygg(o$4?%%
z69U%7Eh8db%+-$2`q<f~CF<w`A#zOaX0YE0ByHN#Dkyn<!VzfN8plFa)cuoFvd`$+
zL2c_`;7D(Bz6E1#GQ2MVZA)}hf8_m9y`%;uu9GI7ODo>PEU780`Av%Qv+!IY<=6gQ
zrGj0a%t1)~k@gofHS6imux;ujwTHkQ-C#0ZX$&RQnk;4&@0~40H^?c6%7$73f*VLz
z8I7BqR^S^1uO!6{k_@o#u1cMC0-E!*S!K$?TV|~qIA%$R1RzcoPC<KPjmxkKFe<7-
z`a9JS+eBxIO$DcO5{7Lvi=x2AonL$fdbCH=0dVe?HoKMyt9C5qT^KH4)i|j))|ahX
zMU%G!<_xzcp$zr04W{owk=Bl3>)d$5dCDaqUZBopA$@A>CgHP#q8;Ir2!o_oBTf9Z
zLXa!>weIbX-b=$41APzAgW}=G;dxpzvSyWd)@cWzZB~+P01T%ebzxJLi}j0^P$m~E
z<j+N#g;dbz@_03Yh1;ogUof|MYecBIc(0*Cn>}lNW<=GJcQu^KC`sPctF28cdDq!8
zmv>Y?5Gz;@4KEW6tI2E|`DL^r_+E9Tq8Juw{f+T8%HScGk*OIfdNMwH`3eODr^QAP
z0l`=`SurO6PLL_gbTWHzSdW<QeH5+HS(_gjhs#Y=uV}LDrq2-Je!6i)x6vKE1|DEA
zC<YdSJjNa9jBF*b&!o0tJ&9_Sjf&?Fq3oQE(W&Kt!VY+r(6SjkokIk8!lHHyk_xjK
zWeT#E2CfsT^=^xm0rvIm>|qVplcACqRlWovBwoBe3v%2K(k|VNA@{o2MuQHMH+tXG
zj(a&PNrvcz?21q{K5=(xjvCiHOwa8U^;%XMU3Y@b>k<cD4uQ&zi&B!i08;PwWtq8C
zw!swavX655?CfC~`dszhu@mZt^=Cnrwn`t?n?xXA5ok&V+MBHxIHeQOiKm5AIwx~Q
zixr7B2$8TzCChBup$K$^*^X@rT`+@+Y2x^{sQKt~B5$uA1f_%=0($sSCvGH@4=Ya>
z4xFSh%-jWzG?kEU7}udk3IfQrIyH1vCHpEEMJEGP6RFAC({l=d!c^?^vQ_7>Oi#rA
zsqoAw{0b|{03ka8%rXb(17?|xjaIHl7LQBY4Bg>VUEVo3xk(j4=79Drnjd!jE1S%E
z4+4{Uhpt&wNNtzbynO*tpt8)0uE2407+IZmakDBs%|p_%GcZB8loV-P6ciS``?elM
zA9bSUYJQ?Xb;<bBU8g^Z<za1}6=d5uBFq2Wg%zJH$OYKs(dM5qpeNgycM9FL!!dlT
zypxOb5sIVrhel6Qkx;6LrZ=XaxD~b{zp@ik0K1O5es4x&<i&*Vxdf8TBOOJ%W@28a
zzQ~H8-q;s!Xd{qR-=y+VTPKuPOF`SHw#v<U2)&VaG@YJl)pec_;`~pkoR+rKAZe;a
zNJ#>`i?MdHZquF>ctsN`qE6`n^M>JYXFt-|k#wovbDT#!m)LMR;h-_lW_OJ8)fx_q
zvH(aAmO*Jl=t-D5m?V6nfB=>HMd2y!;*y8X<@ty);<9umcfqGxrWcGY6A><080K4c
zb2d`DP7aRFP|tql`UxjsqN*3F;Qo63Mkp<z-_Q(~`BDZJ`ZFU0^7vkVijpFC(K+_6
z>%H{z=`-6|QlK0&*JnsrjUNOCRHl7OF8RHz)yfT#WKN1nKvLs}xWu-fMuk6yIpWUn
zuzz+G2D5Gg=nwnn!^v0aTb@AqFij(ZNIogV5FD4SZTQ^-s$)~X&4lv8yF+!cGkM^*
zm{8g6nH|v}wGKgh>ep6rL2lY836eYU5B#ZT%KRaIjHgy1+I%}y(eDM^1@No|!P1oV
z?5GS<jT#{knJ$YqHPBsURi{h$$Eg7mdXi9QfPgFj1cOv>ZeXEMFN+W?l*$w*{md!Z
zh2$TUaO}9F<peH!yml_Du4$p<pMa9EHpzxSAZwmo#W-n=_>_T3GnjuKd-8>?%c@YO
zOgkeM9m*P(%Xfo{Yz6qKx#O?u$jfPvpPK@<jz<3(UD&ch0a-=Q{=KWSh$LiOaHWVn
z4Gu41^{?YcU1SntKt%Gerg?B!k<GpYJ(Q!xK}dWB?$X5WGo(~Ge^$5xiUhVWpmJwG
zQ1zK(h7>ZfH!V<%C^g0~?+LXdSn1!O%h^?#)j(6)0$jza=*Pi-D>hisj6S4eG)Vj~
zC7(-Z?M%S6nnUA^x(KOVt7j!M{?z+2;8@l%3o#Rlvn4bv%)@HekdAmmrm6|oHDQ7}
z57$SZEut-`sR9j^jqLLj<kLM?@W3Z45J>g33Dj~M{wh=FatC$y&co81SvLAjdnL2M
zZluaR-WP|v7hNG!3P-~K=L}b7<ZoCB%Xra1HWgZFbOH2~3$KFIp1h!Bj5Ub*DWxW8
zM`Ux)5&sUUbf!zaopK4kr;3*S<GPp-KW5eCgFWSE&zRZssp%V~m?S7D_Q*&uV_EKL
zhztR(7{X;o6uQL68UCFdt4a8q94LS66R6-*+*dua05Gd)A$tWdi4Q75)?sZF#`j#M
z%^x`V6OkDbSDs#<jXBA$e{?paKgd*#34get=6JZW;>%}WTAbZrTh`mHVQJ~ex*;F<
z=<!ZZ+7e7hIDg@5l~5ZEhRguj&DgaB90*0x;;Lj0J1gurF1cCgh){(<Bhjno;;sXA
z2Qal1m#YF@RoV0}^?9|Pj+;4x$-E~np*pIt5M0&`m2iPb8{d>v%bS8=u1lr{fU`51
zPiZA+((An(36K~Uw)VWM$xcoW#sidFPG4-%?sF3l*R1xE6GX2k@swzPJ$=v{XpN@C
zt!5fyY3Lp*jiAJt@Cj;4uEPw~F5meqh_YoFN7K}`9)9Dh%rt|z*n2?*AWV9K7-{DZ
zgl9%lBoz_N6jC1`*90hxSG~ugNZ-aBxG>V%G@~pawalGj!g6FK(TCkf`Kd(S!dggk
zWped(^3!zhug5n_qA)f{gG4>z9K*ZW7&98z&pA_fT@!YzuZV5eg|>=!8bs$>+(?tJ
z^$BPvDc52A1UVpA8wd@uqHJ{&);KB)WO3mZQF3*N)C|aU$iq-%7b2+~Ym>+^GkM$q
zqvgsM#_<`~P80(Om6tc$J}um#W+B1>$P5NDWWi7YsheKtwJDWSzFGpGQITex=(>Zd
zyJ$M~Nc5<)1{El35@I-(cwe>$0gVbr#d#S6P%lndpN&t%$3US6S;~#{ZZRe;^u1*7
z%GMO#2CDX@Ko(CQj{B(&_EB(ZaPt(cl?`A{T*W}qCA<Ivvk%>FCqpNnfwqc3;AM(f
zHYvBPjJuSC>!1YU$6|Vc6N%`RR*FX8`r?VsF5?sW(HKDx!{(z)(WOS!538}|`8)_B
z(%VDD7MNZ9nRiT+%6TGDGo8Um@qfEk!U$L$tM+&uUP?rIPRr&>#AY=xr?|o{`T+41
zgDIf;b(6Tn#>g(PFbV#f+{DqIc32WM#oO(4g1!M|b)wUy(iHY5`JS>l)&t1vHUhnW
z1%^4Y%qCfMmj~6(DZ0OXzA3?$DUU=U4iYw_CJEgux=C?K5xzuwyOh(nas$b$5^G(2
z&PcRP4Ze~w6tZRews2BttHaStD`Sv#jmv8If(0FZi92IV0!AV&fUk+QXz+1weql<e
zF<oGTPF1-0k;1k|S!t8ggOYr8`P^z<OlQ5`rEiU?veT5-;2e`YikF&4C<%4MIvGkC
zcv(p?gIs}whORw(_sQSsswwQP5ju#P&N%nN<s|Szqiogilfmflu(!JU62&I^Utp^+
z`{LjgP8e6Wf7-mi@$HXy*KiL@??u;}PozQuu2rXerDJSMdS89{<#*qF^NF~ozaAd`
z?(o~M4u@YKe*ODzzxwW94_^#_|8L(8emDH`ci#+O4E}Za-PbR^{&u*w_T`fQeX_c`
z+70O^|MD;Y()(gCeDeiWzWL;bA8^O(&9A@x_M6_ne0lTB-VZ-~vN}5E%Uv!$S>>qV
zW%74#YTL&+u;!40PgdWFp?_^n(e>S(J3s%t|L09Y*R?-XqvZRD`tyzZyLa{<Jlbo0
z?pMDA6O@*`?&ZgO-|YY8n;*Yv_2M4tv?qJQg<E-Y{#LiIb>EL4efQ*VTie^MzU!a?
zfJzbibvNJsZEN>;KYzW`>c)UziA9%KTTnunc-`aOogaVt-M@eRu+<|X7GMb8K07=_
zW*aRc^f}w2c*?(J&w^idzu(^b?#ca)zdq>bw_V~mbQ*wG-+4X8U+?W~-2dx$&1LU8
zq^o=RdF$t&Z{OekT?^9oQC{80zkhS@=imM9r=MDV<R_Z-w|5`yJly{I?!ULb1#0Qe
z2Hrc=Uq0UXY5(^2?{-^XLWTzvK8za!T1i>CjuwrPp4{L1>rcP`TWh2Tb;^*Wt<>H8
z?e|-cAOHCKCb2!ji7oD!LQOP4#o@_ay=?sZH-CAsbHBM@NLiShDOAI>x&3Hw|Iwo+
z`it}B`s1(n_V4`V@m7<{t5fLu^Pj)F|MT5%wjQ_8>bwO4Xz<s)Z}-33xV^LA{V64-
zhXqzQRba8*Ur|^*w5Z{G@aJ#u?f<y*q%{Z#3@eWq85FeMrh7-ILe17&s6cp6c@&%u
zJlOu~+i(9ZjG-?ur$<!7)M}RfOkQ4*DWfTfo;&1+{DGf13O|I_{w9nej^F&ly|?W7
z<A)|F(OKxpo@VES`>4H6whwNaBCfGEk5IVp`0Uu`UnB0%-+s68`~A%yI}j(+pty<p
z)6F|~zxnC$pEp{c0u(wMc{s-HH4W{s|I<%@`S-o=np*UiUo`q;V<2<!2ls|Eo}52`
z*9%2$^JlxmSq<u6_aA)oyN6rOI-jh<?LD0wd=VA{+DNbUS(|~3&3x$D)nPa7<}x!0
z;w5g#MZ`sT(IALt|9a&f9M0@DycWNlz0JM~wQriu&t{{e?1S4N>jZlG<`^Eq<NoyZ
z7gP|5VqA4{@nfPC&T?cF1{0ZoZ&>XD*dY9%xcP^lq2uyi`h@-;9EddjD$O98P7s7Y
zamfe8jemp1U1jJZ$hAe>nDUA2{5xiy<(s#@rdXuanOHX2*zC0@pFC=SViUoPia%}7
zA-@|vqOGKl$9Z2!rNu_`5<?fgM`ts{e;E1jNy+LlJ<GrocGwxdglIzv4Qoz#1X95%
z2*Hqd*=Ji+0e1^IZgf86AJM}cTrY!3H#MEAK*CW3Dl7p9ql4GC&*9t0g^KjA9=Ljc
zN8<q^9kX%Yd_{h8n5hGJ(rw(cv(bQBz3ETT^{h{>aqKkNipP>z6gFj@5%r>SEwm`+
zD+dWol8A3aINA9zLJal(N^1Fz-w7Vbr}~~9bR;}qzBh1*PSb8A#57ITtUVk9D<|4u
zbK~*m*27<RHukpA=Bu@@^!e`g*4CY0_P6UdiQVXmGJJHcDd-H*#_8;?Kx>q+_~Dmd
zw)c0oe)*;M`4_#Fm8`|rlITfT&7VKLCclS+YZT^mt*<JH#;Myr9_#Jp)*K%A)%l-r
zoxS1U=TZN5Oar`+j5ZmOj+RjRb@k1tzbaXQs~SeUN@;Hbh;H_C*a70Z8~HrRk9C0)
zm`_#@&rZ0KGUd{#wbVqY`g?>nb(jmG(~R<j7_;*bIggXJ-9+||8W7>&4`PvD^6JPp
z=|NXsJYLq(zM8g*cY(WfA0wIP=(0Wvr1scjCG!Ac@RzPMK)kAJl-%sq&we>P@wT1D
zx_#K$AokL^W3^s78)z@fCNKi-BC`&%Fi&EX9+%Cqqbiz|{MI>5PoI%~u?1e-6a|Tv
zX%->vM39efkS=cNkS=b@kS=Z}J%TG2WPscx&Rx*P`^u;q--X}aChk)?te8iro=W>_
z4@<?w=#>0sy}h+p^5ue{El@ELXtooOO~t+(2}&>B@iI4i-R~moxnIk`&Y#*?g07BZ
zL>h2z1L=iUD?h%G70jP`+op4#zi7TGzEg*LXs=JCUEw|F>)E3_9jzdcNg6kG0u<o^
z1iD=7cY+M<!eVFrfW!qB{hwo#aRTe@>;Q?|SxI?3x9y3v)b^UVFqYaUTHihC|DL{B
zYc^ktH5T++enbby<k+L4x_oQMDLgw|Bp&W%DK&#DJzz$4^sBKbsz}hYrAr_<Lf?^i
zoKXA{qK5cBGrGJgS$J;!%^zVGK5pW_G}4yVdOAAyky_o_unW2;&qEu0NK&nmY&HKl
zKjWk~<!{26(~dDf<au$PRzdJEct|zrOX+dD!W>yXxF?)E7z>9|wpxBD-Ar9(DD&sm
z@|$qEse$?wC<7a5GQt%cFyl`KgujS3*)3c07`7Hv?P(4&MXq=(K-W+&vFkV-B3;Mg
z6}oYj$spfYt@iHGg>IDcW5_u;8ezYL>B#<SVUJ>IhmNLnQb>n2S+6C}TbhzFH7E#|
z=knHVpe5f4!vGJreH<YAhQY*1P+x0SN<1cCB8QC=azmz6F^L$v8{}PFAV=<Xa_>p!
zGWRJxr{Dv|CPWS$KeojT;4I2b#g4#9lyzyd*An*NUpqFn$#nESs!d*|Gls}ZbE<&E
zRB=t7*vOIEjJ~_Zm?pQchQnbB@>eezz6*OvDl_$BvXMk<M*qK#Aav<^*0b3dku|tW
z?})G>K|I4j2dH#BK177y1OV=VMuRf&R~?^@Pn6=BKA{EC4SGQV1|&{lZZD<>lhF(2
zQ#xpz{W_k!j{OT2!#7R=h8<%lr|%_EKYy_rl3@Xs%^#!l_n)TAWaGh{Mo}-5qjQ>(
z`=Lfqz<s!YI^drUL7=#zdRs2%MMf%zj}V%AzE317gI^5SCQ{e^xU4r(^by_|EDw%i
zM^pGxs5BwvLyCOw8Wz>iF~(iniP~hSB6sY*3+=KrtEkJtS9V&R7+fX{VS&3v>BKuM
zWd{_+rVjua@j{pbBt|MVa=CzL;a|HtOC+G`n|GYFZ0U{Z>E01i*=8L*(cYe@s33QK
zte<>Ak_oIJ#?=@_#aLA3W%J}wZoH^ZNgo#WM)8s~zdnM<Tddrxw#t4j?VQ@qQLm{{
zp$yXt9YW%tOs7?^SpcM`m6l1bqIw8Vi|T@cSrfcreJN`m_1X1(L&|>NJM14##RE+h
zxhe^&-@0tm-z{0DuUaA~Kw$zyTX!(Ly#@c-pQOX}?}Ab6X`<_l;=k{G^QAUnnk8(!
zL!^{oWqJl(ZS;yD61eo%1FMpYPd}!}aPgUj2dWMH2}=TZSdtGFDf%GSB^+Dc2Y<sI
z35Wn!{$O_*_34K+8+0QIgo}H2;x?R|Yx7%oIyDx5y4_XcW!|TS(`H`NWgRs0`dG>z
zGp_>yqI0V5rJ2_UfcUTuKs|9)>&~Y0hR4?;t=N&Wpk?J^nb*G4@iOnD1um6&pLRP_
z=6xklCb>q(6Z6_H@Sx25lol%Yp)6?K^q(yCjrvgLwJkg=bDOHij1Q|IOUPD^2Uo~V
zQBlI7dvc5b+bd`qx$3t(+n|ncW{hA(kwg;t$LDQQdY8}M{B=vLHME+$)hVYO38Hhv
z+-W7HIzDE|$lS~CP->jl(3~FO^5S{J&f2O7nNABKZt379J}Xt?5}%}v71l9?+AISl
zv+>;}iY)4FQ>JZkDg$k`Rxb;KFq}}eo9?oRrVgD>?$HfbqW-#OgXqs?j~RSPUC#==
zV#^mU(f~=gH5AD@aX*`PXjVLljj_tPZ|#oem*KOvF-&RTY^&wnsHIbXt}i-1<Dj4V
zBYs?d;@BomR%|z^wDFMoT9Jy>l#7<j5p(EZ&dgMNjBZBr%7q{O(<Ng;egLh}EEYs(
zPk7K@uu~r4dR9J9&H0X(72Pb}LrCXKv`h2E)|IXnL3u^Kbrso}<-F6#b9N-z$aC5i
zm??H9(o6XeN3XglC9pV=Epc7#PNdK3aREr_l45o!9u}X>*?P&C^BSZDc={}xLdOmR
zJ$AfNsG4M7JHuR`G!#{Bm<1N9WuSLezna@qr?%;Mk)wxP9CAVGoQYTJrFg(;08Hs|
zP5X8!9tPm8*R8emC@om^odg$12*L2l33*jg53QFA``RQOuw5AgWv^Y$(0}*MBO;oj
zl#4hJaJS|1rE)xbJO_RV3vBXQS4O7J=CnyY7i^)C8>tg}kiMvdLv)4RN5m0wZrPrJ
zfX-;@go3<OqhkQ)q(>~_O^4JW3KlmIw>vlhgbIgmRzJHiBcO03<aabkBi9@3nnHR-
zcd8P=T!{+9htWWjmL(uy89dFLm3c!x4;y|R+WInVQZP!kgAekf%it07{ZU68b@FtK
zYIl$WRN*$RD5Am0hKrB<!-f!4skZJ110W2KH1iMVA<7$p&a(~H?Q<$<Rc2hJ04hRV
zD&ImtljRm{xpD=YYuFk!u3eRRWUEMZdF*d<!g0DxHVHF$e3r|4KGwS!YuOGgwxrVw
z<o*q2LL5zqv*|_wYAsil_x<|?pf2vfKwaFj3)EWLbOKd3?G#K6oXFRmI9)Jm=XVA|
zXM_0@??l`Jcsjo`csd(&!P9abgNct2s6ZE>l-%1CymnYNTrvJ4M!#l!<tMxA>_vsM
z1V?7qoNB494VS(TyebcqQga1%FYSQ3#P1ChUgSd{R7Ud+rRX0%n3{9f5_AxIUg-R4
zPO~7wrNrYN)gNK0iVQ7;I*w{975DbE+S)`_Ofjw-U;AxIj);~f@1#s4mCgoCDlHu!
zBWQg27NM~<sng2zThct~ByXEkXM@g3RmwHavIYFhR9~~(nu3-JeqIT;O5f$c7^(Am
zABCha_7Tq=qw)~*NY&H!c)|uU9SLDmk{8J3Q6lf<Y=SgNHB17!oMs$5n=TtXl*K+X
z1p15kHEdzNs}GV&Z8fs9_>A6)9kAqb4p~Z604(b`O}nxu91bs-BUD1iSpE)OMZ*ek
zGCaJ*ECttQExW5)eZ@xg+y@$;uzyR0>J<s@0C`%V4;0=i(;~H5rFcW%wSbaUIVcz;
zHQ`H{3%dme1k1!=-UvnJ1(u8>OCz<`cI}LVHo|-wfg+c7iQdS;Yw2#?_+A)NA>LAU
z+RC*%sEkH8;TgA3@e0<)vWo!Of|AHjmkt@O#!1YSKR&rV9?v$9hW(SX<g)jD;hZ)f
zhPJe0m6hcK+@j`xS+`BEAw_UDr$dnEQjsch6ShI%6A&fk?sVS4j$3SPML4qxB_q9H
zt7Jh+74sxPNJ>yv&o#NQ;2OC+<WHojNMAYPN;*{!!b;=1*}!Obar42DFE2OvY`!jH
z6kz_x3R?Ti&=ui;OJNpxX#rcER=Vj}<JHG%^Vw&`LLxQ>E*h;+E=WOG8OlRUscao%
zmBKL<tpZ%e@Y%^GN!PQfh*zq7S<Ef_uxkYjvkO)Nmg@8st%bF(hs&XDF-4vvb7O6Y
zNFv8A04UaLZ8Uhd4$Xe4k(qs@hM^rAJVaCySQ=H(Cb!RLL)5)L9K9_##@dPi2e(K`
zI_7$Nw|3O*NVNx7-m#|AjgR4;1!pvRA~CAc6ugww39{+>69jzk6iqHP=0sd+;Qq-=
zFrhitY-P+7q>&&Z5n3H$mihd+(Mk@O5s_t46>uZtumLKkMrkZc3aQ^k9?leZE6bH?
zMD^l+nEDnA0j*=4<qXlMgs=g4jkf2Y_m}<2i#|dj52(HYi@q3DhI~*oKBs~`f(xfX
z!LfN0i_nr*f>7`y2C1B;av#v601KFaB7Kn3DYf^sMw0@?K=_pgIr(XjoPLZcgCsqu
zPH;WtFuK_Nm<!!v_7j{Kogy_+BS5hW)VN|gmWE6K_OdQnCJR$Qr2=w62n9GSVhiZQ
z>5y(Z%z1*dUf1+CMBlvf?HopjLU<R7AQ}tVrAl%n>W0cVR!fm@*$}|cEEe?@9B??s
z8d>@-Gf<_Hzq(tn_V<6Hnumeg`Ou-!)L=C#m+EW*5~n5d1Sk(AaGvI)Jo6bT@7dIh
zrE(nF)3$u_zL-ZvCuODS4R(}mBy2+a5g`(mO0Y1jjpe<%e)ee<O^^vZLTVHOoiA*p
z34#fg8hpulru@Ie9i-y=%p7N44j~>05SI(gy=|(wE9H(Y%Gzosph9V%NB$h8MMntk
z&ALE1hkfvpoI$_<eE^{XGv5B?su11|Zi54=&^sJxw-DJ>9#ePOgSFm+Lj(^$|Ksc}
zRL`H*6Y$S_xCO6={0QV0*r=qu$XMkYGZ4Auap2myCIrp2!Vef8>YA@CB9Up6rU2#s
z2?ae5C&RPjI7Jr++?*1KD6}@6@K{O_VN>NKj?NIe4rvfHDaAHN@Ivmw6bwvPH9r`j
z<9)&LgF7mNd9s5uy09H60|9Y(bt9~Kx`z5sDCe<hw{$(B0O^erl)a(}jp1Y(NFTq_
zB{0&MAU+&X(V-IF#<Z2R(d*9krU_iWQAVL!t`|+Zknm*vp_v{LU)m?s!r8$qN{vS;
zXB;pBx6>KLe6|3jZ*Zx#r7{CjkH;=nLtCO(E$h&Gan2|})b<30jpZg1R)loe3DQ5J
zoD91eCS_AK(hjC5a3?|W8z>z*+hHYvU~u5g{^a5g*2>D0w6ad9uQH`;4|6G>f+dhS
z#PEX3TDX}}?KdEu{vmWH-vSW_K1!Irj@#uAhDX;a1phkaZ(VP7D2ZLGJv}aB%Rrum
zzMF)~t=4eYlO7oFy`8gCXhy8*>l8Zggo-G&k3Ju1_^-njr``Ixa1ar`fNTi4G8IV@
zoJeetUTAh}=7XqEmJQf8O9BLB9fh2Lohjrb*biZLl$L}mYY%nmF4%$<fmPc}>xfdS
zEXNTKsJg=Bif$Jw0in-DW$6#$Nc~YTls+}W&B)u|W#np4ISDWXl@m4Uy8`E36-Y^*
zli`AZ7n@$;xY)p{d!93QEnUE1riI}MJ*Dk+!l5A0F==1Xu0jQp9a%61KxF^(KleU$
z3paRdx{n*Mt{t6GMRC?!uyW*TFEVYpkV-JNt`SWZSYrw=Nf9)6b_72Tlq=GvU?iOk
zu37gsvut}(c1i{d>zi`Y2s!XMgUMj<m{kw=P%}t2q!SmN&GS5aDXPu!@hMWiUclPV
zHia0jl^x>PDrO|Jx4D~%v!{IH%gzN`qy|<R*uElK5GDz$CHqwGFcH)ft~TiKWVg)$
z_$nyNx>n{OdzURwv@K$>aBY<>Cfeu})=0C2=K`p;vngbYK7eT5Jws(G9Orprqu)0o
zHr<^@8=sSn?Zd`FZAjUMz?DdzL#&}q%6y5%Lgk-<!hYhSNFg-k-ZCe9L>~HWa@Q9_
zIoJxEAj=JN0X)d%J<_0<0R2OuH?s6y<thVB*(`3{;EJZY2ax`UT7WHxb5dRbQQ^&B
zMzdENYBH{vj5mzY%?r>A!>AdwtFA$AAtir&GQ2Y!p00GXxzP(LGN={?S?gX;vLB=x
zH~qz)YEoNM7-^{ul;m_cgdTqh3NU&!*vlpG-!0lqFH3vZ-_S)oU_n$;3QQtY>22mI
zG1<$pYc=gY*u9#5!o})+p}Hn=kg(?)BFN^~FlNOXWL|C|IE*=s^ZT?YllR4WlB40^
z$;s^_?Dv@{%Qi%NIQB_WhG^1zDCk@1S;;Lp)MPV@le}%eZfB)MIYwC|_&)8V4_92&
zOe_l0jm+nUYYfC^ayz0`g8Z~Cdfk#dEU=U^sb9BZE#(r4q-JX-jv{IxFd8Yw(4Y3l
zZq=t*IBYdQ@=B5J`C#JM_>_^-8Bw00r8SLePe75enb}2x3D@e`<W%10qiejm#gs1`
zm6m|Y<#4Qoe!L6E!t~X6HkWR~>|3)zze0(-WF!VL7nZa2U0BR6P5>W=98_9#r&9WX
z6`<FK0X;}9o`zvSq`WZ-FzPqe^Kf36bwK`q&PLY{i}L_muz)h-KD7gY36kam@)@?U
zlA04A7WO+|ZNNDR*=l!~a=I$nB^jNyZi1^8{-1{aNr1iU4Uxebm!dG_xvm+R@|xQZ
z-v~PZY^zQNt<G$4E%a;HWA-XAyJlxy)(DY<|8xQ6tB!3-8+{jiO<|2UXg2A{r7az-
zTLVW~&iwWE8XG>udFtY0+Nj{6yI@=r)Iyu@<%D3j)J|CM;h2;TNjnvGAiIJJ!W&b-
z23`nH2s}juhdXT>iz?sAQ3uZ${zPO0)!|GODS{O(BR?tK8DY*w3q-Po_L|zof>i&V
zt`;;<MTXWRN$8WLCAoXlysIh^b#a{Tm$D@nP0au+Cm_#-E)+-O)BheQ8mANXtHIFR
ziCqdoD6%mJM@|O|sUS@8vdcX_T>u1A6ECS8>WIK>fK3-7W|2o9K=;9b8+B5@K(c`R
zrKihbWzH0rUfys*0oVO8In-(2z^XMb4$`A)z2w_Ragb>bK5;l{aYRp*s`&|>UeL|y
z<KDH&kYZR+JCniqoR1#(Y=GMK(`kYqWT&$Pbp+~%c3_Z<Yxc{N&jkQ99Mukc;ZVc@
zh*X7DFCra?z(Ig|*#t0E2NCxn&QW>ldTC*hyG4gMdf@Uz>NyV;d}aXda-Ceskpn@q
z2Dbs<Eij-$ZYYYRv-QWkhFlY=#+^<ucr@uyIH=wjaYJ|IIZj<I`ZzkgDz~WE3a=q4
z85SFG4uqlFn`##{ZTU!jIZUCgKZAaAH{(4Hd=#1pU#U(?Rm#z>tC1?M!d}`$HFxF-
z<)J`A<N=M898hSMO6A}nbq}~3ILep9Iv^x`8b+b-11`h_$~CWiLirtZR2~|aUe9Z|
z!i8)49J7~^4rXwh%V5pTKE;Sk;&?>W6y>;)(-$F&J1X7#=Ar=HudH6f8gfr=E``Fw
zBI^tRGPt$B3lE$!{`c5o7(o0eEIVzE@rktb!4yr>Bb>kXHP)liKe~9MS8x}l?P(x}
zK0$*z)d@W}sG4v1osDaI{73z_U}(4~0R<66A|zU3$JDL0<Iphc2_qDpfa#W4lokZb
zu0sSStOI7!xVoToL1Hi2l&~nplwwmIaL&Tit$AT$pS(CN6cEi6D9vCC-(d0K@S2@3
zy@1sRS<f<R)rQFOvI|;ua*2hlzWtyDu6oO+EDK$=!IZIt)#JqrZ}w65*N%t|Y^&5E
z)}6c3P9+tT<plREEP@kRA`KF$bz$IE+J(_^19r0=k|95hfJjo0XJ>mfNk|Ang=0n|
zc(GMAOKV-d@UO&ydhN@%UrW%e$%g3E<#fq8bL01^N4n~EDKxwx8xVnpU%vfPPvhQ2
z=lVy)sObd84`e#<a}eCd6hbp+5?46ij113CNWtUUtJy0A0;t`g(TDr-U8l;{gBxE9
z(5(@6OHs>kJXY9D(NiBGgUS1yyS}ZFCVc>cDTQlHR%~=QaVH}vZ%R7L4GDlxb~Ll3
z%_CE><lPN(Y#R^bqrswHx(OCCDk+XRG+`8_3tHHvyJs&bI*WE-P0RGcM54gzcoqcs
z&zTA-2^`lS@@a8OXD4jH-Q~8mP+}lIK4a`WC#=y>Z0a3grN{aMebI!Sqdl@y4)s{>
zC8>h?Jv%57eC~8=6ZWB*;`~=Zuq_gmg$ZM*_3vwAJ1OsU(d@iofu0&2MFan^V^7!P
zh!}4*=a8>|1nIV=8`FARBPe1V?@oLPkjqHkk(feO4gM>thVJt|KA5{ENagR9@Z(|O
z9CB7Z;;k3_t+W>G>2I!*Neyn@<?e1cxdT;b09KaV5nj{ysI6EYdeCFXo6$!>)E@wp
zij6$w<TrpyX3#tr2&3PvG9jAy$$70MjjkpQW8vVuL2kR;rl&)A*UnB0ryJagv}q=>
z9p>%(PmYwtN&e{&^~X=F1})FmqwK?Xi@j$CM&a%PbE;7-4ln%f@Sj-+5!|A)`M$H|
zJ9rPjS&kV6<f`3fw37Rm^PCyuDkqmhm%#qt<2h?lz(0IvSLZv+F6YW+<3GG-!Pr&<
zz}=Z~&kL*e(#{sQ;$2@aT#0D=e~^2{$Id1N<Gz?wW59p-&rn<i3OE`1dhQR@b$d0I
zS=#FB4_e}?x5iReZ9vCZ^6IeyGH2;UZXj~2^J}N_-^PPx8wuH~V{M$|mvo<@)OawJ
z$gXy;x=#gm&;J0onXFCb$@&PB11>-}<feicxu-vL=#2C-2M(5pw<90qRI;^hDKGQs
zV4#oeQ7Wi~4lQ@4Z)}2cI=`1321HRiyFa@aDL!`^vk9~&_km6<!&~LS@)x$K*#f%z
z%A0}f6MNl?wm!{LG2!f!4_EmBs^$d{-JYxtOYx$oPAsBKz?m{nQZZc7>gKb-qP4b#
z-FYMbd!1Ai22xNpuy-NU%9k$`gssc#^j&Ul{6*7=)al+KADw?%?4NqbmK(jKTwTbe
zOZuK>;x@ub`Q)6vM*LUwI9cC&W#qT$3_NW~L6BmNw$cDw?w|+4ys-+74CB&}CD2+I
zXHWl-wYl@Po!t0?yj^88So`XQk%oo`lzQnSO~r&rLp^y!uhoU9e0=p{{Z<aXdSpkt
z5xG*=6+pC{ckhZpGID5mLs_1mMb}9Y?^}Z+y$LP~_nI+2Zt|8~WW5rO^2@b2L=aW#
zq~iWszB7%b3SUs@m<coT$WaVg;p!^9>e`1sMWzp5%{Ss}EMpLw_3FJz+>VsLpph)8
z|C9_cZ51N7?0ZPR7$(#xx~6jbH_(O!)yjw$jzG$GL)NngxKp8{DLcKyii=Y+3JPoC
zOkx^6(uKu~^)6_c))$S*w$BIA60Z-=3@A=pi%&Cw$k`+6CCpyI3bqO*Y-OOR04{J4
z>XZLlRe~_f1`Tp01dd`f40VuV8bx~v4~iH_qA&r~2~Y|yTn#z53HA2bAqsE~k-VBr
zW<=vqC1%FWe@Eiw+LIt$-V>q%nT20|R9Y6!p*7+pAdDrbTgitnU`vQJy&*CsS#Idj
zxv1bnVWyB;kj^mn`8H=R3t(|DaXWxY7h2b30cn%%<l-^AY?8z*LQzq`r|8QV1Su$d
z6(l8Bqn-k824<Kb_4`x0K9I_792}huxC3IlKw)-=UzDNM&MlH8!3k2tNFFI^qKxd<
z&@~QQxVTRuXZlt*R=(T7vyib}4Q+RBTdvPu>dju|Iok-v&4CbLAzELLPBl{uU{bi}
zXsW+0>8kh6E}X&rA+^WA3)L60QAmIVn&sa0`c!QLE1+3<6kVNNHMvOA@kv!P#=8(n
zHey!)AP|zhZ$VVhLQMm^t=b`x8Ym9hM#vy=;^64o`Az257Z8eQ0<zv7x`!mdP-@`h
z?C5BIrGY@R%!OAMZd^tXiyWcsspp&h6G|PE>G?#;Rf3Q^K|*sPddd{#V|Xc{@Z5Sd
zp{9EbVM*z{k$gR8x0*y?Ywe>T)FeO|B=Ds>c-q7J01f+BzGzYlNV@%8M^Q{P4dI>P
z@%Rl=9Z<R|;t~ccA_he~qwp%{FmQD%+L3Xl2j?=Jp|l!`JgM$)GA_ckAfF%Wt-Gr|
zDqD&xoKG;O-6#tw{Obr=`Xvk)c+&e1Tv`wLF-9H+3G7$0f&RRQ%01cGRE_F6)c|^q
zyvA}eR3MLrC@b#327?@;LQ(h{JB)+TAyT@j(kv<m1=6BhZrN$TK~jtw5|d=Z@%LKg
zO7xhFM9`Kn%6qnP2%10`)0GTQoSI2JXR;z|LZ0hSb$oA?(cRqgXW8T^xlff3_P@q2
zW*Y08jD2)wo1JwctP|n3d~e1<>ZD~TmS-3}>r)i0I|6+;pFr7Y98>0~>!D<wGpgmJ
z<KB(_?BErSV~pAm*Pl@z0&=xCu5g!6!V#e9*Hw1`%Os}MMk106pDLE9flNJhv!TTD
zy{{WZ2%ATSV{mV+&BhPMzYZsxU^A*Sjbut)<NQq+QQ`Qs8pzuyOtvJf;6*evNu*vC
z^IM~K)o~<R#JTO#5*F1|{Z1t%B_2PSg}?(<=)y9?3FqbHBD;xMM|IR7<bg&jeU@Z>
zQ`7{SW@UwVl=KBZfusRC<4|SctI)^J@L)JPosq$iy0M3vB<0fx-xXE}Nlf>Xp|jig
z&3RS`%;Ejm;;zE3NU>oTb_K|y?Lm{xGKv)Jo1Eq4&^Sf6xRep5`W{GIVnipfNvMJ-
zT?h2Qe3Ovbgj5;|H3Xet<(sySj1FaXUFNcdXKtE5)CW<#A@Pu^FZ-|PyM^$4t9Z(c
zb$w=?nqyGJM7Fw)Ph$Tz`0Sna1;Avo4jcn6MwnTT`;*s?DeU`>6&Re}K`jvIv$*J}
zYwh0$9*-nqbLfK34UlGZonoy)2_S25bz<tU+?5%oI;y)ga~pBZxoxA!;O+hq1wO7U
z^;uW=WkO8D^a``tG+`9$475kKE)DQ^2+)Lj>S=ZGq`!bxRF@mBaaHb>Yf{FWM4;lk
ziB<$XaeMEbhARavC<GNg!62{?@dsUMZ<|``|8l#oJ0u9_W!DNC3hAdhb~mqk@({H(
z;OCMKkK~7nL9?04N-6!xq<>y?UbNX86A?<M#Vb_TY!+UO&Qo2+s2x}^@j^<Wc4-ng
zs+d>Cj(2dAi5RIxE15m*4zpq~48DsH+8i<$FH?V}doy*7#?DtBcI&_{MWxMmwB!S+
z6ZvV;jjP@x-Z84>9dH<v@a-5NK`{Zv68)C7^{PE$Im!3k9lp^#%?F2JmG`|auN$TX
z&@MQyEg})crD1@WAGPdrN+5fy(2iw`SU8BVIFHiUj4V3PavcHL0*Nv~m^`gXrF0AM
zeEQJ1`Bc_>PvI>p9^NDmQt^zb|CtHRq+~yeCR?;f5F!P5rp_yMrkdJz1GKF{06@TB
zE)!(k3qidvPDx@!^4)?4srmo};^ic?$-bs<j0C<+yAYxnQA4^`dvF-r=nI=uRtE62
z%jM&6%8&?_-mu%dYb0-g?-7l4jFX+?9?BoTfJKa1qkc8YNZ=0|f#C2O3>_t0<pct)
zWg^r)haaJP`PWQs5_d<#m;Hl$ci#zTD}qg6W{~^GsMU#z*lNfF)R&_-@F9;a-J4vS
zQ*tpw{ou{Kagt5QIO*vBw14j9C<4Y&2$S8|oC^Rd!r32Z71KVWb5J`I*e8z;m0%vh
zI<bd9)0^Q@?^l2i^p}2<glcQ=l_|S=;sVq};TzizP%B#NSat%Zm7VXU7!4vevOn}q
zf|M2&0Cjd{F&UvRboE4|K$h<Zc$nlh0Tm()jyoBUjD&fe(t*@~axbWPCrtDbEB=s?
zyxQB+(;>w=y@ddxOB({}Kh##i{4r#9>PtTA3z4}EgsW7yCEf=e6pwt>^*Jz+{*sd~
z=^Zba6ZLJ2uhJ`L1%1?5Kz&1q%9kX(F#Hk(sTi@SxxhQB-&oJgk=(wyx+<F`fIvdx
zy?ohMZ>=bi6jllqD-G~!qi7YF8!HPeO5{KrV*H9Ep^qY2(4#q|p|71h+*r^>@0n}>
ze8y2mk3Hw}K*s4|NyyD8F(0Or?69v6jBW6t4(r~NJ5SboJHykX{=u;Kynk~3T#x!a
zB&^p%yWte&*Ji6~pRb<4zqE=c!`=@wG@Kqx;E-CCMqiwaSFO(dDms+W%y6n#%VWB*
zY^S4x*SF83Wui;!jm$o+`<eH-eU;gg%3yOY)T#%ujuu#dYOT@;zBr8yd}Z$GY$3lv
zlxFd0XW3~<a`P@Q>{L8-8+Hh4elr@Q3RW2LH?r_-Xv`Wj-fjTWW$cA7KaR~72LR_g
zYXi<l{kI>@2r7n!3}SO>x#5?z@!m^a+u~rUti*k?tAn-%5k*-VQKyX1lB55NHDM4j
zEG>GvQLhm06{{*kAvBGeFVIq{{NfUo%FE?dTjiPV(CsBFhyO|?5+=VEW}K9P0UQwB
z@r|@J3IG18B6M$^U8TAR-3u#r$j&QM8&aGSCMdi5=@K!jG)t$z-SKVecJPp)drMZ^
zPea(c*--Yoi06xo)>LxXsbh0CL`-9!Zhzn{x!hE>oR)jbVLi0LyPW%i2eQ3kYxqvx
zM%PN=HYU1h4PgoN51O9#5f0!%n1Ps!t(*)?N-?OaWn36ph*@W+Y!x%XA&A!<49mGM
z6f}-f;By%cQNY~DrNyfhrp0j{Z7}e~;?HN}_Q&kQ!uRZv!Tx4CJ{aLZm#!hx0M`J7
zcd<ZcdW4UD5Y9z~3u!M%<hRXhi#r{H%A|!>p^H^Zf5i<5;Y{Dm#`*`(gvkFr_mF_W
z#M4!69dj~A7|KW5K87XAlxB|RLSq_mvIbF8Hus2OSx7~O6`-HK3iN|lLRW=;r)AV%
zyp$%uRCC&fC<n{;Ikf`oXcz^c#dfIZ-%BPMx|_4l$-6eH5Dkb-HokKKJzQFvZ|k?I
zCelYM{v&Ac7$Je(0_y=gAJ$ljCYw_}Qv{)6FB{_bJMUz%rL6Jn>*wTPFy!mh`jQ66
z0So@o<8sL&kfvcRANJ3OldtZv*DPVSy1!i`W~=88nPI^n6l}F_XA5EM0?o_WHQ{?7
z>-oN%Eo_-$R<<Nnf-8g}oZekx!|SrFFadTEXGL+|bVn`jQ^nt83?L&ldX41LR~lF`
zk_F<3#UPj4s(5E4c)raMQth7{?pY;7Jv+ujF7_N)Q1l-ubGeMJ^nfFpk(BlmEzFE7
za$W!Mr+jxLU3<qy5?Xd#PDnwMh$A1Iquv#~{<y-ELNvTD!vvW$1t!c_9rTxi8kTTM
z$&qxr!eFcv)2EO<isyDPiyAOMal9;E3P=^Dg4EFA3xF7Q1Qn<^7?L+(6lpQ}=mm9>
zTFV=BT?U}$>a}aic`BntilAWA43+k{5?|ik(=VUt2h#Fje0+@X$`p)@+rRK&lY%o|
zp5by+RJ>mC?$%ToniL{uW?|iG@7aaCMH3sXj3B`^sYiY)jIbGvJp?Rzcuse65A3Pl
zMtA#sQz9p07)b@NpgG-m6C+5%!ELeBavM64KMh>YRN{ISBN9Yncxf-j#&k;yJ_g#n
zi+scJ<eXy`_ui82oX{O;NY<&KmSV9trn^>Pad3ZFR$+9UC>X73j6{AcAccoO<N?wL
zgDJ6c0<Rb^Ugg(8opbxfwyC>sB`YF0%FYiQMVS{67PQH0(VpOlY#~Inu=$QqR$~vw
zx_)Jrh-NXW$of8sg-;PdnuVzPxFG2Kt6Q-sLbeSJfHbzEcBgs)5)btM*!$Y<xNalO
z@A(yNdC!W<h;2KY%x*YIWLcJN?f69_QppF|CvK4~sYfK6!*1HraP;5zdFl-XT-;_;
zl9Qb|<8u<R@5KcQg{nfK-he^MfEeKD=;K#A@nlN-_O~K6*UNnb=%A9yC;x~g*-NvP
z*3mZ?JHAg$fJ@+OiT79vqe)YxdHoY&?eOLN9F#A=(>mZvFsul|)0ti9JYg|a)GwPA
z#LQH0c!*WP9ih`&4%7k+RSwQ};)*%M^;Y4_5Vp3fDGZLZn6wNp8!PrzE5_c5!ixc1
z;+2@`G9R8}-cGPc3=V?!7dYOt5XBa|2}0D$$QsRqM>em{mD#ccWQse}-tF0p2*UKo
z`1}YSQv@RiqqMB<<LdN{+nZ&THjQ>;D%1?&Tu3%M!XA}($F8yhGCN&)QZ`hG>)SP~
z0G)l?9XVfVt=elSAEC(T-4EyI%kytwNSZy5dms1+XBB;h%>p-%;*^eM#TgyRbcc*m
zPP33y5O^<i9NAsKC&@cqkH`uP20Bj!@>5L$^-v=KYmv{?fj!vJh3HZW-92BXByqE^
zD;Whqje!}{nF*`?siTry-tz39slXZGeHj7zB=NSUfF4v+9pW_%7)dW|V)AYzBqJpk
z>NqJWSOqCN1qop(Fja$t+R8GU<%!FsZECyTP+HaEuS&M5c<T+-g5<3!L>j?4nfx%d
zl+TroomGIXBM$r67vq-BXb;CL{mTznNs-fu>MpM|+sQ;zLxSVv@=cuS5=JY}r+Ibd
zQ1AlbrF!d*i~CG}{V^pU2RzQKlMPFdh+(WBFU@;^3pcTw?I7g-)4%@p;p0d5|N2*i
z+>4a}S|dwpOSBxC#U)6IHpaTwi3ym!b-o%vVSCwT&rhVb_ra_Clmtv<u~^eA8KUsF
z!6v(q0+*;iP62(eWBEoM)IGTc85oZ<E4j^}IlPmjo@`jV+mkM5B%W}3Q|i%QHHTma
zZVy3QUD}t(c37NuEF;0eaq69Ptz#Q&^hz#6e@&2d@`mTL#p*?Ubzr}F3yhG1{9nm#
zl1qM=P-(XyO6d>DNKALqCRD6w-Cx0s5qqiZWK?4G&^|j}ArtIU$5xSH$2SnLP$G17
zJ5B}@nP`c)<%3t(NxDnmiLRP{S2Ci^NCa*9Ngjtp&))^i5H9{Vg??_cSRpv){5v2-
zj_^i&rnb>=w4?K~TZ|=CRPl^!lwXx(Nz)T?BB<_d)X&oS6w%6(5550l`ST;a>(;LD
z^_70Z`!bQWvEx}AwdPKC6G3rjdbmUp0g5E~eGk7@aFnV|cgm=sM|Sg>4HQdC<=(?g
zY^r=<qK1ER(kVeiB-P~Tg2$yoJQ>+Rd~KEp6&V|&N4xv;**RiB(~^Y8MWRkmEWgsT
zDY~lfcILH}40R7z-|+MgDR=jDvV2ODmE;}Z@@dXa^gSluPM%$y%1zqJP8mWV83eOl
zfak>K!TixY1+{Vw6-^X5&=d97v>~dBp8A#E6v`=*mY>Z~ZA6~YvKdJ#lE5m&5_U??
z-_lqQmiIIP#LPb!C2WZ_&nT$056X3;gYL}))r^mX)81^3B?49Ff#8oOrn;S(o_?ki
z+}oueB4X7-K%;YQv*OZ7_Dy4GT_ILa^KHf2Ys8M^a5b!2HzLg-p$>`~xN>WHLj))l
z=Sogm8rwG&TLX-$b;H`oOt>12G4y&;6X6X<3vm4$$`$HwP;lb-{$~lw->E@HO^j$=
zpX%*&NiPG$R5ViE%8B{L<W73EHwg`5`*4r<6E#RFv-6Y807WVx!~$R!gdsNk50k`c
zRS%Y5C`E^@N;nIdDr&S4UdeQ5l1O{f^@SWyJp%Kq<@p+siVnswaB=0sVl7hV^=fFY
z<_HOmY*e(I*+$is)f2g(xi7KPUiIYV{PpdE&mYJ{--)1`T25LaAtSh~ZgFL}%b*t?
z%hL?Q1=c{P?PCEmQsNT=h3kB|(!*<}Iizn$gGusL+M38}a!WK}?2dWmP{t`OHmhOM
zh|X9!?LJ+He1k<Ho9Jc2rb3Qu`qOf8RNYXl^e3h#@_O&AvX8JDCww=#u0^Fvg%f1a
zY3p5}mmWF0S7dkc$v>gdpC-HfcXzj1K;x@dJlT!(^JL-f5Uz%PaH;l8Eh{7+$6_ZE
zB_=-5nTl0h{_K&PwOQfXqsbq1hp3?Bz}AKqaP21z6m)UvoXal+Sd`GHDkh9AH1In`
zdEgg|XKNTXiH@=YK@Uz1uU0m=y>X%vfm90>X(-J!;L6h*YDaHkw1*N*Vq1(!1p8$h
z^gVOy?1@Dk9X9SB*^&Z(MsM{^!&vHY`>PlbpT_OUUulW2+v0N2!Lvc7C&&AiAlihm
zLh6{(&qG@@sw}eE$TODLE!b7&e1*B_I)-XMvmtFEbwq@CASm|>CN4`=eO)B}jx8ar
z6oHD~^=K5|ue5uoA?@CS1~T@)+%kj?Zn4c5Q3WKMP^uHW7v4hp(f~~=PmQ(KSw~8P
zt50CTnlPG0GbSiFq^(8!3Ka|~5H^nhw+B+ZY_MI8C`?sO!cpl*)I*7nn0zAP@6T{;
z8l@#wX+~35`&tSeG!;??3H_Q*E3lYp?EXv74xzfLHQHY03NuQQLv=rm%438Jg)z`a
z2C|j5?n@w}JZHTl)FI-e6BZE=hiXNzna*FKs#LK8cm+G3L$lP?5Hqh`bm$b}^+Pcg
zI|aAnX7xNGPkSLR3D%0AZLUTc4R~C#)@JUf;kRM7hl2>GX22lOKC>AsC|iLG4vHk}
z&3Q5zg!8<IFrN^X#o@O}T!z3@CX0PCSJly#qba=S5A-F<^rmYVn~`V)s-L5icuWgQ
zoqK=18=m7b?X1rm@6jdfX4kR|`Z8;)25Ge)@H_?jS*-3qc=*Zhe)s#dj!;6Z*WsAA
zaM0@BA_`BlT<}S)&k}=w{ZTdI&=MHai1kD^`-Z`TGzonCfRz23CwA1J9*3Lp#qmW=
z*%gqN>f+|HcMRUD{Z;`qHeS7B`h^V%@fbAy>V$?k{f>baGeog3jqEWkt{z$)K4~Zn
zoc2k+-symMTX0i%RXcsrkCwDOSRw+&Z~iQ#*$X-`fl_xQIBs@9FR+)4qwCUjuCtdV
z^5HS;V~>mZHhs|=gR9=mB244`m4(&9Kg4hZ`@sX!jRNY>tgCD3*c8E`%lf`biRJ0|
zFj?Xi{bGN;Jd<6GD=)TCwfBl@k+#Itqi@>>6mASyRBJ7~-4}X~Ub8nFR@7&`ViGLO
zc0Ip$8sq9b1_TkDc?3mX^x0DwI}XZH@9Vs>OiZrWF_m2P-fD|$dN5I-qQ49$M=W<V
z3^xETxgt<H_*aLX#~Lc-DAdx&Jw(hrMKliBFE*gNM1jAMN*WtruX@?Ab-Da0r9}sG
zNb85q1tNKk(gz4fgbkXCs!`Zj@sA3SFcgeU%EDCAke(r+r_ywvXlhff&M&}sPYRY;
zoMj+DLP&!$YMSv6e~6{lKXf*$*QbZJDdFe=J<g2vd0nfyDTTxikI>FDc!QWzREc{i
zai#-!i^cI`UF9^hTZEXce_o!y^dtJM#xEsp{O~#z^+IGIZ~Y!u3Se!iyG5xdD}^~;
z*V!i~{@jyqwF69Q<lMhlRSi+%qkhny_#23PF?3Wv<mKVM{F@$h|DM{vY6-eefe6d_
z+0hcj?HaSwbc6F~rv|A?dnYC7XJIvI#)Ty#kG(jf28&QfS7x1%kBgQ#01yhH8AK43
zt)jj>3Gm{aA2tJT>;`~%k-ynT96K*tAfV-g{B-&hF~wq;x)mQ@9~TEjfc&jaU)9Qp
zWLlnnwp_07LD4$BI4eq(N^J>XQU7~wJv8awD0yEjamOyIzwkzC&pN2G8%h*_P*{}!
zpr7>z^X=HSO^GR}0gByoAhFE}8HTbfam787<ap)QcbB>dK>q=kzT(gYi<r9=uGA5^
zfG!UIEG>2R&r|mhOh28YpSex`yVD17$!0j&U2UJ1udMgfdHWF}J2t!S#TGqut6O-h
z1~82}*oS^~nmbIdDhG8UEbW32fpt7WVFS)H0uvw*>>5cduJ}ca*Juk`IJRcT_H+=#
zK$3ua#9n(8ssIyO(qQ4FENionr6#L{u#1yAlrx*Hc62F$0<uS8zh)S&-EhEo-Nh;`
z6os6;&nxB%kS@xanF|t<19gG1)tC?jv44oOygf&dFjnxV`OXQ+1ZR064k~V7$TX&h
z8})}IEwTftsGV@n=#(^UppFVqDsZd*wq|K2R3dt=HDlz%!};0zksuV4OQ%>f_bEfn
zjx)p+ji@`N6TqTOs;?7C@_|Mf!~$~Q1P76c7>9Tr)XYx}Y>R0UUwHeu#A<Xt8lL+3
zW$p=8uf@MpeauxEewr46U=5@Gne9flO_Z!D$3CKDp@DxdGoskjA)|&*zGV_XFC$Nb
zVfDStKlVR<%>T~BPt^U^70i0fW_ftz0=MX-6ZM7w*I{~*asya$RPMcSE_~QXAQ+J!
zOM0NCW!E^Wfi2RFV2D&xc+#IP3li5*y*YSQcvsZp>k0)9B&XG?uZ9+C67BJpPA`|;
z&+JuXkj{$(IzqfRT1R+U3Mwz}{<N6w>h85`;g7p7mdls2Y3^&AKQCsV$^Q26;wchB
zUVMf378=(uTQipduTEDNVAT~O0V^g+xOW~M@(kq$SWbwmHhnjgm3ZdCQC|IeQ0eIE
z2vB0N6Y81<xohf7PJ-iC1J+F6a56m>6XBR)W=DDJ<8S@1LRy|$yvT`m%kye&{;niW
zl6*hmh9+wcSvmVS%bJ90rb##kGn$A+^$tLsNY1)MBtmixqZ}Iwn@nzSp}v`|UQUqb
zNdwmm`N9ym4E#g@+9``CCK$x>B2A`IgjiRxhRC8&8p;t$rM)iC@B{!@@$9kr1tBCs
zXV2^(B?G7_vtv$(I~vuFR&g<AT_G=kmA|9?9n-fHX-UFOH#mE*kaZ(9?pV$6=vRMd
z)aXK;pB>s7d8BlKMZd9-?s@rE0n)<>)H#uB@e5LH6IeZI6(JdhGX|i%2x(@qhpAIV
zvBRrDuSi)O&ZM9R0%wf8PG6obe?Fx%6qckDCTINL{qMfTGBApE@vKCcDRl)#<%*7?
zr#Eu3q;{0#4t6lIPSs=zrk$Ot*M=FPH~GI}_%^u-`*p=COutv@kCL<Nn=7~J$JJ=O
z<c2JPEm<s_YOeS-prt~axDI@Q1`rM5oPIt(Wl%O^)FqWIwPj~CkIr?+_%$jZiv9&l
zIv-PWEJ@kKKka{rh=Us(%c1)sc^+3e;S;%;PL9ZKs=qt=@ek`)IEnnJ1nN&-Ts)ni
zbSi4^VszXNf(~ZS824+0ClSNodx#e6M~Eb12on5Po9j(&s4Vqj)wCB`xKtencPlB=
zrvp>N0fZmp%$RC&mqqPkPtOgeXBVp%JLzC>g4lpp)7hb%0FgIi^udE!8q|bQXRrV6
zT$~<#ji)-$h^8eyZ~<cyr0cFg&HUGZQt727w`SazT>A0}Dm$^L#N-Cd^1Fs~l}Fz$
zElC0d5Pn+-?Glri^9zU^PmR5LTJ2P1!9)!05PrA!LU5rz=h5^=EXi9z>=P&Q1<N{5
zu+l-6KAOy)K!es=O$7{=>pqAgN`BPtkhzKkK`twwK`@~Ca|o*y4n%dQA($f)bbIXk
zTsF>wVS^(>4*9@)M3k~xu6TkN!%)}1;yo0yQl@+&a_%-{Ah>g-wKjf;?Huazx1OS&
zRG9=fX(~~<S8Nj~!?3@trCko6QuximB`pC{T%t4z7_ktAP<3PcFP{%`y}6!cs<e3w
z(Vbfqgf(LVNijjd@V;-VEK^A1LM1KFAq}87j+}H&OdJ$EF=8tHvIa+?R`P<&qjPK{
z2O4bJB<U-;pmvd^>en8h^kL$h^fU~tlN&KI{Y(BMi!anME^tH`FYtX?Ca<@)J1qIR
z5_EpjIyFdC@FQ6GiBG7CHDMFD0bvar#@YA>;!3MP0$n1+MM7$RBl;o&{l3B7McAX<
zdd!ZKR*gRcU&$OIl4JaaphOX*{z9U<NDRtgA(6CuQskx8--?%;QDPw+wPo0{W2!;G
zj{8}@37lI=YSW2CiAwa!d!ppxMKLmzv29b{<~+XnG;Tm+T(e%($MOanj)Ye4)s6by
zZ6t*%d?Z1#ENz8GJ62qOcT!q$2V0hA+luS^g9zY3L@rFyWet0hI>|F*)8Qxf!V!`9
zgxVjnE)HJVC0Kzqot%0G)Wr8NHN#|Eu*kTYoV5CRcBY3t{E@{H7htT%YDpR$#N&WT
z(ExTg4UOB+<npd43_#(KClp+anBVi)JHA>-W5(8OlZNi{#Bsy#Q~!c-mse6Zr!@Sb
z@Q@wq2iD}m61me_SE`06U2<ir+m^q=X?ITxVbBJeWRo%cRx(NG-{(+9<I+ft4QBKV
z5?m%aY;VwmLY)b@%4I=JSD?oaUC%C#ff|BQ0BhDFa~Tl#pG{{7^T)PIL*B=AeFQ&&
z*?On9XtRyQ7sft)mx>Eynys0;2D#zY{4+s1U@Z4KjEMtDm<y>^$SG+KNeYU#Ft!11
z-t_hzZ@4x1()ns2Lj1+HV|x3m4B%gwn=|jU4aay_1qY#Yr)?@MN3@BoZcXQiL)gL0
zQ)ejjSPUrDX^#@DbpN)hm+!-_(8?Ba*DU;H8yPjN%ebwrHo;FQn>!D$do+DR^DKf6
zlk>JZ`ydkG{*1Z)YnW*CoQXe*t)<xFH0<64_ra(PEiYn!G&HIBA8cx@(EO;X6vxet
z;<$8W`&MHU#GUD|<hLflP#Srm7Sd6W<c%m+agg#!32(h|Zq*4?vf*3;V<M?Y+RirG
z;NIQBrfvwg_<bsl)Nnmmri*(b;AUM>6J|}i$>RsYA9}dh-kIU7u3Az<WK@o5UKoZz
zBA^DrPtK9Jni`3uNOD2+H2&bun|g9Xu``xvuj#!oox|aTY$DV4TY*9iy4~RF0ra#g
zcA>7W)P@bEhMb`a2{MN~Yxcul9ZREELZ=?1nqJ6H1zqQsvo(kn^c<2HN6^%dhyX{w
z(k{-LLAg9m`;Rzp`teebIkrc5pPToJp|tK#Kzs9r-&$NJAeuRkRH@l!^o`TrJYBC>
zl6S@iuqz$0&a^tWSbl+O{CMA=m?E?hdk46YTpR~>6(1tc5{xLQ@nVL6JY?N5cpoKW
z>0?l0p4@veKYXcKp}(g3!&miHwCh)KTQ1xT$IH{_tSmym1&X_f(*eE=Dcu9vD^o-g
zkyPQJ^pu9^7hXYpeLg=~{=^a`7-e~k@1@R(U2KjB^B`RKI;^XQ*bI1P!rPLOQBO~D
z2N|r6{6QT-uAU=)trNOiq?pchf|#huYW8fte$4<qs9xA@OuR#N$FAsQDeC%$A!IRv
zeIy;yg+uR)6=qRak-&nY$S+~onw?j!iE^!ifmZ4c!<L3`7&GQe#7iZQW-Ocll$&vr
z#Y(W4hljj$k%+;5ZCzDsP8#4cvk$ZG%HQZuwl(XHxkgW6$43%~y6a#Mx9%XGo~auP
zD0_Ooe2FE;Ra>Z3GsjBvLPr_l@q??jKEIcuf={zapeM;qf#&#9qO|cpRV`s<zP825
z2~fj|qHP5h8($(bx0A#!TU7!JdcM_2bksP2=)J1?fo(dkP<G>==kqgs!TVkF{C=3S
zX2;GBw6&+QInJi6$$)YPPxX&GsC$4|y-#j=fGX1arD2GD9R%568dLA3>_BmD@SI4O
z5=`{Uc1=CQc#BZDc(~F2SVH5E3`wy{v))vTuHJgH`#&zx@F%z@kp*_J{Cs}6KykR(
z@1>)h9M1>x6&+hr&5l6bny#1pVT0Uy^JBoL5H>iMIt&1<cH_840Cum6B_z*Q+mF?1
z=<PRYdA<S_p>ng>es9sa{ecMM#R|LI?0BC+#GSH;oN7BB9XNzLO>Y!xp=<PEnoYFJ
zML){!;KYT9M6AZDlm;~A8I>WF`ef*4M{sKs*;EBVnmr{kn0KZJ0ow_b>74ac`Bd$~
zRL|UjzHkv8j2dN~Ab4`~@$t0ETL<mVp*C5AgzDv}s>5~6?Lfx5v&bPVenBZ}TlUH)
z_OLoOKNvM8*kS2V;)dp-zc^%JzdXc70$U*C)*!CCvhr_+XL!|S$3q%#kp097^+q6V
zfWolYc7t`wTi?;81OI^~C@qRPiDEZ?h3=ZFGAf>u3Zy5{LA0>Au3*X-7PcFt<MYfS
zTR5vi=s|sU`~Xhbs@4kdfR(+360&#>&QXa=Mcmk4->)?-+j}{{&*?!qvQ}*kW-D|-
zhuVW9*t}&_Xu9DLs!qxxq+0bID_X?!4IlhoguCuRL_N}K5jO(sm%hZ1#@U;w6WsHO
zf}_5B^x(?}-~RQR`v-Twxx4?*(Sv%q($6%b^ppz2;d=E*qN-`szfc{KVlbKwV)qrg
zw9r_bgvsnug6rSO*H<Zto|UduoMdecT!fazVX-<KYnwyi;5a)9Qa7-~EH&SN^-**B
z;W>gN=#lF?Yi~63P+CaTIgS9Em7cE6ZyPJDv2P{pq^vxYfO)F?tnj_rV>P^lLMWIQ
zP~@ekF9@?Wr;TNUI*J7x0Z_K6E|>WN+Bcz@ki)<X3F%uUQFwR8m1U8ykIeFItWIp(
zn(g6r|EsJItDhNMY&*UJl;Xl2pv9_{%xMA4X|7lpjGh`+AlTTB^n0qap|o$42x@eq
zpglic!WU(20bHn2Sc&AOz#@K`TS_UW>PelJ>7eI9OyBm5)GY>UzDR>MZ~B7^cQn(d
zBG5h}&nq69Zif_5q05-imfFdml4qmD?p&1u^j1TEhT7xBINrc(q7s!?q3!s!FCO1j
z_zq`Q=ydbPr;GuZAHivR@M<Sc7JdkbDH`}m<a8=p_*cnk@a%j(|98Yb<a{ljJa{n;
zq(8BN*&z{Pa8ZrHVv#zg1`9Gv$mfrrf(%hT=;GvGS0Alk{m6T!SCi_g4)r4gyik5U
z;{?H#%j0xfUSVTG$SaS~NOwbEvOo|wd(ek>euTp{4)G9whyanoq`cc62fNfy6@EIM
zeD)d#>1P1)^pIVPb)bR+VWsGAhI7X2f7cc$1GShRAGxtY0b>X_PuOwRtLIJ~UapwL
z$@z#kOrG$5Y@G;T-Tlq~{^b7%Y5cm9<!h=a_ymaSYNECZrt<qQ{eW|p6Mr?G!686b
zpuxQsrc!{s7V0J{s71IYCEcS4dnoBekQOGlKwK)>_LzCJnm;&Q7qZ4JDxqUoX!TdN
zsC$#I?mqhbi|-!&voerdNR99nHp_O}8H}HHq$RR7F=eb|VwOm7hVC_Y{mKk_9Iq6G
z5|+?68_e644;@L#R(Us%D2fghWWUeN5Bx(rA}!=kblN=9!g7(pv`3vG^!^rA5phFR
z-W%(J(Bng6WP?ZbtpWvyh4v->VRa{{s~FO_Gopme=Z}4hVK=cy4yQgr9o9~FCcF8m
zUlf2V65^?#wKDHu9<p+y=BDA$t^HqQ+w%0Wrk;I`qvIEI<VVbpKEs*u<+m3nPjTw^
zB>m(5Yol(77uPSYM_oFxk<Ky4kvE2zVyo!wa&16I$Igx`C|b^u$v>JO&QTCAZF<cN
z-790-jYj2v4rAi}#q;N|Do6f)Tn2R8mOXYjQ3sS1s0G+x-29spPka$%rJ*H`1f@dA
zL^&ZMqEN3=MYZH|k^61_!gGwWevP^U59jA7FaQk(+ms$ARjyf|gv~n=mzs{qFxA}a
z@YP_5rU}R66bHdECicc>cGN*G2;|b`W(6{RX@enpJuuo*(1ou2PseMCUa#g{`sT9r
z&?;HS+YMj!%mUYC$qWnxdUR$ENjO|i%%S(#=c9CDc)A9RvS!3i-I1+W4?1bss7^@M
zT_7nK>XK+5M=0oxknZ_8)DT*yn7~%2oMF#b=^$|bTL0h6F|Ld3=NS#^!nb5(^bdcz
zcbghf<=}-l+zt76?s*dC!vmNNc}`6qnsy;71HSH+_e-q_OR%eRq$@GPXEof0QE!=g
z8nGK_%XASO);xX1@tMZ0%zP(bQKw(h1M>y%vx~bB4+=!wmQ!b5K0i$F+3KNj8Rgp;
zRK^q@&rpsO_ogT?^eA=uE~?Pt|J8tsTO|P7X5g`(R}S`#&~p9#ik%o`U}NmTbf)gW
zUlgLSK?+3iD=d<ZCFJ@GPu+7o^~h5vF$ks#y)>qeDaFGw%N`EEBZ+K;0dc!fA{{=O
zVo#=zgBs71A8vWoZ7%u8QsY7Nm&NKUZT9(M#pA>g%1VIGSbzi<yxF^bRN#Y&Zdj6p
zwI&J;a#Z7}tF&6>|MacUKDCHZh3bhTQWVx<2Z1|AAGi4NZ-4Nm3)RKM=<t)C5QTFP
z*KqI%YL;5_H$bXFs2w4z4=M5Ca1qNF)I@j&=pcAHhyOHITOL_g1%-YDG}mf{Ah}+*
zcIkGHaOtB5N07|ODHfRv2@i+yGq}CQh+Vt4vz$FauEMu+3*-fyv%CUg^|?+h)7Zf7
zn#MJf6e_@R|Da5;>A}cFbg}09kmIg)SzFoH{D2|exLRxq?H3U&E$mYuA3B<ZOjVM$
z`GgIsFTw?@x>}h{qIm6_B2rM7rW~X_q}gl9OxRurF-m0Qgtw7hV6>H?4<bSTYI^gX
zGi?)tu4qpnST|gk7n$il1|oADO}L`g_Lu<z<=p8koGECq3ofi+gR?matGgzZIJ|<?
zt`cT6i};mHg*F(ZFkJC8ltmkND2BK70)xjF2$0Fsr767XpxRa7Cq6r#9pd~*2Y;dp
zQt6#K&zuL{)FOQfk<s~habyf3CuCm=W5tlA<A@LxZp6meN^QbLON<-<T7{5f&!t=8
zPC=@K)4qJ)k#$Z^;kuWZHySq33=_F%w}>H0*tJa}Z4p<=ZLSziaD|%WNgdY3{-9G+
zT0_8NgR%W5i*m$!rA|iY$KC@u%A!O2g@BOkZgs#5-^LcK3xTLa14(3p{T(8~PmZz>
zt%=-?2OXn9!mKUTTg2um2?ymS7EkyJ&AX3`m~P*n_u&TQ*Nf{bXZaLPZ35JLi4Xj;
zAxQD%#i`H36T4LDFR4hJE)c5C0BTSk{0UNd;K+3ZSiR*&0#{+;R7aJ??}5o|Axoe!
z%e9X1m&N+UUAg8Aes~{0$kP-yWnY>*E4y56Rm{RugRrdIR&w|#a&Yn=N+Y@&!s{As
zuytWIH&GWA(<`>^>>$>TCEMzNukf~Ez5L#jHm8Al+2))E4_#<7cWp#}8}dAO!2W2Y
znwlpyV)Gm!XzIQAi8cd70?K`J5KFV6tdh%}bdA+_ES1r$(l_c-iyJD_Lzny#vy1%E
zi`^2B%2T^C4`ivFYF)XtLdQZftbPs83_^5x%`^QoRA9JqF<2*!CNEah*KrfN)CtJ5
z*SW+ny22W$XtH7iA@+&bGqhzhmq+`5&QvR6)sS_7_`pjgN|n(GT(%?MJX+!AGUT!^
zPjQF){H*QDMN8VL84rjRd~$=g!QWsBgd0EI_#sAeO<QJ61x?oN;FVlx6-30{+gd;u
zRNEWPbLH77Vrx^U(k;SQQ&^u6UZa?#X~}>90H@QBU+G|oF|<$tIC^|)){TpadJ8oa
z3EYXLA%D76lp9xTz^~{x4~e;IA9#{DTt{Q2n(KQIw;Iw=T#a~FgMY6vqJ7aF(Gh1D
zyLwhQC0L_zKw1owY!aonbXj6r1IG|BRS6GtApBYu6r}3sJfDN2$*(^UCpXnu8Wy?^
zaOI{-7beNM`#g4dA17}K_=^3)I!yCv<^H463Oa3P8KErBRL)E!Ybl&X>*qtQ_8EHw
zt8x$%^<JU-ACPiq8fpq^B4+n~Ko3aGBq`Rx^qe{zCjkbydvpYw&ywM<==JXT^NSN^
z(Y13Zl{E0>{M0wH05U{E0N50>hgOsTZbTR`l%UfpCp!CdC-n^iNLrAB^U!^f&jo+>
zIcm@NdOAJC<~9b+uu6)ozsDTu8SMjKry$NjDrZ!f(Wb8QLn}XpwHxr#29rqF0d(Vr
z$xOqZ$*``Jr}<baC~hI<)vh8`%DPa*Tf3g#9kzCX5}Qn#rJ!xFPmQl%^yUkJQg?~%
z??q7Jha4@vp?WEfP_JNx*O6XakktwW7MLU@7>4Zt82NrpkqDD;<4&%$LTTp#cV7B@
zoM8qyVf)VB9SAAt4FZo-l0vV>W?6*(8EG(PtV18}7-(b(RC47)pv|$w;OYpy@l#13
z6kkE5Xi2OGRy)_tyz1RD)8zx%%B{r7$^88Jd<WO&W*$o`m;#h!Y@Jap9Il654*XX5
zt@B#dBi5Yzj7$a6vX5?!@?c+K-nTngtEE6W5?=U1|IPANh!m-Xoy6^ThcD;n2Sw(s
zETaM^2rK2}z9-+J@$EeeQ!GNru)!Vb^ymv-5|vFFD?G{L1xuLiGS<k)bVgR@i`Tk8
z433kT^ksU>Q^+uLij}FgLN%74kyqH-Ee#+!0uoB8(Ue}Bok*8+E8BecO9?`Tu-t!*
z_=po!){|nqfw0Y%mY8*kLu??;s4~@Pdy=(%FKssumn*MqGQe(O3O$i4>u&nO33yQ9
zubD);`lKxY6Kl#NiV~$k9aceC>tG1{7Zz#(UH6XkC#Wxuctad356*G%50>Ps`7sXD
zx2T3eXO(X~@Q0%{$B=>3t-akPs2Tuya9lf4d*SR5ve4&n>2X?s@pPpo5t0?S*NT=m
zFT^*ZT5MU5)W*uxw2PT!OXm_!ROqTKm?eZX_1wFS!^?xGX7=qs&Zo~i*w`pUy?wXB
z#Th6#4R7-gnOeTREPoD8B3I@XlRidPq;zZgq(@DGV3F`CwRk1|KaqALu(aN+-UcCv
zqq4<`WjPh)i<-g|GOGOFSfL0A??<e<+7{gzh{1rcVqnz^G)%BlN+=<}9l-Sw=VS>x
zG<F`v4Yg?@hbjr-?lF>fk6wp>)Y_Pe*8p2qNltjufxGt$YXMenms1#K4(F1SouMx)
zIUtbos?3Svx4E_wxg9?(mT-=&%a{^Etk9S3DAk|}s?pwLN{%BAEALBi_Wjcp3eD0|
z2#2>cmI2JQxLB<$^QQ?V(w1hKV>Sw{%Ls!!d?`~yv04?jtBGgdp$QYLX;<DfjM&&d
z`e<_S-RIx!O&+OpZ1Usm^!1NwkfiC4W1!9cl3CK48i5EYWXkKHB=>Na+hCgYj94n>
zPa<sFx|pwyVXNIe(m0CUQ-ne7;>mpSDaTnIo-fYUyV~fZ)8#JmqTpL!ppxt9Yxb};
zP5D-)04fIVc-`td#czmGa4;1EnM>p#{*2@znB!yyccz4Wn@?o1vC8z+{IxbjV{4<W
z;xEW?|7M1JgS5pUn)ACeniS~R9kd?uz=p<&YQIXUyS;uFtNjIbSV_*mf2uJpo#7GG
zV3$Di8tpEGWBYV(RL$JanrLc;uo1z~un{s<(9Vko=$;P|Eal{77nitK6Atnq_H7R#
zH##7G^YE@e1Ot45)H9((VJi~-J5sFJKnkS7N1v`&q-<ELc9mO{`I@l@lag)zp+$BT
z0fj*K(4U}t)Cov=vYk)$c6hRYVXxCh@`U6nFU5(ft)V>yswurak$`8E&Iur06qW(Q
z*seUSRL|&+v?0${+lygKbTr{bC8P(#=xJ3XM@et=iyj>gRtYPBh;&qn;AO7sY&Y0n
zUSQkm)2D9I9uSfcQo%Y3nbYwA8lf38sGA+SXoveK?t6$}R2Vg}C3##O)@~%selJ&4
z=FxCI9SMCm>L3}oYHf6a$T>Aw`tJgcHBFkPb%V;XDxwmlf0><sV-ocii_+?+))kzu
z=dbT0!s~o)BJ%ou4*RgqSyiR8;(L>=XrfYDtln-gcAD<Ga7&i*&UypQJ<EsGO^4QO
zYq>SNR!H2{cKQjJYGDJ@!6<otjopZs0?;qIO|v>R5eb`PJgnNB3HQ-f*mjdZ7>YQP
zeWL<l^oyQAxaP*Bj1L0wvoN=)`+mIj&UBvIwlEa{b}qUOSBb)+eVq+<lNuMJGk1YA
zw2tl}$cERr<|8blAam|hDrh?Fp!rasg&J)<HX`9v%2*p<$T8?5%Mn~!BpC}1Nu}ad
zuq7^Y!MKq8d|unQQ5+3%8hkbAp@5@#!N_lZ>A(b^C8ixywr=@l53;SY7aST*p8oUv
zwXasPbQCJuiDXiPW>~7wWc2XGP*&5K0DNBh4z5M6<*YU&ChK=&o8b@>1a#p9IDe?N
zxvCR;mOfHI<P>(L02@MR>`)7^tDCg~Y)BK<aV5Y;TZI7Qfe$M?1OQfFSfkI^50}R{
zPCZYeEDj#LN&N0H6B5OmmYTTc-Lz<=n;p}yIGVE$yQCxtxZWtV_SkR=LsW0uvc>jh
z5EbQWq8Qs(P)uOEX>7CQ=`^lx*`3Ddrl!*f9B(Bgngy11lAUo|5IaP(?WYYjjn7ME
z$LRYh?(;z;E-U1Lnu9TSZmf%5v@-k5wL4K^aYJ>eqY*V&98pBSpl&OLrh~VwzI(4o
zTb`O5qehiUePM`xnsy^imGU;@wv2TJF6+@BZ%p&;z>%o;YKhWW1tp}bKW!G`Y)o%5
zAvyYf8|vMKZe}I96xHw6n@1PFkG?Ek{C#v~bRnGTjCA!nbe0f|boF=db^Qu)Cz+F0
zt)}UFzM9zJ+|1FTWEhIZh)Rg2Kd3Km9&$rO^?MuF2q6#4N58}rolx>v`fT%PLR3(5
zv!!WBDA}gzdeGG$HRNQcu<+TN6wosk&J(9csHf2%Tf}ZNV4By;MRw#@4zeu`FJOaY
z#4(7tpDD8{ES`0|85U2_?6fj)t{BV?<gE6&VfMFKQ)2@}Klm04^n5v6p&&qOgiZ^V
z8Z?Vzi$T9sPg`nC+=GycCp?fJRCe&4TLjHqJ3d!7`x>5%S%GBd7VG4o-sk+;4BqVg
zBG2vX+3WfFC*|!3Ne-Iz=b7Q*!4r3)pR}JkVEc#XI4=y}26O{HL*W?BhA++nUxd-N
z4V;%m-MYv^yQd4zDz%OBJ|Ht}LB&G3U&Ne0#hJy{k(Z^INJxAV1#h0{(g<5=vrfSn
zWd>BTo3qf|@W3zm5fAt}0za-Qd8eAA^4bJ7E-T+JLjr!&9qEYxp)gli@lSmA*(xIM
zZZTy!p-~<RSq}S&j7M&t3=TS8{Cl=cEB0cpZLjfpJxPSEOJetdh0P8?jPD#R8`dpY
z6Z1$e3~_Njcs5w+$EqmuVl^Cz#~Xn5ZcU~3BPn9wG5?K2M(L0U&vHmFka{BIO5a9{
z72s0mlYle24NMNdGHJ~YN%3679C+xYJ&5WwH}jBIje-D83!uuVEdHAo{03NIKuwy1
z0iW7xm4EGsh#Ff)PZ#~u<m15G$huZRPfC8Vq~q_dSk2pxy)+x`TVWR*ntV*tBj*5D
zZ}7jrUO`Ue9|&|hbY1LS@kJy2@O1)?BO9hvB=NEZ*t06(7-8vq9NPpP%XAF;k`>pU
z+#hf4`zu`ybgR_lkbbz*A2i*-I}VS^zg?izb^S&*I>U9Wy>CS--URy!+?kgr`%dzo
zrpT^YF?8KJNYgM<dsy<Q{>Tbuvy-Oo$BsM{D|7VoM4tU1yj(+TZz#@`GGJ#<X%s5v
zDz=oaSU_%tAef(U_b|&87;s)Mw!)_I`2c=<Uc+M#1M&ixp>WU*P$cv^&MO^K9dF!F
zX_^U1H2CVFVBXf3^zr1zdMUY3v*U|7|6tI>4OVqOnVTF*E90}!^@9OHbGLQrWX?f4
z^@7}ZOmR=U<|?8VP;m&cB}YiLL?lcCSjmG+W$P2MIwPV;p(^1JpQB%&asBiP@e@Ku
zR;Jf&XH9y|bT!nC5>XFnira~eIFzhye;%#N;Iii#k|wZ4E^li_+HFPgpz;=#o3ai>
z7v^=TOe66O$^3t~JmMXn7Vo1MF-H-VRNq<yu-UYrd=g)2-|hlh^Ns}z6oilC6s64e
zP`rhWh<VLMiN*dhIf{otFG)Elntyx?L?>NDm+Bx1XH$lqS~{;<lBr4*Li3#@rGtVW
z<jlKet*&<EG_$JL1I*Wn8cKwd;R3184O@LdFqdxN8VUtPs6jCgHD(#lC0j9mkqd2k
zg8n@^7PX?Q0*ItrkV;SINYo8yVXWc@y)H(CgoAqH-t3f-Z@OFw5lYTTHcEp@jGUBi
zb}3$|Y<4!GwpQa^2XkbrloqIEm-{6NNJman2pFkPf`Jkh-Yc0zJvmd-iOS>zNuquB
z>2Qn+OAn+fMTMfLC(4oMRX)%mE8Sc;BSbxWWM8)9=}DQMt}1ilv1UdMHMHgF#xI(^
z?~(`}qW8HNAnvblpk}Ebq5tOD*UOogF+EO4dcbWI`%98V1M=2#g}Zn&kKixhK`ZSy
z4Zy?A6IpLFh^YK+8Ypf=6&utX><?mJ42II@!vQnOhcn1;0e=3OyDGtB5R{g(oN8}F
zL92BCVWS=~4H6Tq21L`pkW|?1oMv=yu1aVF{t-$7JQ_!UZE<l*CTgG5`;jte9-@J1
zi=mn?(vZ!Y-q57JJ~m<rO#|+?lC=|&E2kC19)o!OPgZ5Bu-A61FB@1(zc#$=S#6eB
zx>KT4pPV-(G~Iso+7`z1gA7WFoDguaWX;D|iw^zidN)lQDzqu*sT9iHXB^+oEo2mG
zFksUaFd<?$pt2ckg2tM>4HVccBv=+Z7wWWohPeZQI{_}>!#*(>J1{gY8W2vqW&Quo
z^#4Hv6{)v<RH)dd?n0@hX4kE(nJ;dGRz^5W5f^KAfZx;ev%~j6_Jy((#$1-anU;|K
z6zESS`CHJm69G`y-e}=hjG$(T`AhcVRmw$%-n;wlz58GP_0ipf`|^AL;r;uc|Ml_1
z^5m{1X9;?wO;>4B(*NkA4<{=L-9;!3^Qa#``udNDFD_1B?mqmNdtcrC-9LXZMWua~
zU;EYfycGmoDk%+2@IVcFlnp^)pZTwj7SEndc6XoSj=$MQINGc~>UT1Ey6Nq&G#4Lt
znxfCi3658jPd@(mAAkGXU#U6!laD|7-EV&TkH7o<?|(c0{cnH!@&Eb#|DONv-~6B7
zJp1_QAOF{HQQrO8{P1XY_}l69<1PRD)$Z=@W{7|F5C8BFlaG$(KYhgdCBORgQ(oHk
z4<FzDc=G9|zuLXL!Hc<&;BaH_f8D;Jm|Wf1dvaqs{b+T5_)!=2)Aj1c578RZ0P&-1
zezZ8zRiAi?`r8wf62UzQ&>u<FB70PN;JnK-%;aXi69A#YXngaZzCX2|<g3dGDJ<VE
z+WmO_Dt(A=%2Cknec0x!l+WF5ez9I0r(qPn?@uQa#Ba~f){o?lpnK*NS>2X5M@LT5
zkF>s&Ki1ax6}ULTA?yTK6@R3Wm$PF!uGjPf&Ck2T68ZZ2OB^1#TiliUP%=b$DQ|#%
z9LMjo=9Rq0@F-Qv81vHb8-$wA(dxVl6{`~TA-bG=hIgf(g1ng0hL4FR3EURAlH8Nu
zjy+O=JZP$$%d^Abg@1THL@e4F!gjfqtAte#OLf8w$YE&M74TByvhq^${>$nFVlkxx
zn7&bA)&mH-`0lg$2wKZ1pRuAoXqqW@(yw93_nPWi%(4HpOAXea13F<57fp@f>iB5U
z^A{Tws6>K;??9&h47X;UuDJt6`{8n(s!}jUbX8ZRj}F~k)kR9M>3z-DyK6;!cl{%(
zSCE~=4htIQ_=fZfO*?ZP8R}A#-tJ*Lfs+iHz<uTz;!jr`^mhk%wACc0Oy){c6I_ki
z`J&~COD$HlRm*QK)~QdiknW!FSwh?81a>Bv?H<jaW0OUGxubzR28P3{-E(_aeI{b-
zKJPJy?KnQ7EX#94nOm<L#`_A+{!G(1FeTMBfUw2k%g=BZE$=nuzveE9{*ISNv(<}g
z+@C(-GGZ?|!e-^;UR*4W*edp^%V8KnG@gDWEY1|Yj|Ra8)mTl0Lbr#eP4)d)L_xQs
zvBp)8{TPI9fBmLaZ*`zXx0kv}_4WNLa<@`{FQgd3>Z7YZsrpwzt(L1!U-@<V&baBp
zFj(0(flgPQ#+pf%`n{ZtwtDLxzZt38(CKijX$9dh1j#n2PKTpys~#cIimQ)|cf5R_
zI>RrhCh3c^KYk94sl7Qx1oGF(+Q$$jdAJWZ;gPPWDrx(3)PuvtCcf!qO>G|s1%7Gq
z1NWgoyl!Q^I^Wu-kae^6nOqEWrW)8^peWAQpChjwsfXNV9gMrs_oz&sA@f+@D6nM$
zmHkz|)fUAF%Kpk%sWX>i(~pS0N__I0v`yW|CCbMrl6l~oS9;fbM&;qc5E=l=?!?Ut
zP;MBSZmlb?B1p6#JJm-Xp~fBB<2S1rasL7qKD)r#3gs`M@`{ZZkK8eYKL_1DpVghH
zfgUXp=hkga6|Vk-HkpWv>kY8`3^bK!`I5*7wEc?<WQi4wv<OC$6=oGN2p!?o32py?
zDt(@Lqd!2?qO6~eqNdtipi6Yv-i$EfHdT*gc(nZ%D=JD;XHKV7kn)UZLER5RqbFj3
z=;F!99}?AyOqSe97%|UfLdO2jxH%%V=)lD~JN4qnb$01PGRy$Hbs^hba$^f5CWw6i
z<vDNzg4{C1YHaskVR2#W5Gcn(#^g0roCgm-`Q7h+pCGXppyh8^dD{zznzBUPELNah
z8BZR{2hN{(lUn-ID$46IZrh-8ihJYOo45G}RcKExPJBZ0u7Lka1V#N&IVgr}$#0;o
z=F!rGzmw}CDp(H8?~aFUuLdrRB3zB{Pf;HP{r;Mo>x>@NxI{3GkWRiUp2Fdtmx38c
z&3`_5vBZTy%gOgQW}x8LCkXHR{)Y6(`XAC<ZZy)H4-s&I8#?qlVHQV6Rizb{dww+K
zCm($eMT1vBKvz~^;N9n}6Cp9fkB=C%F5jx}TBZ*PBQT(jir;X_rf=k>>fdCex9wph
z<NWQqdn4F4OQO!&O^GlryNPM~^%A=IX|+-sxuhjhXqHdNxw#V5=@n8uK_LW}rBYbS
znrp>)l^1iOI)5d_b$Bbv>H>D2)#};Bu`GwQ`xL#fkTh@2TtUTx=N4+ju-}=u2ofyP
zYtuz~O?pFL^3UQFNtJMJf+$%t^n$fxaD8SoIraq#VZjW(m3k-7aG%2DXY6rWaRH@9
zB|lTYzrT<3#Cmdm0dpnWVEYk5Ll2;6m<BP<5~Z<!q-^?;mwAHvFV-lMgVWW&qKb`K
z4}pwpR^#A$lB`j0hJEkC_zCGCrB=R2;Tf?b7WkpP5V1nmisU`V@gHc!I(_~p5J1HR
zMB83gX7~V&-Uv(om%~scuN6_xO@!}3#t=pSbtm87$rKCuLcD~DN%x|=)IjN^h<;cm
zG)BeE6B8}jPM&Lc*js?&_|+~dH<`8LM4zB8rmacyC4@gVdT&1Zy^f6dYMA4!wEO7{
z<)2`spmgJ)Gp~Nk5g-$crO0b$f)RDec8?n3gazy&9gz0WDgOHp-)H!P08}6HA-0?I
z=iHCP{_n3RZ;%L}U100!^aWY+m-$TynF}d!|DzPVT438lnKHU;e#C9=loz;OQ#NDx
z4WwTA;uuFb75hK_-_`Q;M;}Bg`)DDbd&~246jo9BM|4ze-l3pS>4&JegHj8puVa=1
zz<=gBaUGjEaevl5+BKwuqRk3zs%Jt~9H6J=leE{Zz$JGl$Ji0LzNsJZz|1&p#V&9m
zg73CU=|aZ46Wj6=N8oHdd3n10`P5nBh`L+aNSp3PbQb`|RO87rz1emmH7+Kndbh3X
zWSP4X@YqAm*&t?hXf2ndl05Ih7G<naCda~Whs*OL+vsj5_SH>q1aNX4Zya#0`vD>9
z0yP3L+l3Qz530E_F4yi_iz5uS`~)!cr-dI#7-$5%%n|6z{RPQDIG-JB-7+G#h#l_s
z>q+wc0u`T3KLH#`y{2{QongSu<A`6oIO~mH`I<WrpuirK3!0Rv15SSIuH+uioK*3D
zoM=hWt!d!P%0q|o3whM9{vbpG(F9f?K`R@53#lS%dKWAK>HAYsL_z5RW+6%xuSivB
zq2v98Tu{Gvo%8JWxAm;ldBe20Za?+RD(Eo%5?e4?TAe-Uxq|&sgCSRz|4Wi!P`U+7
z>!lXgNhVp16w)g1p1(k}3RG%F3Q>25l2lGvnWKlGxNX-MdN4jDr53Gux?CR5XFQ#Z
zO3Fe7Tx_Un7l*LiI6h<@n(5{;JD4d~S)~%@O8;Q+@EIJ(vO)5kAWd+^7Nnqbn($|_
z+-6P6$itP8S`89H9BC0e%tA)<PEOwMm{1FOCFjwRt{WRFhPZFlBY}D!qSv2~H`Xsr
zFMWV<ma*F)c+B&n)i^(ixh4a@YC8vu*Jasyw~nMyQ#sF>UTlJc;u+5{s|h~crTt}m
z40B>`KZbcUw;E$Zx-cf-kqSKJDFYyV=1f!FD-5Ym+^ww^a?`_`T5Q4!JvN5#9Bz;8
zb!B)_54Y>Y=nx`B1+?SgP&~<)fNI$tOj}pF3#T4d6y(%6C<mjv5V@V69?s9j2??k5
z;qro8g>(n$YColR>}>KJm%pF-mF&Db6&3=R1Q=?AJ#%^9={h?l@-$a;R>WQl8NuMY
zMkIh@n}UJ42e1M*Hr)HF6Sb>vz<C~5=-{{AVyka&x95b%CAWW&iO1=5(D|x(nY_#?
z<bsq0oScNOYW(wJ`YoTk*l#Q&E1U`-3weQeCH2ibY;r$|M23?}APlBU0SmO-J`8oz
zUbPcio@P4Ja2tGn_n5w4Oyem_=!!)U>^7t})sq<<%dDBUbK}Z`B6BydM2CyVFbVM}
zksdbH`01*kT8@NAc<?$ue$9;l&Q&do$AcL)zZT+E-={{5M7>zqonS=5rM~R5QZ;W+
zetv<&EcP=*<zc^OX7r&{fL3`s7!MbZpz|*-P9+2?c0t|&lId}PT9pF3@VLsA(Y6j)
zqZN{=uwjU)tq?#vZrZkN2bBVm#AaD6-^Xyqf&6H@kiu++{xT2@$EerVZ9AR$Z8$_{
z+3DaRT^v%H&tC!ikZsZq`5boLP{zX)2Md_;PAAW1$FPBtCXtz=<R^<wys+N3U;opG
zMD2+hq&5HUlt{b+CbK}Id)&UqRfk#8f<7m7Aqi1bq~IqEF%dFBUM!)*2{2(xKu>G3
z3F>=HP#>yy+rcl%#e~1ZYO5h^e%&Ouny2STM>*uN(nRu>@LC1E?cht=ZiUSE4I1{I
zLV^3Bw77W-a4Lz3W!bf{Fil~{{<jMhd(|6f$)z=%%^s)RV6!3$j-}iMh&-s?Uk>{z
zXHhYMCC<cVW|F<p>a&`?H~B0D;6a_AxYlYczc(qWe!Oe6-hLZuu=Sg*)Xz9#JXBx9
zA8dTJ36w5uOX_Kten=VXVT10-(TN1{SW~xfD}#BNAVrwtf@W%amdBC-F3w$`zqwk+
z%pQQd(ICr6c0$~nToG|8!}y%Ew|(k)ff++dtyu02V;rB{1UTKsH-8WkD6eGz$ESTF
z&%E70Z$x9wGY=e9a4XuL{18BA?T|Pz4DT_JPrl3zV44jRsYB4{hYoD`2H^GWXnPpy
z!SJzhigdjgs&O?rcgopw0s?eqn$W8%n^<Abh)tGZd&(Air3sPMjPWP-7v@~%)sQin
z;}(BNUme{F5Dxc+JZ;yK#1SRxlXNwr^q@PB?Ez&<a|<!juOR%06J@Ei82}Zq1LfFv
zV=xBKSIkwJ6=^j^e@V*mNnt|gj<$29HbEQ_!2Nl4{D;&{Sq-6XZI6`86zf7WabDIm
zo2(wWHB#p9g=tNsxNcKWGMHU|aui5<<=erlQPd3x&ui9JIt<57pc8+CF-LnE(JS6!
zKBGgJD)5$ILUN7l*>4NuPNEVbD~q68;qS2x`fUesx~($xze3Eev%=(!lH}0D%|jd=
zGp=!6etNt(eVJLL(DobA8KE*9irpIjpKP$OblyyJEnn5qA{;O5C8M_2t)R%ZNI6X6
zRscET!0Jkl`464|lz3;yCRX&hZ(cEhtHbt3KK!!T2}|5Q7`V1L$E@Xg^^U>$Z6_@;
z;IuRkrX|AYUdeB%VA{^CFG5ed_;DhTI}v2`cNe}Ly)x~$FW;MSf4gaQ_H@x?B@7jI
zrR&bMqYPC2$r=Fxm!u=A+ItgR%f~+k&WtyER{|%S!`bZhF^)?pBO)64x8lU|?SqO~
zZCc+BFPpD6yCwnjg9x?e!O^uavKg!f9Ypb@_~5VFt>kNd;fL)+%zcHyzR>8fx5c!0
z<Q|`;!62=!Pk8%u>|G4HxfXT>lwlt~Hh8@Xk#CEM)UT-;*Ji(rMGLXK76y7CG_!we
zs*)`!o%!Ai^(26?(`x1A>&mQzwCLk)u@)Wt9f;<0L_Xj!@D9_r9^Q8H4nRXOl{VH@
zlqYZA1J8T`zx6xKUORZ($=mSF+#7CDMQ_Li6V2gsHPu+->Ql}8<{{{Ri`9#F!=iQZ
z)_8Of8cZfm@6ynFprCK(KQo-)RpobJq^760#YNLiD^vbPjAc-~J38JG4S(P1zelRT
zeJ}8#zaut~HN#&1PDnBH0^A$>@Tt7pt~2Os+w(yZ34=abyrj0jl=yfwXL8~@2~Y3h
zZE3^5Z)e|ZLsuaq_Mfr+>fKcSG(3;L7b`moy@Q0Q`gvRIRh_&a6uv)1UGVa<ccZR-
z@8hiz<Q=>p<lw0JiyR6rBERgQc-Y_SR9Q0B+Mce3!VLhuvz9|cVgzx{rQ*RbhV$Ac
zwKUyg!IU|NQL)=(EBg<n(SP(!t5=&!HhjFv2C(TfI)ajQa6{8HXFs9~Qnvdf4u{wH
zCLhVR8zmiMw)`M#?Av|PD5lq#k9~RlFHGOL#)ku)V7s~b9(s+Ds*U41-?==!>YFR%
z5QIo=V-H{HwcHt3TC&5%3JvWMyn3VMq29)d?LG^*D;N<MP7HBNCdM1cqxe9uXjQeU
zE}q<^h56<W(v|hDjr~m<8V@<NT0BMC<BGx|LL+BtRLfyfXfZ!)d;xQ0QcV27K;oFI
z8P;V6(09|iI=U%9eY;%emx#35ts9t{{pZE(vwVT(R|o-PZ;Wh$7QXw_Vz#UCQ@dw+
z#pW)ZryQipScAVt0-=y6#p`XdFkTe|>+EH6;2nh2BM2A~VJiuF-1<{E%DfUfGx9&z
zA-gLoxZ1f@c~T2F36lzl8@Ep+sg0>V$ZAoQtFoOS{N#x)KCX8`Sd~PG%#Xw~q5c9U
zq3MTjz)TgY%J>LKl9C%j7)(U4i=8w`4Y_r*)7f+WSQoWJ<MT>*(ILhM{z`+?Jw0Qm
zN2{h*+S~AwU}~Ikf{#J=io*|Gg;2HtNu44mKz>+NC0sa3DT9o^^Tki3XjC0QVl|?K
z7b|nzf3CRzaK#h{|Hv0oHsLz$ff!adx$a2HL|BuA@drm(ZCnB3slhf`y%c0*j#66!
zeK0HuF(auc*cetk+<eaxvOGe4ti6=NGEk&c);Piu9gmb&q5~7r2qyjzFM1c>;JO_C
zgV2TRga?gvnImV=rGz5nXJa!3G*_ojc!%!NPvL80@K~n?!bn6LKSnlcT}&472KH4|
zFHdH44FH<ZG)zH9dmoW$W0QWDz_GDDuL=bl`))%(VBlh=xdv|O78w;+TVoxr6A##h
zLu<|yt^kYVDm4|Ogb0K98)PzAG}jdYZe18Uy=eunZfE*xj9cC&VvInQxedeDVrrXW
z*t#<t_7y^L*q6N;of%_+pCSv&(~PiGDAOB>tSV6$j`t^*i!<I&ts?rvb=gBl0>?Om
z4?E$7E?eqd>cb{Z?aEy&V(f#s6G&Ynqfz@6A!toZS9cvcQT5k@V*5cxg4KSh;q26g
z?yth;Hd8Pq_<F#Cd1gN|La-G^z86%E7si)`;L-rI?vi2KgAK}}+^abF>p>^ezB-&P
z!|<%W-gOv9x`|rnEGN1*Ddm?sW;-El)HCOxeuE4YNC*J0y2cT}#ZqZ=2dZ|~k@@bn
ze;lsRw)E4E0CLNC2!WhpI<AfiRC_OQyO?-_Ss(C_0ebcY?uStDq|Q1|$fB(8zs3RX
zWNL)6gJ>jtl;Zi`>?JxhCvO7QEtmn8p-cXm>L{9*P0XaO6y-xCb)g+pcC#g<Ceva$
zAnAu8e%KI$CX1;5S#sBA&$UtrvzrvhOz}~i>S2`^9wby&SCi=ys5On(!ZjpNeK@uT
z+V_N!VVl;%9mO%>;c)h<8nrp<Oy{tx2Ra#yRuk=Xar9=7#fQW%zU^3Yf-Gkxy${Tf
z1YhGsesQ*gtBcM*d%d1NJV&vTkTy8{x|jippjHcywRTE#*7A<D0oY0}h!Vo~chlqE
zD2@raa>JWyH^IKt9VGF~*qMY|H{F}ubV}gMZVecemtZ{YUdc4T70XiXB~lNpt{A)E
zsayWle}r$l{bI89G-YsHM54*PHWlm5=h1+VO23_|H3oyN+=nH@6eN835=Tf^;YwO+
z{RV>)daZUcfw{z%$MYn)?Pm$Vf+c7M+ki%;m#F7Nf}>&Tzg&cWJ&Ai>bO4dMeY*wi
zLzsvDKXPPwMWELwfOMgQqOh^Qu#cMNQwiY|v?8zbZEF`0_ca((t07>DB6{{jV2C!a
zFK~?#2IC_%Ib9g(Eh-so=>EMGH0X@6)xkXBZri#B8;9C(T<;HMXLrw5u1hHNhuUy3
z#Tb74;5G+|fifT0u5!>Hwy_6{4fWj0<W$8D`aM=wibq~HELALU<aBBtZ0wQS_8b6y
z>BSSc^G7m7^ctGc2>XJ91_lZ3)k_GlGy^VI*{%XYALMMxsz4qogfP;J-I)ZPT#6s0
zxtoo`eJ7jiA#{509RD{b<NF7BcX0Y1!E`6B4!GD@9ia#5@K#Oq;<6F?REB7)A_<*A
zsOD``E1~mgFN+TVzJ1Ar&KN_J#^%Mc_8Bu*tkv23E1=MUf5bpUG`+Vv3cX>e&1_pv
zq4&K>oCn)iRp|86*lZH<LYPDG(rkZ7)+mtj43_c{o=R$0wkV-fXe54+9ad`SfF%iw
z{I1r0<gpDdYM<!2TG468wC$_`*=eIzUh0R9zR|p-wqTF8+S~_iZNupq(@Wb8+iPjm
zY=-4UcTXF<mJO;r9qcmYRo))b(^}ly3m3d;eVITOKE$4s{i7Dd@E(Q|)ZT>Hv)?^g
zX0Li8C_&-!!&;9pyuSrs`k!Pm`@3Nje_H6eqWC{fe*3XC5t^01-&D31oD1r@2yuQy
zZL9gYle1U;EGK{{RLAq)2~0mMIc9_LLAhay4b;wqW2CVMpG>DyQ1cdk<mgqt5tSw$
zxtmzbLUMM|gJols5Sx{OWT#3we*yp_TveTLQ)T@mH--(m@4rOv#@tPV$(=h&W_35V
zNS~XdwS4XeoBn5&x3zpEkGmuFtmgQxV@v1fJ8G%t4cKm9K#A5**DK!hhmcskWJpCZ
z;xJen4wjAfJ|EWb!KKrTuz-u1+9&JPmP+SvS)%aKQCccL^aC=gDtg>@t$62>b=|aZ
zQEmFeLS-3&uiGawr@xwyRP3!`v+xNz5nS!b)FfQeEr!{mc|qtyE!{DNev0zra~Q;d
z;1K{e2<jdH8=7Z|1H_Hot~zVq;r2_Tg%<S7H#Em;dtsQtJO&b7*Jbdy0k82@+G5ti
zzWHRsc2&)8Q@gTAPkyLYWJEXvu8}txxD9SdbkN(Zs;`IJh&lT3@$lWM`gTnBfw`@}
zN93=?vV|F9>&cH>j~c*ewjsI5lw^(15@UyF4PVIqb0-zFDyYu_NBFVh6)QdTUS8SP
zi1Vw^iGin`kF~yYM<++)AjBNXp*_7go&Z}*6tPC_?X_6}DI_|=G|kPtW9_W`@rL<;
zl}Fr9gUM`YS_Ww7-ux$nzWjOla3C5g3X@_DA#EpbL{22q$bmSdrx%OW^h2#cm!oou
z`r(^EZ2TPsJLv$Tk>i5a@%x`K>M(rf(ihlF&H`7XN=#WvHarb*Z@A_gniTyE8}6O<
zF(O_f=Hw!XX7q%tQ6o0yAUkGMQG^1VY}^HV9R)ZB9bh)E4K5Yo(&R_+VMmZfL_+7C
zpI{~%mnC`!^*UnX3Q2fa;fz}UygYyD5k7;EAKB+)9m5H-%}RFHvIobH0VP?zfhfK6
z^@L;O7B^0xP*BRS_7p2_ScEJ4Zbx^uC<Zy7pWp_b2gA4*b#r`eg_2fQ%%6QKvu*p~
z6s0VWcKA*4+3L3sp$yj{c|v~k^Q#8E`orF!L+N0|*^wLL-;ZKyfFK=jwEg%HqthE1
zVzhm4h~DuNY~cm5TI%nTz1Jw6Cn+|W+#FEno*cE*37j2;h`u$l3NkFdWWQ#JG!HRW
z2yV<1H-%G{1*mXgQbYy0hg1rKu26CQ5y*T!2YtEyW?!xYFZ&eb;Qckqh;C?I<e^kS
zJH9xYA1q(aPo-O29EZTAp4<X}hr_lp^|b2<wmV%YFE;z!C}kBeJ9`}BDz2EN0oH<b
zHpZ<DSfkWfz#8lr9XQ+JpO;|Q7!bluj}j6CD~liGGKl}nU$v2ds{!HYaCXh7?vgr`
zJ}PtBv{lCvC*V!yq$j17Pp8;a?%PF#pe&({m~p(wUqhvmgD&{l4z0J_&4v73^ats4
zR6C$`#k(vMCWgm%tf5XqKF&ZU9>lE7WI!E3gvE4SShQ^TgT*v-44%h8%TqaCs_c1B
z@-0DLR_J}mI9-rTa?=+VPp8Y%kgqorT6Q%G$TCKP;6GfRW(rNfYFh1ZGoX0Yp<$*$
z5#>56p-fT2f8e~=iqrAMA*<p_5ndAwS%F8C0IfEx-8<p^0!)WMun9#E3_ASZ>1*w2
z%N?d4#ni{XlC{A1#qxY8keEY8$jHk8%!sB!$H8}>e}|&ZxD@TD-_Rl@0c%X{c!^vf
zUTnrO(12G$Tp$yM=nKqvy>#CYMgM$oRAaEW5!<0Jv`<v5-MRVsd@cFp&UMz!O~lTT
zZNQ|Ua+Xou31f=sXrm&Vymr2R@N9@0m4qZJ>tlKP*>btQ$LlE&tK>U!E1mnTuDK4@
zyG7oV_?i9n61O)v6_Kt~f5g4NuAS0nkIKo2IZ;>7VQ9!gpwDOLPZ`g4hy@2OQC)v3
zi={y~xPuWU?AH)QhIoY=aUf^#FoKcfNHhlBR{#hJV$>gC#ZLEs{TuESmlED^4C!bd
zjZ#N^nSaPW#w-v8X5iJCR=In<+Y1xIHC0STq9RQsfWhoi0a{@Y1_^{zU5dX+<Iup*
zfLzU`j4pepNHh@0YX0>S5}^u1lXRBp>`*E=2l?<y_aJht75s9ShCKp;`%mpi4?11b
zD5M0bE#<Z*g&NKDMyDxmFk0;>g4n~YDfi_NpD?G$S6@`2cB1PxYw^cF{!y=ks+-2X
z;tT)<@R@b0pak&{R6G3_c%Ib5ut<$g3B;b~mQ2~5SiWw+V1Y=;RyT(oEo<9q^MX!9
zqk24H3l{L{5EKZ@05+|r2`)y3y`Goj#FC!F@M`1`Yc4Y#@HT8w2m&GVl;rrlkC3Jn
zYSx)WAR&r*mjDF6GWG~Dg~nnRrwcG%)y3i{u620MqQ4+1egHXwE!Y2*Yiy$(Of-iV
zxT4DZ46xQcld|`wxgJd?51zrV{^K9kuMimer@aFFj}vU&S{N{TV`wS5()|QcC3=s<
zKrF27vRMd(eb@$%X6HwYQ1nSN(-1ZA<&ZK*VrfzdLR>`99b*@YozJ7~h)olXdfhCf
zMe2qdT?WtP)$(k;0uNJeVi((;JXRb(_}s)Us|}#`K5peYq`!vs+9CQR<*{~(uck+G
zi}^jT(e@o<2kycT#7tQL2d33Ner9x#HYUVc(M_aVg10kmBX0Ei=;1vV$P#K~P_c}B
zJ?maCT5}t{9H6cJ7}ntTncjv<aQK1-n%RUER)O2qno+O4t_cUK*`pb>bzHbr;%pkY
zq<6GLuip0QYXKes4Y;J-5^v?^1)9LYLC5f#qMR%jVzCB8np06O1#VZu{Seh9^2D3n
zC$D$;cq_l1S+ArS_En{28r~4?lan>E$PB6zctK@7+%P?xAM+ogyPO3`9QdeU`lenZ
zcN43Fv}Xi3-0XG87i0x@fJnBkJWG9d301zF;z}M}sQJMwbmI|G?Mm_Ho_sw;>U<O`
zQmS9vOV_t3DjYRWyZ3c-_%dWe$Qgm!`-#Q=amw5oy4|WoU-j-qq}z0OJ8@^`FDM+9
zL_@G8Ed#4|P}b45WEXW+D1iugKlH_3;&Lap;DHE<H@dOKPvzVA*)U!_cM`7{A-%1L
zxI7msO3@k6mqE7izFDO`mle&Kz}h3GVld%ICW@_iFmp8d3wB-xLHx8hEQ*pMV%R}*
zl|XddpavgWPFya}9j&_v!#DeOlTU@n^i_pOX<t3L5ApCiN`NEagBV7$OIML5ya_wl
zu>cuEXdDS%fRfsh^xuHnwCFeWEzdL1MZ*_~L@9lu%VrtTvROcDNsZOQg;M4QWGP%L
zk+mVmxw}aIs%r!ABxhScbuFE)KS94G1FG<m^2(04avhCIsiVs_yawLM|NNic-~&D9
zjM`O!Z6s94Ufy(aOS?!q@A}0#ZsZXoD)Ynw2$+Srg*IpuS=S0B?DH4LN1|ro0xl@b
zr^&?O6Ep?V?YnKifAqQa;bxSIPMU_a<K@%YaWgYfSG5y8Z7fzz&>PNr)d>eZH7(?R
z;lMxxqA`3~XxCv6j09p$Z$lkxdOnuG8U>F_t^AypK@SblWucev&KD?25kMh#@8=nA
zU=n1|%-7ym=Us<9GjjmiHlY?f#kz+!Hi;?IQqs4LC>~kOBkUsk7te968MI|JW-$!U
zfK<)>^G=(XmJc5zSK}6(>(ZKyw2TmjlxEEwT>T8Er+>Ma;{@w&=TQbCX;|Z8KW+LB
zPz@UUoeV5GYEmf<s2&BSulb8^bzRZ8khhU&iL87Aw{A`Oaflq7-YXbYAfeLtl$}0X
z%qhM3%VPaP3--YL<U4i2Gwg~uC(V5CGbIiW(rj=_TED;=!>$I6IZDCtEMj$4pt8@N
z!@`9#n@E`YW8Bxr3&|id)Zum{!bLAngQUmisArl4wasVVpQ($GJJ6t(r}NL}^Ru0i
zrX~j`lWLceTf8CW%Uqzmu3yQhJb;Pa6zn^k?;JK*nX1FUy~@!Vl){HKweSh9lj^WW
z_0d3osNOD6umu9+Xn9hx^u*3TRoku#P`7~P<^l%(gmxTinU-75%57?{PGh}bx*)7L
zbA%22+`uy6aDKz{(0!y-i_nl;_4caZT<urx55(QQ-<^KOOS%Muy>{dY_!o-oJivo$
zZeuL0dWEiClCNr#fjomV1tGC(oPl<r6<7E5kT@#7kr*OGLXv$FER)$WD>}T!DGzK)
zO9+_9vuK=B$_DYl7~vMJ3OtIEHxZUrq9xU^xQd(ax#65Zb}WyeL#R-8GQh<0WkqR2
z@{M}fQc5T_d+D&1XdfZpxsW}~RjZ>grbjNm$G)BphjrjGAC9#OT`_bMH4dtJH5&6<
zA*nYhfK}<okihK|i2bB6V|=A_id{>mz`;-MVLrQ9z3|suNC)mKeeaRPR{{kf0IT(G
zAMYbt7xB64QKD9;5_)>mMbFA8`_%iB*hs72`z|eX;**AF<t&j}UOFxa8kUGdIu6XY
z*gQ=igQn#Q`vjwXGk899x+yLqyxl%*Ld4Qw9-poO5)QVgM8F2c28{=!sP_-J=FKT@
z@&Rn!a;ayv>L8x^3U0CWu33+E8JW0?Cv(JdLlp9Q+A{=mOQVlYm%B)%!9|;=&v(sY
zpb5<~QB}5WT^CT4<VH?f=tm(|1ihKedE01OCpkPx`8yt;>_%Q#B*pCJ1~O^_HqE1(
zh3^yT2}BLLqw0fWt6OuR>|1H!@5&`5X}va*s6!O+m_<FN37LxnqY(wr$@|Fl#5+6g
zVl0)QAR*s3l?E44>Xq`Nno9z?p^Nm!H<WmkT=|LFNQHZw1hXEuZPqa7!}mB0I5Tf-
z8=war;@di8@5v946^J`^>L6`5Tk>jpj8sExjr8Yy94+k-Ga6x|e$jAQxFg3TJm4pB
zDou|n{Z~!TX{?3VaI7Q}s9K)=e~YPQaR<L8qBc(Mx_E-Cb_1${1Z4F#5kQ*Ol`Aa{
z;!UFp<=A4X(^X|*=bP1lhTkjUCw+8$_6pn;^q+bf4;|Vt&Fd^|2?Dqa584U*P&`BG
zHrpu1PvLN+iw)O+uO@I!!B>LPHF9$_pMWiK_~6&y-#E7l{omgZSbi-&KylJ>Ync_d
z9vqu?4@x-o%pz|eT6u{i3&lZ3lNUhfc#H!2#<CAj<ez89aGRMqpPosWargkAFoRX?
z_&DW??x7oLJ{dF}!e@ug(Yy0sZ`a9t@%<5+DJ(mS6S`GD!)l>;rOh@TPq>PcXLvEh
zolP*g78s$C_F_{MtHr2_cOe|w(F{Yb9LQib7revJ4RF4hoxcoop00<9<=CMERGUF;
zjm=(3i#`;odb$`@Yl;0+oa*C|1U<M3*|#<|prjemEFz{+p@(Eam@MENJF?5!aYSU^
zoHI)LUXdul3nJaNG3SKr9Ey46Wp2QM+0+`)qoDER`4UIQGlbEsfo+mAz(ZMOxyV}_
z)^zGmo?gHl2^L?T&(0U{UCvnXPx<i}1%uE6kum7QJ&@RmV@&7+VI;@0VkLF)5>&Q_
zPu!6?N4v2`Ca_^VV*J%TVv~TF*h$!=<-XVn9$*CmB<|yioq_$1>JlLC;6K;8dvN61
zqMp~vIQ%|gS#?O8Ux2P3;rKTtrc?9QQh)PXL|AY!PV{UKw=z`yqiLwm(Iu7>)6+nS
zo#XlQ+2L!T9T5o+9)9w>-~HZ<VLIKD1)~wQtt3`r$K$fkkL1}GFb}(~8t1!&N=|XQ
zc4M-S8oYMz?zi{ufBn}-cMt9-wJD?9KjA>S%)t0!<uJ*kL>;tf;1g{*^^cn+gm=Tg
zFXmTv5>v8~ii@R?+c(%sPA*Oy4V}+!PZH8@-J1Nzf9QnZ)hfsgkgymhvsa*WnC=19
zWT&?ZZvFWtw*=+Yv=oTGGtFHZMa6nHoj`K<WHzj64}vR}kvg^wn!xr&bet^6<sErF
zx~QX5!?M;>^C5QfC)Zfo;b*e6d5~&(<BXPDkRq|}`B4!my7(YF_&3(Cw<m((7k~80
zZlsC9cOBXov;o6in??qmT!&T$AHNTp8FX4rU1?{~CW!|S!{GHbXvvp{OflY7U`d(@
z)eHtrZAPhY@KK?{!K*@z%B(=efeGx&>aU*af{~WpK<6V^EOWo(`Vi;G|Fr7e7|pic
zM}7e@ZJvSAuh1kRi5~&u!CbgXxE2({wgVjbH-i_=w=}C&NV|Xf)BG6Df&;vmK663W
zd?iVhuoaC+b4|KzzF99fe9$;;iGiPZ20@+2k6(RUXK+C);CuepIKTd8tK&PbU>SQL
zuzXlMYLKbI82$}YmiNCHj$*e~7D1u_6s`FYoWckvGY!zf)*t70qbgDB_Df7>lW5se
zN0i~x!JSWIkP588#VA=NDrpCkddZmB(~D<FhdWq)HGj3^0KlDravqwc*M5g-fY0z@
znop&R(7~PG`O-HCULGH9?#GE1VIX5%lX>2oZy=xnBx<MD8+}Gk4VT`tLL5j}M8r?m
zfQ7<cy4u@8gn+yCov_A@GuW0vf)d0q8kaDfa$~RzAdM!6AJoJu@KRhTFCe%G*4Z3}
zVkH6&%EElHJb#2jjIV=IeTp%*5M2Cf*3_Q2#5Qo!*m*40q&dk0V$H9)YKDWnxZww5
zIBX3CF(slYesn$b8saiLh5)>8=7!<8PDni3M0aWutM;9Jb<wB5i@JC=tlwka`E|R8
z9dPe*Q{AAOP!$qe8)QxOg6!t%u3cGR=*5jqh#`a61WE|C1%@GzcscnQHj>rq0#PRn
zKVcMsG<O#}!YSa_9tMmn@5=Fg%#pOYWVL#9a6@SF-ZZqkXV!+q4J6Z8yM{)Cx!wV)
zeZPh5J%hCcx?CD=M%x!|jSVbx$-&-|DkyFQBk!l!_tnFht)y?ZUY*TBOc!U3;Tq<6
zT1L26BqAuL76$zzE(nn$hlrpzE2zvZ${VNeuC_lr7}k>~c|bDQxkR%b@O#7p?Hy!r
zo6g+cYzY)*i+1bt_8q*1<+;X;0rI{L&s@pJe{<V&!}LhyZ|uu1KxupS#$jOor$O_0
z^-I{EA=fA43;o{~==EDzpnLfI+t{G5Dp>VaHtOv<{V!_6-hX)i{^x&v{P4f6*u}>3
zpVEpwwvgqllaG||!zLLvDN}L60QXI@R~3uff7`KVCoA!74D4_f0@d6;XoFMgd$eP3
zMJ)pu-UrnTI;|#;?HbfGXj4<s;I+ZEjl;`ze6j@?Vx+53?WNh@$CB-b<?3Yoi<q%d
z!8obzmD96A#D78a^(OoAFN_wPY(RZ93xnvt?AeWr1>%=7+&Yb=!>Tff4(LYH+CugV
zS#28<WKPec)lY6l)JU#_VwEGAKHC3t80DJJgK&KgX^Le_d}m9sBXD3Qju*bn5OW!|
zVIz))d3$y#H82nxR>D_ajq6_x3~z(420*pu;t>`9a$=TZ(k%A>k}|4g^70JbO6n{4
z--cktPO%dzlQGt;p=+S*(id|mg={s0!bgtZ2*mECQjJ<pD;uvL+hdTox9_gI7FmP~
zA$JkR9YMlim;?E!;c3Yew5F|W1U(Lr=qOaBBGgrSll9SH_xCR*lYy@n>(E)L0Gu)f
zR=%(&$NK3DDfvH`j<s$&xt_zfuf}Za@-2BCg!78s@NYJM7f<6`BVettR>(mNt=U*V
zq>RFWwA2rbX#aVQ^~0$Kk{X6iZo6OHR{#E?ayIQ4>SZ}EvQ4zfjTwbTE%gJ_xqGu#
zk<mk&xWv7B!eip=tL)+yX`H@bB&thr@3}E!H|{#?!=8G96;xhnLbSct=uJa3S5i%g
zbMV?zXH-M2Rf=o&@4rL=2E}*+yK^crT5F(%b@$skaYoujD5!3N?^jtcNWvYZW28W6
zObM>H$OPj>x+}3hYjDDF<`C^g^$ezRsO>?KD~f5Dzk%kxSY8$r=nN|d;CG}uSxZPg
zra#%G&O%HY0#TCNpD$1)Ya&@gD9<!Me+zn*SZT=za5RmOZ5hQVHa%!a6=<?(jUZMT
z2K#hXCjBi*zfaVkNqETI>+_`r9w+WH1?){1Cr?oUOIf1<^#3QSm$JqnJqbL!eHAsv
zS<hD&U-k}JS2KZf9hX+Jb<vMve8+oMerUie7#^~d%YF12!#7-P&#4cHKEr>CAN27V
z(o|W>47J`YM=>)t3cp#IKN+d1mzfAeVl~vOi2bDM0+h{MXSr91p$#rr-NA|6Q0AN5
zMK}QdKvgU~*-AD7qS)~{Jh80PO<))hkcRc!-m<J79E@}HKH;p0nGaBn8AE#xNF#_Z
z<<yYIgeO<(U>5PmK7d|b4E1XdfOv3<WD1mH49cl4sb`7;VSq4vxj3`@ZJb)^V_B^1
zw<kg;O;5`-<1VG)p{SI19@)or=>?;nLXRp2sDl8^Tb?}~!&RAstE8iNxw{!wjTrM0
ztD00H%;2H4npHiB8X6d`{eG|D)o{mtfYYF+{TPq<pcPOf^|R!YAQf@5bw7_LjCdHW
z#iZoYg&Q#TrsFqnfofP|<@DnCxCDagipTLq<xV1D;nw$;=`udCAMedh38Bs}X40-I
zBqCyg5`av4kpy~8sw($#bZ4f$=W=#7!8mgc*`tWd9(F6CX|XCg%0XfKVCDY!F+xWv
z*Dv}DyBlb#=+JP8;3SnZBV5f36@H>XNBy0IQ0V8#xKUYt+sckgZCD;*B|Vc|WmoCC
zlF{XMM5scTn+6MxWf|;qxM(mYifyA8lr=;M*8<g#S{N|!`Q%?OP*oV!N{~-T>Hb3N
znEZM$HY*hU$oiQGdult9O644)tyT$T55kMtmG~MbpTos7RF=WGEC^nq!^}65Kqjc6
ztfjIj-~YS-`kp#yG7_Qf<42S!wn?<H+Ntma?Z+zjVKO>K1bKvn*v9Q%^-8<V2i9Hm
zQc>&1dczeyn7J=1f|xy=&4!tUe68}tka16gFx{vLmz+I`bY*Q`A2XwVm}&$W6qJZQ
z21x~XVR!S0)i5VvbHjxR#U|)5;Xb6<`tSu}wwyqbT~-k+?!dF&qy|AfiP*$BOOfe=
z4ilc)$j&u(M;f2-KRdhV51oGL=&sS&AC-@_kuM{%%VLs}E^%kNUVgp&d47HmjLPjE
zg%fPa>o*nb2G$3IQOgo1F_IJ)6--^S8LpJCIm*YLWZFl3FauWS$ehnM$dyx-9YY5v
zJYa@pa#d0Cf=4*T7m-WRB5;_Y)awtI7G0T@dXSv~ifZ{no}gb~H4oKRpG|!{njg+l
zYK7`b>Bb*gf^<wHeb?wf6urd;yF2*|za_^SA%${+yt=D&jsuwy8}|);39_N)!zmB7
zU?YRUl&Y3CO{1P_3VRde708QV5||SoU7UJuuT+IWd2eF6ho4woMU=^znuu&?7tI*`
z^ro9I&eo(lpIWMgu56jwLU+|fhk^ipjymGefmD$DChnRbC8Bl#_6<Wmc2b&<G*y>N
z_?Vk3v>TjU&Xs6vYA&$)ssjMIEYbnW%Mb^)0F)jIMzu<0Ka_M!V6}b)Y!k0+Ei3O>
zy}l4-Au%WqtM!gmCJ_CJh=-uiI5JQ&%}3WsUV>sC%b8Tm@JSvJ^1V^`y<$!x^$2C#
zpaNu+<En|{*&)gpyr%fDqHck5A(|7^68M(cN1uCP^wsCuQ9dVXmbb4#0V>FrA?OR#
zipx-`Rmm_R9Q>1(iXc&xwb1pdq0*0rOgoO+L;xKH(?;vC2c#C{Y?uFBwak}(3C@;!
zm6n>!mA0_S<GSCS{<0UA6OQ58_mpKXu!w4JJHuHQPw@Nb0(Ji>7$EGduu@<KXn$WN
zuVfku>_ZfR|7>>5avfWMuQUUla)vss&-Y)W1nS9lb*YkQx#yMg3x>xyCYCieOJp2C
zrJ3x^S->~(9F`dO4$r6ZeCH-jwj@WnNq{>+cZm^|s{I)6f%8ILDOMpQLZHSSeS$cP
z;15(1``Jw`9N~I4fzP>7ZmPVZ>!QmZvGb;x?bpTjzSi<l+M(5wvTf3p^R^h@?EHN8
zy6L=WbFd^!Xs6AqvFiBQbzn@8MS<)bB0lsk8*P&KyP4N;kACoZW1ZN9kjD1f%t59{
zJ4RKv(CT{YhF$F*vd7v6M5!-4uuZ|laYMjO4qnp{woR*Kr=?-@0W|Rr1*hF)-!*Wk
zj3zVSSXpn~uAkyek}zM1`Ok}}5`DkvA+g)|+y+LDcBXG--q3kr16j~Q``}rc!DGFK
z9Vt+8NNV5?DRT2F!gHJ!JSZv~5+W*V<POSU=AxIx<tBQSV@xxIm4-_wS4fPz()@)!
zTNSARFE9Z8sHXe9$rET)&BNQYpf=BhZGMQ3iYAmclLS?)#g(GHU&c_hp48ud4K~D6
z1E1?$WmAbg!!=$%p3;uIkqf9#rLl=&*&zmJw8yHPky+`;Fa-x9_<DPSOWUrkm|Kjl
zdLy<mqD8juvP_hZer0o}R|0?gQpg&fx<bi(BW|Fvk)i><M<DJAi^Z6uiz*AQH9`?H
z{J{|jM^prZc+2DHUf@0twAP8RdkK0(_xi6N{%Cu*Vm_&#_EcIr>c#FV%mVW41cm!?
z=bs%d0V*{yf@~s&rhXn&n9PPZqxi^Cc^msbo4uBx0Fp|Y0m|o#J4f>B@Cv?msg}Z%
z@93cJAd~YH?|WH5Bl3qp6RI*yeg^nJe`^vf81nW}${yf%dy;#J2=?8F4^Zsf3g3?c
zXBYl_SrUD{yqmo#kaAH0&}dhkpfUjYom>(CW!YySc-_<w@NiyN-bObE#<Rx@+<S$2
zozdZa#DaWmJ_-|G;t2P(AbEFk-*Vdw>wF8r#OwPK>fcp60xmJ6yIB+U416}Grl86?
zs*s^ZYhHyA-Hx}%AdkVrAcuGZ%;vw<O|1K|M0^XQMvETf<(F~%jfb68j(5aoy>itn
zUkH1c@2BY?AZ*O0?U&3%Vq*Mlpk&wtxamF=Bz4~iwuWzdXzR8L{0-lB5IJl##3<UB
zH9qjdMvmLI3k|Hp^)Ux!-^eQR+v=WDNKVP>ed(TwQz*@^?^OGxv`%B_p|;6;AQIHp
zE*rqQA*7i_OBP13N{3DRVWH`Zys^dO5>(k?uV{5m`O+cV=xRu<)hnmbcnBK_@5J51
z{cvLXn*4|xe1Ej~Cd3T8*t)(g#qX=zjVpoQkf!hpT%+BhQ}L{+vIhSjE(heXPD>SP
zo8jU{tUgxxY;pMVv)B1ZW)u*OT&ErOv+474oB@n-Nw90nS#AB9w={I)UQVC@EBw_V
z#7-X4;SP#|X42)m>VeIqfO5sT!45jok1t!tw5QDuiY#)T+09e4&irgpfY|a#aCGZ!
zjsz&0^wVMqn>hH>we!Ex*}#VeHlXV~>;N)$Oh{k;GTMF~AWIp*`OWOrh<g6+>T@$J
z_F)K~T$XUt@LQe^-b&H)#lcc(`d-KS)yC$8o(IaR6|#)c5Q}&?n6JIeI+J(SZuxb_
zLHF&T`?l48s||89Z8BCR5w610tWyJekQ%pH{H8Bc<E$klVz27n`3eVR)Jt1G9;|7+
zE_%R!rVTgYYMKyKHcsDW`uNS?7$(X-GT2vrfGqoe*$p;LufX*_H`z3R<r(*PmS23c
z)jJAc!4uCVuX8t%2^Tm6mKs;Vma*5kkP|^+i`D!O(QU-kWHn)9qGEg+_D_Q;c&C9T
zQBueC^w<KDX?~d_a)0&|7duMmyIwKAoi_1G0#Rx3xSoMg26F37Z}?Fig7<;r8f{(}
zjF>q7gQjOFV^&fP5|cH?79Ez#M^Xtintrp9v9hd<b_%hE0`G5UU^LJqL{2=%5+8@T
z(HJek!)aO)WY`A-UtIn9dfES2tjzdcY^KmlSIff%oFcqG-tH(&KtvZ;=q3?kY9FLn
z8s%r2VMu-tWo=zY0ckbd7ODwXKd2syng5nGhzF@wCjv2+@mwZqzp|dfo?HDw&bZx&
zGS=`72OU0LFNe<rjP|kVGai|8EvpBRMhVSmhWBOasJRp8(qGQpk%+6(TWSIsC@l`5
z(oa@ax+aZ^dbC(?&_zWgR{b}<%(T`qeYo->=XXFeb_cUAPz`pR!-q=4NJE3GJwGZI
z!gNp_s}IUy7Q<{fUDrc8Noijek#mk7L<iWoYhmM)n-NQ$Rf`I(f}yzDQx86MU8&j5
zh95KyoSkcEJyQ<QGR)$>*M0R_)UA;$0$WZ>$Q!**)}b_&Bw;pIG6=_E@D(!-?S0D8
zfmi$!E2x=)+BgmK_3ZWh{F5)mfM2kCoSuGxXcA~FvPgsH0h}Wu9yDCI=LVfLwzX|@
zc?U3tsxq8v4EN(>^>p5MCB)d6E}Z{yxrRi0lZ`7BZCPh(y{#bu2OiaZ1Sr$2c4Xhf
zZwS2wg*dWt375!1rQq0xmpbt5Otz@WF>Z~t-Aw2pf@%2TyJrWMUXPuWsu3Sjy-0{v
zO-nqPR%JDIQyGGp1JqHzv&xZAXU{tgrl_1CY9U(w#d88MU>XP$whL2V%;1K^1;Px;
zi@x&K-C)9<XKA}OP!l1nSQ3KnUID|FyGFv^WG8)Ki~B#3p&Eh!(X5Cww_ELuE-sl1
zuXB@|g!~saOLHkyH5-eDt%*js&Pe}w@<V9aQfWj>&o;G2O?Q;rgaki`-nw)K&&b@9
zwJZxf<OA-y_58<f;xi(?dDEmp#Ad3LMXgtEA5yry?(oUSo<N{250@t=i0dn9M)%~w
zJ;uU4x2V6J=+4C~<(^Iv2h6|lhI$QZo1d;OkVA;lz~C(55Wxssm+nX=*T~9XSr1>r
zE2-%vx}GR)rFj9-H=FxDJjK1NB9A242r-@<M=aYyokkJ3`Uo+0av<R`0GZ2jH<D$r
zOaN~l9uy9EU(R2vi?!Jlrjr9C$t=%b&d%YNry{*Te=K~g_o?ypfct)q0$g6PU1$D^
zms+O9%g8Vr19LjLi?Mlw=<!n^0w!s^dw#rpD)~O{s*R4V+ncKjdT7>?0V5uDc<d4O
zI5W?>T;1IOGe~I%p<`O=2QWfnd6S^t=6k1-wr(@ReoMwA!e+iT97IUi9+Biv;m$r?
zKS1#BJ<UmR`7COu)2$O)2zuXX-=sjx6oe$~`7DAfIo@C?<aA`{*9gn#)Tz1Qp1UjT
z_`*a<2z`M7+vWLd$@@5X^*JPd;g7`m%2=7lIl;jI`(D@oh=Qyx{vT{-aP%($pwN(A
zS_Lc^Edl%BXhk_+AiTS(M#N<%vDzJ(LXbE14J*QU-ytOEK4i_RqCkR;L^9Aw(xbev
z-+|e1JMzV`<|E)zHo5;Dd?y!@BVCN%tU>0P2n2GJNM%`gvv(**`9ko`UC;CZ1DVv6
zwKcH3sonEx+sYry4#SIpEwjiwkEvlntM9x43-zQ6B`T9qf(b~f#fjY##$|zKl~~t1
zR{E0hF?PV=uVvh$qmN(h#4BViyi$V|GL`m`By{?G=aYZDRgF{-BcH{(>NzpGO0;CR
zzdaVYFAX%cQU6@4><1Id??elF?FzCLS=z$cGYn9icSA>*r6Lk%1schwwJfSPKa?Fi
z+u8B`q)kp^vW03G3WXyu2tkIQuP@GZ8<M->I<fmPKnStuxXcK1x^*q#cAtUeaNZ(*
zTyC7(LJL6*c^MEK^$n9cajj=o@wkP>g#{m(1bsS(4h!uT0Yh3^9jP5Jorcg6s0=BY
z7ue{<H7k&bVD&Z{hKunHcW<~&%FcG_O@eCfOm&>O7)%Sm8|BUsKtt+U5N0dZd|VyP
zBwIr|(q^FO+kpa-2H092G5Z1Jdb-lI3e$b1+tAz7`?s`c))n8oBU?JKX#IL13OziO
ze!V4>%khomLc|TBvO>CTL!VkQ7hNxrgxZ6wr$gqnrCC_AlAYZ|%aN^hWJGK*FYL6!
zQ?mS2V_-eh$mg1AlRB^m8@iBVg<|2JFVjI;CAR{WC*$ToNwhF@1w(QQ@k7D!ojm!i
z@~5pGZX#$HKGn|fJb}9}d0<YmGEj(873gVgXzhSx67Fb^uX(;?B&GiMWy|Z6<vUpP
zdVo!Jl-Dpt7R{uM>c5$ghpIr3Y9#33ScvC>iQ!G09M+|fky<Ii`@s``H5o3^G$dsZ
zN4FJh1u2BF*F*(v^zy^hs;8`W6e8PxH{hUv*<?2Kmq{eG_Pqzoi2fC}k&;W+93+*;
zIz=1Q{O3T}&AZ$n6Y9kb>rE_%NRH+&P(ekrGGh~L4Uzn|qToIxymOw}olLk+M6s`#
zm9bn2k7ND#{VfN$qK7*_1Q~RDBy&qhJ|0G<e4vPgG}hfFuypaShDqd$Xd&k(a`)H4
ztNWDX%-EjjUs(j*^1U+v6d|DyCgcS1_hApB9F1z~iCl>9c${g#?SFpCtHqKN$CCtJ
zyLPub3#%ART;m;io^2BrrG3WCdfbKFi}qY=cWMQ`x)~vf-oJo4vU<Uri3&JZ;MkYU
zj#(RT+L7V={UQDN4G-CGJ3J^Rl<bmVD0errN{L+MG()X9nl^dZx`^DSyw)owF05d$
zj2Ls-r>Uf=<qTb*IKri3M|U<mkEb2Y%mTq~+OCXv@aj5cDbn&#-!BW3UThX3Wn@(H
z=zkxRfE4n-bK4K{U<>A(pMM8bNlLBJO5qFQc*nN=SF+o~`dfg&^aF)PH83_GLf>;7
z<NP6#*AY#rtY_%`7t5a?&HwEJk+6F-J*~=xk8f__wlNsrc07Z%F5E#;C$i=a($!Jq
zi}F@}-@~sJLQvFEGi6}xqxru|o`H>&pd}=#i$k>Y2mce=(?2=ulq@SEj=9G?>jY_K
ziVM<Idk!*hqvNQe*r)CN`Rp9oDQRKC(=1f(mPpSmHQiOf4#j^vJNrt8x`(Jf+Ik=;
z?;?--DRCqRsTueK^Al|sNlNFFXBVdulcnsIAq1L%hV_D`L|PtMfhA8tP0>R&8|BH=
zwDC2a3F=o!{Yq~N<rI~IBtt`<iM{gT{2T^5*|3Z0KaLzLD+F_}yr&J#%!g6JsZc<L
zMFx=xNB|jhZ-$O$d=wVy%|>%$bRLKyY_h%DnJL9hVL62Xo=G*xrLj2i=v>>ZxHOW9
z+<078VVM>?t&uw_GO35fx)Ett>*OnUt~Eq}yh!)=rlm1ipbI;|sG6Cqjm$*;E)fV}
zG}{<uj#k&q*B{21*R#QCM&r%N#c4YADTgvCsu%UAh!5(N51A#NYLt!eHmmwwz8U6u
zzyoy6jRlCP=fS9Wlvp(0RLlM1`HMA<a`1i`gQ~$1EO8TgdgpL;Lu^|7J~}*sw{{7e
zD~TVs&WTtgcLP6@CD`d)yHQ6mbbX38n7_0n=VZP<yhZ<l3P*HDfr$DQU~<;If)GE)
z@Gxz2kNEzE*+RiodQ^rb6rK!u$(|u!AnTzxu3txo5sDKeET4XVLtGsg4n3dfXpRQ4
z7Koe0CRafSi`t*He8$f4@(9P~TQDb4u+lDzWHh)F6gczqSg*viAxoMDfX;|Brv&9K
zGn@y)K}^ImXdwXDsTcG1WG7nJmOdRqmH<0zG?G2-rVHPj3K1##PH9sf?$ML9RZa)H
zK-+ibIrcM|?EECmCNsh<6WE4h0=D%fzq)A=<uJTDSbm|q1}bi)Edg2Ka#rAJYMyUZ
zS)tQd8@L9aqJ$hS|2$u#b_)qnPj%dlMCuClEH992$c~(o7N>X*#&XFT9mXbGi)=CJ
z!~V!|)Gx>C{}myq{Fvv1DTzTL3x$1{w-N{dd89#W0#UPeUqrE*Tl&yVyc2o>O!ez3
zJgRQl5^*7u+5_sKZXg%~$6zU#aBHH)DIJ_Go2D{7^f9(dkQCBHciG`svqfo^^voyd
z{B{}g2kw5~iH0)8)_)Ftqwtc!lO0E#4hH=TH+Qj)i)uN6+Jkz2un(=4V1E1yU(U-@
z)F=_zummA7tO2u#5`YCb=};k`9J=Oow1mH4t&?k~5BWtA3ACY7^m^6wME~?LRAj&-
z_!E(gb4+xNqKK#B*tK{EgA?vr8@%a|USq=Y3>7_J!^^Z@tXRVka-SaF`Qb~5F9tn&
zEC+doQ)OkPrYn<(z)!3>#W+eqfn{LVn#0EKiNC}&{-ZWdNzYQdg}Ebis3AbX<<_F=
zeF`guG^PdDO9xs~2DZmrB*GuSh+rh4pTR8r>@Z*@q9m~se}WwUE;D{Jnd4L?3)G+X
z*0as5l*C3gQ%t%LlW%L#nWKG}*Cvyjl%YAZlV~C#sZLD!6%NIOdgW`6@6a$HFiu)X
zDXidk3aEb%bh$hiwPnfbF-Und4MY~^6gAdRsR^0^;^XM&6FLTSJbobjgEORxg~h*{
zh@kF6w-tKxI;K8vzz5zXhmd^*KHLWk7F2%I$+@z_C<_=1B}#=NKy|s}<J4I@F`1Bv
zF0XIxF&7A}7Ldr+fZY4gJ=Z={JL3L)9o7tYC$Ghd5&Ezo279WVOEerL!J=Vcn4#`U
z>P#hCsx5MIcmG}hLKeUs4H}UnGxbd~&R`(XXRz1^wqa9*S)g86*F*(6-=f5uj#>xM
zi?JZb^Ji-oi@>>Gs<bAUxvpq|_CORwJ%eL@b~FJxE%_utZk}svWTS!{U7~o7#_wR}
zc_t3*s}S_kpKP0$5%$hNgKTpQKv+OOa10z2IkfT+tKG>b|Aa<=n(Xr5-QC0lWzn$v
z(fiWt=gGn&tH@bO2AAsK)>7nRl?fpoJgQvyfl`bFYsjDN21{18HY+m5AM`L=LCJxw
z4FfZ@pEMAJhsvi*Uj}|5z=}V&Zd%$T;R-xIynwqet+Ot(>~3?EUlVHvmYZszYJ4Dq
zSiH3Rp{ot+9t%jf{Azk}x_YsAwl>>VGV?f;F8*FoW#yy{XqTg+_SOocG&C8ixjUXB
zUI)gexoUiXoxx4tvtLc9#vZs#ENx~Gxo2@t&6$1BcjXz>;cP-S9FD^X6|!f|pm^5|
zr*p({`Jp8d>C_nA`^XB&M~tJ1t~%rd)GkMZ4;iFVzjE6Kh^~IIaqdEJ8v13J+jL?v
zhP(7-c8#hE=&n`;<XrVWfX+wdR-6O@M*_BVAkgNQ7YNryO+@S@Xh`xl;Vh|h&*qTD
zEV$>Yb{m6a^s6{U=s#)#5a~cC5Lp%>&MJuz2#En{7T)r`r>ls+taKBA>v-4@|K);b
zZ(lsQo<i_~86UpH=J(b77`8+@x9)pXdmy=4&VZ#x>|ogx%6k#^$JjVPPzO3G%=fK6
zP1wgqSE(4rjgt#52)uTey78$8&^@T)WgqKiJ2uf!93qHI(kkjg4iXhV`J|8oj4~t>
zEuNWrPML8^70nGDCMe7>>%a6|U>|r%Dtnoa=t}%Ut8N;V8?}qJG0;Z_vL(0fOP-!Q
zr|N}+5GS3d>l)Jh6{_|ZXHYwbhRUiTW_~C<blKt;Mqw&Y=cqxp<Jt^T$T{fa>y*;q
z@+!evNsgMl8}Ni=imi3f$1g3n86KL#bsM2=8t&Vs)%51NQBE5#Dr*DH2SuUkVI1Lr
zX&v5IYDvf|stCH0o3@4F#vrLy3G^g*YY}jEzW9me8PyVaH)}8MPqz-EqEcrY&=u@B
zm}%5RgK3{u+i)y1)xQtaMu*Xp);EZaft!N>x^)$s7HoD$(_tKpZTB$vN^n88r71||
z`f6MzVG#)JO!ARlzjED7yI*Tg(qeW0!NX5}_q*Sxc|$)P9Xi5K@8m7|{wYex!3B1J
zPN&#`zd@Dg`Px;3iUX^rTA>enq|me!AszbBea`Mikh?E8fLQhrKodW(+k8zY6MPoq
zvttf%d{Ijs*00QPUg}YgUXL-5t9fme&tXH>D+LW(;+E11{Xh1;v^%OJ+4eiXqAq^x
zfsGLJV0_(eQ3z0D%p^DMOS9UgQVC>BDz!?op;`X#Z|@xuIh>(X0=w6}?+ULapE@Up
z$e1!RGBOgK7QZ?I-vjl1prt|Lz>Xa>iCwR{@2;K;vw@$_cfhwK<YWuMSgsE9#2D;0
zx%DYj==oMp&7gX+h-<gHA)&ct62wg|d4s-`_VPlPa(Wsgu=e2l6hu)VxfLLBm?iEc
zaStDIgca}Lpg$g-4|;iu&MYhjYb%TJNHJ?c9O)aQ?eBHjL^+)3rq;FD+<I|1-Pa^f
zqS0Ry6F=AVg@sVG8CJ|XZ*kIYo}v`sOD&EdWsC-1U{t`<>OLk5E{c}E+2^UflBmbW
z_#$w4KZ3MNvX3_4t|{?v<0^G%4pdD#-W6$v+Sf#)PCfV5EoH&5*`sbDwa+z1edkp~
z6bjxL2v<S#Q`IGU)+$V`46#1qK_`e~n#ER#j`*O|w{zjI+L;4=C?&*8`NdYPaTFZG
zO<#KQe;wiQ2Y8IU<@}c8xLPBtV3BjrdhHvV$Ez3p##wvUD9OUu+$4E<khDYw-&OM)
zUnCs-0do2(W05(RTl<1Zvscy)p-Nv~C#=~+bELEPdt;x}u!@6!!ed(&AGb+HvMsPb
zxsRO~<|6qzz&~G1BajuhLZak0H^-a(;Y3Vzh7X>&9L!Zvkb_O`JYDkL)UVw}h=FFX
z!$DYgwiMnA^BLA6+prC`X9~I8{mz;Q(fX|M9^s<(cpA;biaFK)w>S&_-76O31Dnji
zZm||bvQ>9~B)+W;GPq}JG^cVFW>>8^3jWumW~6R(4Np+n{q{cX;ydW3!JIqUs%*gs
z1JWHzaYny*lOP1cW2h*Y+%0~fzx|=C^8(>6yyTRC<_hK8WyAq&>eOLA#Pm_<C?>;y
z*SgV1S{ogqey4kPr_;kB%(K0t{T!=mYF#1X7G+sGl6`llWgOn09w4QUMWK7BBKM`T
zQ0ItRF<o_PK0vbS-QC7o#gs`{aRpLOVlozRDITKuJwHM=`gP1w+Z*F+@1@&(;eL?9
zifc@!Db038gm*iQ<_LJQw}!Ztrpm52OH|8SFL2SUgrMp9L9f{M`T}BkINIAd+VLCe
zps#W8+^!4ZQi1<C!dBR-pVYHs1u|YEHo9bhcHAm9E@IwHdl+CWJ@bFT7Uqg@i`bBp
z?yW5-M~&1n9Gp-ej7rpSt8uNcZ@wpWK!@Y@!6Z6J?^^-IoISAhoC?@^Ib4}*on+5h
z*<CB(k87{0!(5{Deu2Xb^(`=R`BWw#!6$R7_!m!=l($A2E|(VL>h7@yZtdbR0;5CD
z3T{m%?VZ8Ocs$uZ#7+xhUeoK2kyu|J6oZWI)ENyFo^bSAjCnJ}_N?IL^u1*2Fe!~A
z5uAb$FP=w$X~m<lpit3pVDQheGlXN9;No8<=XYsZ#%I_6w2q<83JBt`LmL3A$|VO|
z()E`GgYh=Z0*pf7tJDJ~{|#o4ebp5lV(1$c$i`p`%g^2B!Nn!anzBQW8dG(I%O|#G
zi9$g6(;}KPb<uMH2+>*+AIulHWo3ulPgp3FlAxCjSp4KDZFRHS06g@eY{y>O91KP;
z2*m*=S+HVBvBb~9vD^t?+rL8~OQ3NBruMfR)yW0z$_3F40;O;Go~eAODGL#^6UNb#
z^6NllwnnZqZ@b?yJ55){Av;uP--Y6eoCHCOd>A`zSd)d{s8iT?fyH7OR^UJF@I|q9
zAC0CFtW(q<rv0?f8rmK^Cc+uCgyMP|XsX#GPb!2%Gl~J^R*U@zJyb|2Ez|XPN#Sr^
zQnsu?FRGhzMR_Euh8s*#3x;XXTBvQf<$b=TTxVryBV&iTd%g>FMceR=tvE~5F*aF#
zfm_~jb>UyPM|X7~{^`*M@(H|sIGz4ntO%|7hLo2*H3rsF7&ui5ai78SSBYssqEHiU
z&Y^GvD<VR}6;y&yEz;ARY>@YyytI$}tHzH%8^@v@M+OUFHtg2t<5;UD&P5##uuCkZ
zw(B8+qB=Lz7$2CulCKiW1&*=fzhJ~5O8ySP++`x0>467z7nt~iC6RdNzhmW)1>{5h
z<da{{NeF8lPj(6gS4%Cf-gYXIP&I|kPZ^#A9S=ifQ2WSPL(rj5$u5sav!4gZ=JNtx
zS9rq@Fjep*9>O~Ic*9P?baDWy$Z|wX8n*H|Y5UzBP9=e%7r7kdE+Fu09qS=R%T1;1
zJs1X(k~X%0WjEU4n36_p*m?<dGt3OUmonA(v#;d}t)%o11+2a;V1DpBnFI|T_h-M<
zGBs_#OZhT_9qf;tRtN~3902qTj@9v_x090OJy4}H-SYtJ(x@pA%u&ZsySH>|r$s@G
z)Z=`L4h-u7y#@o!cZ@5VAn|_eW4b*?m+N#8T$Q^#j{lbzPrd_Pcp7MX>wSZL6MhH0
zc04-|8hY;Y;xxbUX$Gc;a@By^bgMptqc|vOOy|bDQ{$SQhk6PCbwb4EEX0ByB6%78
z$k>KLd@!FT$mqrs0Pw)O6W(s~_<|d72wp0hg2-58V@i4UX0oRv6NtHAZ^WOVG27-7
z$X^uM=lGf?cg}6cJtg{`asB~eEFg-_@ze)6(}IRKnEOWF8Q;kntPFnq&%<|E`28s#
zxgNYd+Td{~M7pAPT<nSlMq50d>8z-Oolpr-JKl~1_c8lRX1PQ|3V5mA0$!ky=~~Ig
zN;oM2V{mRu!tb>XMM=jI(+sTeUe^EQmG*xc{4&Lula*2y#$CI!x23Cn7jZxDmPcc)
z<<BcKf$<Ml$pu|qhjrL5PY$$)SHqq4L$z4cB&Ie<;4~=mYo{(YQ24nrj0j9+Di8q@
z_Ved@qbiCDr3AUQF~Jz^m_hm7)DOZ>cw4#kUz`~Dj|O7maMAGtYE)$2uo80jXfuG(
zV?jO+)I1*(<3g=*8uV7dYms!WfC|=lH3}{GWM6Z^XN@4!61B1IiBd;EG~YmT&9LID
zn@Y$_TlEXzIS@V<Y=%wu^ws8fNkug4tk#E*&JDoCJDIP;)PJSm?ImbJ=HRjnsjt&)
z4^#iUNZVG-76s%DUOw;X@3P>Rxey%oxw)9NxK@g;JYsUNH=KrIT-|`AxusT>&RYm2
z8enBBv(G2zD=RTbXH=VxWr-4m#vp)w@y=&9rL7k;ahNq3H6QY0rDGbCHg=w2hW0G?
zjhD&=E@LEfx5<NE8mZ-C=ltdYCZTmXW~9L@s7&W0X|>1B)mx86Rft<Tn&L~^7bwAU
z^U<NtnvR@N){TCF*9tBLUd6|XQ~Y#8<6U#V&NvYJVIGJTO;u4>RtQ_$=i!@dho(gx
zZv8f)13eM(Rr%Pejoz&YOl!bd9L8er`KID>g<A0+-M-Vkg5rkSA<lrmnUs2p(q7gy
z(lUODIYkRcD79<R-a@+LFmoLHX*<Nqp7T^}+cxeqX#qQDHgFTH=?Ub~Nn~8u8@z@8
zB}Fq5lak6s92E226Ami+b;nPR|4=VA8Vcfa{4BwLo%8-2M^dVqR(QT97x5}AbvE5;
zQe=5GMu_d>q`^+M!{3U{Z|!-{(eEyu?J7;NtsJT}6LC6i{oUQs4*dl&Z*^>)#EfZM
zLFN#BT2w9Fl`U3QbZQ+Gx6a_w*{`GhLhX^O``WK)B)cY#36O&^h>Jz9H~_5i6xUFY
zYs#S}fyL>egZJlyc1weEnDreUu!vq|o~tI9N<@{&w&2v)nN<sZ6VRFaOJl1xy{fiL
zsVBKGkz@&Zh_&?{%LK{L)j|WgbT6cNBm)WjvO^L?>vtX(?mD+>`4>C8Ue90_*fn|U
z62}rfv7E!XZ=i+{lu#82AgYqM{kJg~lJn%_EQWISHtY)p329{IvJ4mbOwQL~9VAHl
zD=(grkNuk3Tu4Y+xCFByedW&zx=3oQD<_cqqDQoqNg-*jEOG2s?h`)Do%8$VvibAZ
zi$K_q)ec#MDU&!=`gXx7bUpz0eZRS!H~V_eXfc~Q`I?lzVR?cO`t#_msE(^VvcIKT
z5mMGFF+8!|WEAO~U~OetEZ7&_DEK|L3FdDS2y;z8bAd79#a+%B-JOGMTM@r8dZ5nO
zTrHds+Ovvd_DJafXOV>q;lVsT;%-h)KF8F)DW3q=3oUF@S<G~I(mgxQt5nUobeIDA
z*neQg$7wT9YbxcvXwR!=Ii=Pe`DE#X$j(j#6=MUV>FZ49={Ay^;hY?jjA7}j{cOH*
zRS2iz-_IU+g1o<<)xf`ypOhT0(xbWV#ZPx0+Wt#8Gu{0ddoF$mFa6}*c(A&4=KuRO
z1Gn-w9<!U1h?RDAQWQ?Io6JUS@NLYU#9N(_2npv9duS|!d`KS#+X#{o2jYR|K+#fK
zZ3q9`@+32pR7YOm8PmAZcU>(hvl+be5JU@nPI#SQGhJT-yal@5BakwUC(z41r*^Y}
zC+r>U7D6&Zu+9sju3UJfg!)qblv0D;23MZ{a_i+oU>WP=0;|$1@rfWEA#$SVoE;y{
z5cpzwAnDapM=s8>@Lg!mIq8hkJr?gdxS)T^iBZ*44+q?nVs-KUK5kNvWSZri-XO)X
z+v6e4f&U5({r-jSp;_gYQd|fBX}@H&i>q>)H&*eiF7N4JQZFnOJQtjC^I*t)NfzCN
za7#-GwKLg!gZxRJAnNel08=_|UE%J^&J^Ac9kt$rM|-Bd7Hr`t@hmj6Nce@Pdi1<Y
zdu$h(A5r^YvOE37@8X&6puVzjV#j8e-h~5vcdo@2k2m!clLgmu_?nMOm1>50H<1(v
z&O9C?vK}@$1CY_Y5$-Y}ylJ|(Jb-K>Wz^Q>5IF&rfR3qT*a7YXQa-6jLRa5CfGjiK
z*1-g}Co8Ez?p$%x$<u}wupkr8&u|jrF2N?Wb|I%Xm#?mZ3lMb}b{HhW?OceuVs<c~
z+z%2kl_rQe9+T398^(Y)Rj{V=0&xeeY+lc3Pg9;Z2j#H4F;%)N+oy!@-<yNl*s_CL
zK-tE@^k?kQAsZ#~s7^p>Z6vaXNWarKS6>0so%NJ?<M;QGnj`J^8B==y-`IqJJQ3Pr
z+}<UV@J<nNW}Zem1GjrsvKp@_QmIdBn^&*HyeagmeTdo0bhow%`~b)ch*q6($a=Dp
z$fB}7eKeWuqs*&Xq0e4hL3m!7Q0V-5n2j5nQqRNP$AsvA8f@6ZpOGF1ch6kGb`A{O
zdz0DNg+s-Z^(nPwS#o&cO4Ipl5T#q(A{{(9Ir*a19(@Og%yklN+A1$fB@@EzcWaf2
z(Y|IR(hKdU=i69>s?UGB_<ug2AoA=T;ymd3^xkB=jkC?gysU|_kwS#;RFxZR$_r2U
zKF5_g{NX)e2fhN;fNfAn8GZm`y&uN*-D35-g!sn(6+46(4gAz>+4BO~>{c-UL(`pd
zha-ldZp03iZ_luJ^KHud3Ic<nf$4VN+&JT?+;*~BbH<c`@TtUVI1Uu!o0=+Cs)>nV
zU4Vo$X5}X%uJrO@U^Td3t+uAGaM@9(v{EZ_+Q4=sv@>z!ww(shP&j4_xeZ+qz^(t7
zPm)$al31uO%NkM^@9(d&y*r3jDH5~8utbVW4?h^z9VLn79c<dpg|@NU*^0}IGq*fs
z%O}$XD_EG3LDpkj^x+9UC|t#d$or9I@d%k`Djq~_fK(nZi#f`1Z&Zs+BtDSV)bNMV
z3;U;|otC7XglMk}QC)Y6B+R>=*Hy-lJ*PmJKXZyC*PWLsu3<2QR#dDP|II*r8%-P?
zE4Z&%W8f&eZh(7{v)2!Ft!L|X=JeLtj+M>L=L*D688vLS;F?kP6O##<uV=Kgh9Cgj
zG<6+hWj}bnvLc;Z^_|;-Xf0aNMnW;9s;nadvj^S8+=S)HZ|fCH4ebsZaza`QA9`~s
z0jA0m*tzI`m;%S|Ks!ITY-HK-`yn_9(^Q<&p%S*7Y<FU;h&g-meC@&7cmH_2y1w#w
z<;A1K8nzKy{454lyrsc5KAai)xervF63V;PEn<2Lm?t6SPd$5CCZn+FdOUcnGXlC$
ztod-g8i!_ljteuH+xkBXI+6AMRBklY7FV^;F*9C({jII=$h;YoPH7>^ZE>8tqEmG0
zVMSn+i%#yMF*=-VEp7sPid2u=+zjrHH88fAixB4*69r?`LUaoJl`e-Ig>Rl04@F44
z*UUVSc@hR(8-9pA0<j8;V(Ee1A3Od4scAZlvnM(X6L1WfJO~tLR$9KwE^SchX>v)j
zioCgGaq=UixRaWToRtW-83^L2+C_`K=X$Es8f6Ck-=exxEi=oaq%(9G@pA1n@PtV_
zx&~K7TuND;V)NTZQp`iL`3$ZC{(x(H)|@K~sz(SjbU;PU0HP>bf#LnPwFV+8w)dd*
z8z<#~a9>(Q_C^qdiMT3Ruv>e*iGZK!5+CR~-)K8H(1vW48m+f0Hwq~DvLHzVUKsbW
zMh}4H5$)`(O~Yy+z%2zOQ7R;cs&4N5({cSTa8V89F0OaWqS+Wk=zUx?Q^e^;ETq6{
z5D?A~_&6rtdjg|X-r4KMtp^!Y$+%LgutH}&)z$1VD{$s6-JwBm$3aoABPUWUPK!;r
zt%J$rUx;DQvc|_p=PR$?#)L?e0!27th2O(+)aM=k2$6Hgt&cx%N&NVY77~-A-JfQc
z4&VLA3!!I&>aF$mBPUbblvj3wNayKJ;lr_X?C<H=!69ZG9uN?WDODN?ZhIeW!sP?k
z5>zjOr{LY=C8GQL@EsKGRI%X817tT=x?y;3*tC3B6&#51MtdVHvEKj7N-*8=WM?y6
zXem!TS7RB?_1L*si`&0bwrC#+V7++t)|K00?Juf%<dC)-h5^KNE)|>*zP5{BR)J&2
zc#!$ML~CocXB4Ol`4tHUP_?+5&k$m0C?n&U;7|0=g%EGV+#OP-8C&CoGhBeU$@D+<
zawsVO1ZCrD46JDS?+(vF&L(SnhrxJD1Kb6iIMxqFJaqa4h?VE}?mu}RCSguq=8|II
z`SHv1Ex<bG$0<(u16AOFLe5gc3|O)$O_e*S1ztX1t`e=OI%V4SN__>eljK;DSX${h
z`#!Zbcn8SWbx9@YG7-5l3hS_c--TO8uT1e$`NB(Aj@MsxbYT}8M>gf6^QPmiziagD
zsHr#D*s1oa6!2jiZ5I0hcR@#wI#!c7hIL8hJf>tZcy9%;16)JW(ITp|8U8CmC|?(?
z3c2MD74azg_4;7jy*GEq8k5X)?|X~;_!iEF`?#qG2kY;`%kcAey1XYb=uY=%$B0go
zSd9kT_S8!T;9$TD62dTiUEPTU#5j_Q_Nx+$v$f%}2O6NY=Zp8Bb{2*Grk&7?{eq1T
zm34S9-PxHOe21-u-|isGepB{^<>$CGU>j*^ve{4!)sfq&PU4)<J^1-w9KCsi4WE?U
z#*KuSN-CXDSOl>qPFvUN58Ah@&8~%`%xB|lnrQw+e_LZ|os>_OlCY-(!68eg>pw92
z@KfCNG+9C>>UYT4^K^26)IIuz_vq^Ieeo8h-Fso<OF~2tL(ZZ}*^bGeFOEEyJ<TiB
z0-(1r;i^LU43-n)W3z+GJ#@nKm**=EKMlL@E{v|m8B{L(Lp0(sNR{sb3CvcAtGX%t
z@+j0sTvfP*oKDE9&UjH)W)FuDVQ?Mz!er6`fEsAQ6+;cKbUZ3iN8+4<ik<z5_{3hb
zHMb(VDyeA84n}f^Z6uL^?JHAq6E}q6n2e5`(ii*-?oz7{`qFUa%-m`79p(iu7xb|G
zzN2nJ@y*<9QHb^<Hxy~2$RsXW9wetfw-ULFR8;idEBg<vbmbT>Y7wSNW${JAb?ApM
zRkf8?56ICSC5xte+*($W!9XjUo7k(>G+VdHJRqi8{;c5Rst@k|-e>K-O<xbL=h}_N
z;$q39l}fh~&6<#@D*8F~uFj=WN^o-?zq(c+i7LpSt2rgiCLq8zH`aB1%lz@cj;bPl
zngggffLzE>+0H$f)NLnF`?dr7?**y336PCEq^pq(4g*(RY#hWZc#hob;}g0QqSMPf
z&;k$E61D&zkA7yZHH4TXNl&t0bi;^c?wk%LyZZ>hz}j1JCAz7^+A=POh!)H#`Tshg
zE-A?`%h3u9*jKMVj~iu3%*#AL6nm@>t+RXEGp<lKqd8tN2ytg(Gc3})&<iBxg-^Vl
z>MYl4ovDDZ+1KONE+1hqzsmh$S<-GGQHiHTny5=3Uz?3aOFjYXTE1ONx}&Az5#@l;
z65BVG`_^~sp!A`CH*uUB&YQH0Yb6wYM8a=O5J8f}Nxa}q6^ckBMJN)S3<~>5F?lmo
zz)hfhn}b@8n>yAuF>xT#gr)>cKnR)HLf{W>P||L4!J1vuz%Ejpf5*H=_l^*z!n;Oi
z_iTtI6K2<cL;n}88w=aA2+oCqx$BmKLNZz#^;7F%pNd5C5^{Owl0$I00Lv(qkmQL$
zfeT*M>L|c;UKJLoYNX&1vuEqRP}11dS|_oD#A48zZXmZEtbCl}&XQ0Jk(+j{5YED8
zt|y$pMLkU&UtE~eEMZS4n9%wgr|XNL7uZ?HJ6sxVYq3JxW-52#6bHXS_pUGS8ISgR
zr}C0jfXAXgLp52kyH$@9l%}1-oYu^7T9IzNxOqME6GOe)>aOU_Po8w}7!ShxwQ;jj
z$hb9BHBd7L+}S&$G29Efzb8XNDf+YgD=rD7MqgE^ot8ZP866i@p<1m4e<*ZvKPrU8
zx%eQpqGhDgJ0V_r*_3_urm!!ANZ@e_AD+-7A+HqP3pLfDM??1|jV8>rrXUakw-3w2
zN61~F1biwgCZgkJ2WjQ%RJYzR@HG>j?O|cTxd77$rZJ!8x+V<7*A{ZzJ5u&?+~T3_
zBNJ?e-?$DV<kvLQ8@Z}344CDZqA?DsXRi`2tht_}4v$fRC#UGg$4b}kD;s}-&BWH-
zm`P*r-edo44r#crP|({^6u}z7mO{<%6tMlE!MVyHm@MZA8SiA@_(;2EZyRT8c-{pp
zihVd`z}XB_1sgv2I`ivzzsPG~T2OI^V#(-I8<t#m->=-MO_i6p40pxzgPjjJl3y;#
zy_=Lhx~g_?mx@{L@@N*CsDusKY#6>xy^6UqeiU<+lm<r-pj(RGIjK`kOBM{A?Krgy
z7h?pz6x=~EOHoYOc#fjy&tqlIM6R{(U%2?Jam<dE+Wcd75eUWnKOeGI_b%dVnpBbi
z`9n)}niJjb?m9r+uWkDM!ZjPhx({*HH0Rq<DGgFOb{m@UhlP76EvjFzg3CaV*nlQ>
z7NSnpExxN+3;k;#H|{M5OPip3Qz>jveId1i)y9S<FCLi9v}s9WinAw!5R2ZFGeQav
zSKjI}lXCPnmeh?A)uPT_)$}05t5lvNtI-(K^A~@0?NtCp6jU0TFPx(dq3iGP9YZR2
z!-F*&Jp_B0$=&FMa{GLS3+s`71vh`+Ll}A~ckDMW2n*wb!Q9}7SLY6JKJOee0iFBh
z-0O6rC<%P5J%mWwpiUxPDh=)o&ZTYQWgx`KLrJfEe!Yi77)8r!8|NI#dzEvG-2+v>
zfCJ0=%kQj5#EN@-5Vll9qq}^>a;oGQ;>6J=@$#aza)EYi+!|n4S~OxRIs#d0a`~R3
zd*#+5CCaelMvWp45xoy>ztbx&0!yZ|af)}nV#i5N-nCck>^k@5dNR%6#}AmPf^2a8
zpcz{kF+1tgoo}VVGkqc$i^S@Cu`g9j4>O&0DEFR{y0%nXkO!%!tREpu(LqL&ktD9#
zQX~zR5j3IaMA=kp5b|wA>$on#_c+&)F=kI{8k-Pw&R0ABTsuK}np%QOrzFn?ZOA&s
zjgzgs>uKI>D6c=I>5;j$c+{(7nq-TAUQWC+fTFNYgpf3-JgjD(4cf)T83Y8La=7)T
zJY0cRR}S7B?ZO3AEeECjQmZ&rf<%Ndi6<!2pwX*VG;FQDKneC`2fCI9jXY&GY{a^y
z6mf)%+@V{IFpJ{k8scCM&V8OkKa9sKzg-^~?Nn!CiIQ;gEg4GJaX9EhsAuC<rd=jD
zRv^|?a@)qcLV}7^KrZA-txInvvn=L_qAmgBhJ;c&A2T;`Eh)H-WtrTOcxz%jnuBeF
zub4RBl}mlqZB5Vxr}Y4rxT7~WID1>q(oNf3@d}ZK5}#u^QHNyA!+AQ?o^mb)r9KMP
z*$PM$4@qg^gruR-(ua_Y-h`X}C8u*z$BMJiLM;#ySsF0-FjBug%RSR-bJDjNR6&)j
z*2E<J%e-!Aa&^;+%4Y+W*m3#cyXKvTh6JnE)w<^q+npRB?bwIkFmYr?Bb@>vS&-Gc
zBdBmI9mD=z&9d*0!gQV9!FFZaxOP4kyiym9X?$TaRFgE3lGK_8-4_Zo-=Se16BA^F
zzGVD1FjZnY>ASELF$sn9d;Ig{U_H}r<{aKDINmPiVea-u@R7ewL4$65xSc?w(8H;1
z`bdayTys*~+q}=~QA<}9Qx=qPCh4m;WZM}h4f@0*LO0*lX(Rl*&0{Sh4`Z{kz)n;3
z^i$X}MA@y>oVXxKeg>|f6YZ^xdU8l*%NUm|wA<5D7Ze&{PwCBz_Xu&?MM_@XR*=v*
zpVJZoa)4C>+5&-v(p*?RvVOu|Eh0?04@RrVuS?%YB22u&@697SC(m^s%tGFbV5?l7
z^E_eV{jHrTj>zx5xrl~%1&-gLQmCP)(^(`{Ytp-uRm`VjQ^lOR{k+mjT--o&=S6~C
zf-5Iok|kOrCQokUB(digQ|0hdKVuHLu;AzBcZF%I!uevne`DG|!W>Y4h&a^sT3X;K
z^4mEYAGiS+W(l-|mH?SRMPW~#*Q9fyRtZI5Eh!Yfgw84&$}#)J%dR`|ShZzVc<t8v
z?gon4(=GqLsU+i|L)7=d=LN8iitjC?HOqYCGLFNV1jl9?;dpzfRG>2-`ZEy&>mvJu
zt|`!wuY$>szkp4;S4p}V<d3UAg;#1}4!KmhDfeO{Cl)4yBs`y4{)=iJa$8kP)Xm9(
z4@BXoz$m9we^pLYIUYUg$(PFrv;&vevV}VXMY(!=UclRf^9E;*^zJt-`AgWsAn=)$
zOS<xNmSw2U^(Xh9+!@@*A;3du6W4^e;_k#s73Vn-iLiZmakTe7crFhzo^;S;?|mXW
z`uXN?cF_)lUKE}CKq?WF>O%rO4@<$uaXlqZTa^RvC~49a@R}&4#-V%6WJz!G$`?(i
z$+4sBM$cu5W4bJgnw__t?1mN?wL9IpwBww_!^sZZ=t1`mL_)hEZ341(@#6Bsa&huv
zdW735z2_1gnU%}-Iyv^Z)|J|AZvS&xzjweP2R83T+(Ln1!wV)tib!uWfwzI(`hfa{
zbZZiDcc*&<^E~hZY1+q#3x&6bmU5yWxZ~UI0|9r;E#uA{nX5ga^<`tjIH=<ULgbj;
z%@DscNM5vSRzb?^Jw>2-X>1F%qVAvU(>~+1gI+d)fi1m*_p3104kiyRplyL>+Lcm!
z%$L-`iFY^?&*hcW!eO4KBIh?<WS<r99a4Qx^;%PK(kF8e(yrv~6*ILA%+IiF>SeWW
zfjQn_GCSYVm2qpfm|ea1mbAIS_9R?4v^Ah}bMScRX$QU(ZGYt~rC(VGM7`f@I_m|r
zmg%s{T!dG{S`Bc*k}wTGoo$kW@*x^05fxz6rV49s-$QIOpE))ioZdkMw!<tc6)x`l
z(iP~XJ(@RwYqxaRwPLKcW2tT;Z~?2vNjXQMHRe5FE^r$fDo~%=LKzHyZ)SVokQq}!
zf~|Mq4d<y+Kx`n-WkdV4v7438b0qC3s+2I;@oF3s|Jfm^C->$4<&NJ=Ba4Cc;dyX&
zc{F*SNk(hdndc5y0AA*Nwhe&c{G*-N)b(QfLzhyfixs&1kVjz|^pzg3&0xjtRK6~l
zTfD1Ba7B5qp+j4}>#7z^)ur#+aJrymeb=V87isCc-jcPxWBNc)u-!GhOfakt4xi$D
z85aa!JEJ;^VUf1$gj^#H9)cOg&6uJOrblnyB7xwnu@FQ+FsNn}6Z`jq%rMh~!?mq;
zkNMt5n>BiK^W((fVgvOnn&NcRXNYj$U)kYpbmO0a2S}@9;8>8SxC33tb{6~0avQb>
z(V}v2@%%1aoU1;1XE~s-2c89H*$STCE(&-GqV_A27G^8XG-NFdTrX62`Yl!goaoux
z!ZNNWLnbd~z62v=Sv+@G=<&3XcH(9Nx#!F_+UzlTOYeJLaW7^iSr@&K{Z1&F?j?6=
zjhZy?h@ZQUsJC@x@O3ZPqD$H7VhD6;Jnl$xA3*N?KB+MG>Nc2yefCk!pS>+C!k-t@
z>Nqj#r?nSBmO-UYYt15%e<#qK4ZO9W7bK+@(OITVQhEpTI}xj7+CqsGL~4r6Fg8Un
zSA^}@&7sGPpd~bA|3TEc_c@Wbzds1h2{i<K`G*cXSf=jQ-X7a=*2XY%k8z~AhD?TW
zJM_pw0K2w!4bxO*>na#Udz;86(q`*)Jf{IrF_hT7?8<Z4Jf4X4Q^Pak@H?#30mgO)
zSezW34_KUR>?oDyk>mU2GQ(H+%*#6mCriu-G6%HRrTG!tzqZJ1uR&lkKj$^84r#3N
zI&WV<6sVEe(N#zsHzQlST`JZJPfH<b)gG83+)|2kTohCgy#KZyM;{w;bG6=4U|up^
zx|{gVVtF*1R|(lxc4+y(Ps&O=3w8lEJ=*$N2J}=5^IoO9yfuYyRV%r2JjQXPKW6l-
z6^T+uG{40Bq*7Rl{3<7=0d@{~{eIb=;#^EoUn!7m9C<4`%}kPYwnZy~t;rW3Xd_5I
z-{kaCt9v|G%b;y!TUBv&;WzSb&t^xSbzK8Ooc})4X?aNxl4dSK9um+hCdwJzW`juZ
ziXu#+&f@{|x>2}u+R}J#$E5~8Vn5<Xiw)-v2m3&o7gMCK_HbCF1;FuO>y!(^bO_Ts
zvjd+<Aiz|=NId0DoN&{*xjzzuxG105UGO=V=?7seR76rNg89#Jb2g54?TvSikk9`7
zxjh}gL{=|k!Tt5z=S6A>ufq{8Qqwv%{tF`n`uM?UhLj@r(KyzwcLw?AtJkrzWT2dc
z>oXi!Eh`iP=tBF7F8TGU)cMa%lO<Nn3X+At#U-|*+$;Psl8Aegt<lj=(OEQ8fd1|1
z{p8?EuB!nwU*=(yAkrs=7=qnq>FEB&n0aj4Un`}2?A@VG>`EULSAjq}Vv7bx>kugE
zer;D5bkmlaAiER4qF_zZNtv(8%6J<YqQketjItYW7r?VtD3(rLFGppe)mR9D$h<5%
zrh)z}t3F)bALj;4(UOHa0|cA`Krl$_%jX~z@?{ah#;M{sYiCZ%E?ggj6plT2wCurU
zkIzZUTGzDj@K1q~f;QQPz(ry8=_=u*tH)OYCXZnLe(c_*pvy($OdEE^EZ$WVY?AMD
zCfO?BXYqu;RzoSB2L0R&*xK3tSLwnw3Khs|w4Cav>8wN&PFyHc#JUHEH(^b+%SwH0
zQpSLo=Fv>Ew$);r?=9$|*<0BO)mI^1ez5xpN2-#1wr~X$8Ei#|E}aE}TGbL}I3ZI;
zNuV;KGz25OCoD%;`Tt@rm#ebMf#$pgxEfUP%7y>dY_LW#R^&DsG=4FpG?t=t5(4FF
zE(%xNMWpsoFH&awX>hr~vC**#F*A+}5(XCLVYRQzg!n+FPZMdbDF*1{Nb}KW$MF`X
zsRkNaHgX!LA)ohH!2_SIKp-_8n?NqN$*(qar8{UhpJdot3(LmqbW^hG?DL$tC$*(;
z_eN7VDTOWJe;(n=jQWcvVe79nkYfsM&FBW`z7ns3)t+qdFvc=e{ftKwydm1$bJTx=
z)EaYAKh0+ezh*|u(QZ4LkX~!*N}avZyVnx-dT9Q|IVLL##vTO=RwApGCO9GB8AFtI
z#G%V_T;V^lV`~uUOAS<dod(c?&vD;sQ3@ceqGQFY0F!diVr1_&dJ(?oPTH!F*q=-m
zNId`Q+~HJ*{6;%R6F$&XEf4(Rf|}jQ`SXc<Q8VJ~HlG^3lQnE56S6+H3aR(<PERfg
zX4}|*(X~p*jRr$z6Q`T8YAJAF97W=~W-eA%SZ|zgvCtEt3WY}1>*nH%1k^pi)HQLX
zslcgfi~fbGx9FL0Ge<Fn_ateko-8bcE1F>n7pS!9k{z{NG6dTdKSs4A&NQDgB{=9i
zgBl6Y7$1W6TGdoLr{n1+(k<s2t6Y5!@p3tGFC~T;3@n}!<<I2`gH6xTl%+LHV~~dT
zP<aF;_JsG4Q}PbXP;c_LGzxOIk#T#LoA%9bT$PzeP!fB+m;w+ceSjG0Bp(RRELo9L
zL}8|I`T)CTKw-T4Jr<4Q+ZclqBQ4J=&H_@KXQ#wi30Yb7VfE3hYLU0F7V=odu8B@*
zH$AmC(9M!aj1AVHsz;n-@$GPm5l!3gbyD|^AJ}cxqS)Rs-fDdFAi6Y*2W#qDp91aF
zay`aRp$FEAgNT|ayP7FzTuv4^#f4i$>FO}8Ss*h(UUVg=h;BN_>{yvR$p9m{YQiLZ
zmb9~p0gNj0R?DYjSEyBpZ~<fm0}WXSRDslCO7z;PmGXJD48Bm2N1XY(hpYQ|I=4uE
z^ihKg95op+iY5NumInnI9gdddRRX|P5@&rj-7_BpLl3GWH`aQ@m~^4<jl3(XGk6=A
z?aP5|y#01M%6YJN3a5sO=V+~}gK*+H1{zJm3t%v(uDi=w*V$*_rAi?1F-I(imRnTE
zok+v=a02DAF}y+&$@I=EjY5$6#v319B`5sR(SspI=3~;L3-#(1TYcO6c@UIH@9wHB
zfzg#e>xMa~S|&0#a}UOn|Hriw!NBfVjn{YJr9`CXtXbTdIIIRqN}8}6ZGd?iojIUh
zyOX)h#;7i^2o3&kxrw8D*ab=46z?wQ15680O(#BFrlyET`ktyWwmY!T-3UzWJ1~;S
z=4q1ZE~$>YJa~;!qxrk<hZaSc&yhI9g@&!T$wK!U&E&YG628oPFBl|!{&O5&wOH#$
zbs;epHK=8MIAn{q9pR*yt+uw`L>hytX<SyL3l_Zl1@4Rq4OlX11Nb(xHVXW)H@}Dz
z+L&%&gS#q9e&n#N^Hkcw{<z7$PQGNd9?xfkK?kR0cuc+2x5l(ir#Y{|IcDc5-uO8}
zJ5Wc_sZc85jgn>tr3oB7boTYqStKlE7J}K?J7>T8Bmb@7-_nbfl^09judIB(G+tSG
zGyH00Wp(eKy}f*QW##f+yczBd?aeOU?DEaa8+Yx^3~y#CbBTY^;Ofe7H9f5?^7Le7
z_z2~OPnVvotUMtcWBi;Pco*-{#d~$J<6unjX395@Zh4s>R#tvkdI`9e5<shmK8(@I
z%81P$dfDdhRAYF_OQiOP(Y~72AA$I6W#!qD{!9QU8$Vbzd^}!Rc^o6Su!`zye8HM1
zW!Tw@@A$d4GW;)9w6FNNUKid-)mD}`$W-pH3s+0{v;KauL8gW}Ivn1|*VQK(_UP;V
z>J=Z66Y0^u|9%6Kydg=Z4`a~Vc(u(}@4tJiQjeBc>f5EC@%Pcn5}D~+d>(!ao*{04
z%N62=s2cvQe95NB6T{8w?Qmt~HamC-D8R=n&TS9u>7`+I=?KMk$&$k>BGMB)8Y;dO
zN|*4Rd~feIM4kHG){^0{cndDS!LEg>8$aD;*V{keb)5YQc)w#q(;-H+_AhH*ef;<Q
z1GK&eNoo!gsAN&c>%aeL=?I8Cx?A8KFuc2)h1_U%NJ`jaC#YV&ZswO`Ds?rvlvJYi
zcE#HOH{4$W+ijE3R3lKRkF9~nE5pAmQ7fdM-=!x97DZO1`s~9qN(35vu=G!G=0BY^
z@%G(NuTymjkHK+2hPM6F{fBr9Fw@`bBHxHFUhq$T0+-_V^dA2{<Da$s+gg~chysLt
zc8_r1R28eJ()#n$!Go2hUjgjTlJm8tk*VBgHg9a-72b}9OH{0DR4Z#}>+xHOBfd(L
z@@*jM=3Uez?O!aR$CY)KHc(zHUH2Djn!8Z@pLlV*(e~;u6!=w+M}Kzp_x<60s2wPq
zo5Sd7^{0DOxR0E&OIOj@RSEW$dy@J`dUY8?!1yj_J#md4+?w9k7#>Nd{j7SXU%TEA
z^6Q2Rn^v!BhI%BlOz#$LT+>7sZAfiOxek9Zv^)|=Loldle!ZIp1DK%)AK6SOgmQkO
z&h+UCV=xx2JFp2)Ocb;m{>$3}U55{S^y<jSm1qVu3=bU(D$5u54Gxe7bzO)xHRhR<
zps+_9nDN3RFUuy(!gwU|{?jNTE&pg~TM+G{?yk`>xPN%Vhn2*XvdHcqiH|f{(3r7T
zq{mIQ48y`+v7(XxtvAK_p5XkKm*C{Jd)G;Z53A9qOps*21W6J|W@VU#Q&VjiV}GM@
zd4~|}M=Pt}rFPa0qc+c4GXw<^=gMWc?*xOy0O^9{0!m!45(!6_d|=<FQi8le9kGnf
z;B4yqsJ{9yC$$)hgL<?C4TD)7QY0%4fJ32Ob4j6Y1D0G(5nn4(j!O=jxBvjiP#7NE
zBl|tU$kA*vDNq^OFLW&)y+yQ5L#1ll$Ve%Mq)7rw^9MC<+_NefFh1F&&u-J#y}MF1
z*U2C@CQbPExDo;=_$fZp(?du!5YsULU^@nYM;`!&;seM-X}|@oGh9_?kCuMDPYq<q
zaUE*VK<pPS=aQZY2fZU~R}I2+rjSL)GjPLpSI1DEi<Wc#7rsVrkwfh8SW_C<*>jZ7
zM-(i9H0=%Vxpb27(A92luU;7%vq4v278W}IUYn*3b*>DcN;!>4&)@^v{!+?`T)g_w
zM9<Z?p^hjK&(AWWA8<-={;(&)$QCqJK~Rh>KcR&&>|p1HDF!0*8H_5WUy=6BJ^Q-)
zFEd8SmJ`E(W8VPX&)~0+7$b2*8pqDvrP~1dwlPV14XmlGsHqhsIv--eMw>p(nAw^H
zqq_}ENiM`U)QSP~aLF~!W6bx)mV8Rxf?sR}S_27#P@@wxKDyzxy9Duf;H_2gI7T%R
z@)9Up>B&?9X5>yG0SEj<jbqkI4Gu&-SY0|u$g_4)?WxtG`ub;9@*pSayyk|AA&KlB
zm>j;HW6;RbArGZqKr^BZzcEg+k$(ngF-@X?o0_z9t?KH^!Lw&n(ZlbE9vQIs<07jk
zkkDjGGnBe9v(|`g?O@=Tw=`Kf?JFgG%T)mdDFB7A3s9d5Wl_jnCgc(hIV6mwb_$ua
zZYqx2aE?p(z^EM`-c16Nc6FC<W2^$lY>vW+gK{k3OtsNNf;PSUsTe0-qD`B~h!Yt|
z)^pVLp@ZY{@DA!GP@$w2R1gL}HbG(ao22>h-Kr@_$31alECtA47`}oZV5I=nYeq){
zfGq$d$eFLHA>7|K=WVS0UH21Q;{`PI(w=BrBrII>x!Kiba1l`f1+8gHa0$$S>yr5W
zi5a<$m{OMm3vaDm^^^ag#_khYBZOf1TuT7RG3ei9_gty#2@O3HdLM`W$_U<Z1QS{t
zv4)`$kaOAdt)Vc>$NOA@Ken+*sx@c1NYEtKXEi37QDgGnWnKUgFz;a$!&n}e(iG@`
z0aF{h(#X?NZMbEIi#lcdsq~JQR?qsJxn#mg#Y=O+ApIi1)I9-XS5Pu2WNt9Cv?^=k
zAWgN9xy(%9f^~8ySsc*P+Rg5-O@lA7xPJaS{(v^%M<eBgRz<c_0I-WAp0d^Z5l`fY
zXQ7B7$wY+>m@QX23mAY1uC0t+G9RoAiKXFBww_!I;d5qN#T*K%y^Q%Ico60e_-2(d
zfDS~xYAzQax*Vg6E0ib{6jNkkqKW4QC)mtq3P9{O5S=0<Bar6G(k!80!&U)*tBm)P
z_$)PfKwdO_c$<`T_yEXhZX2M)szw7{6{GvB0JXY+(Ht_SP>LxkeLr+tx0D-HgPlS3
zlZrV>dWTx*Evti)Z+!%K%zRPeM<bC~OV%i1s651~O{me!iZUR9iv`*gU2Lu>nh#FG
z6t6~%23eK5cT-)9^Eg4F*H!3NRd8|%Ec1{AY9C+*L6tSlS5VUAA9z62l#d?_@RN-?
zu&|nEEr&9rqkb}rl^P}L4*!;(I_nlnHuEJK-OAPS;@vO>@3C=QDuS&7GGF@bF1ui5
z3VlqJZgt!LP~ib~PlOQ3P+EMh8gH)|W`xM}jp|zZ(NWvrdnlMI&NW%rfE~#-5J5V~
zU?8GyX-)nGA8o1adZC~l>%oHeiqxy{A{eg+rx;>xQOet`B(b28eF4>t?p$~!G*|=f
zg;Q5YZl3`1FjesAH0*l9U{_;8CG>y=t>P`H<IrkQJ^(#ulA|0bA#ur-(any70hVyF
z)1*Zy%FwT3N&<=3{EZADq5@kRTn@pEr^;gMauzwZ?nXHnL1d`4rQ2YF+galG9iQqk
znNX+=xWcppBaCgNco}A)1B;Tuf-CGi3&ppRN7HC-1C=bzrtVP({$S-yGE+C<tU<9X
zQ_0@8(b+0UZW;q4mM&=u#>@y_ffEbch$7I;tq|8HG&Us}Zfs%zFT<e?4PnNEYZ{ln
zVMF1A-3fZEFl_)pPPt65mkp@MrEr9iZJJR1vN%-ENW)k(J25^QDlXxtWRD?cWvJui
zh0YyS<6Zh06@GSp;>7QIREU?>a1GKmPB`x7VP7-3WXMV2N*4}H!)P9?lpnij(P6JH
z3r0zFP$MV$gStPsp#_%4q&=a!dzp9?0JY35cE>qmcF$}Wm@2=x&}r}*U@?Ow{<~E}
z4n|ga@+g2_-7xbrj43w*;N_Hw4fUA~1ArxVL=)6ZYvJjXt?b2C;U^RpOWmacBX^C#
zm=*va_%Pdh!~J@Z7htNC#ukFJnN2gB5z}mA(kqe2u8p7=C!GUXg3HG>NFEbj|Etxr
zs=E19)G#H4k2L*P_tN?YK53|=VOo^<#3?QC2<?+h5AGX4ZaH|X-WDiXB2B!6v0*w$
zkFLEMtO^*xJ#OT1P!))rCNvb#q6bD%1~A^Z=PN3Lin&kKpjyy+1Jtl&O_maTUmgc4
zefJB1N-OIjr=p>=Ezr=isfY!P6l*He$$(-N)4qTnvm2j8*;uxYe1%>RG(m6sn%~D*
zEA~Lc6&G!`O{&z6ZFY7xgIyO+;ho<w`DQ~9gInihnCGjH2i*A!f&n!C)w~{E<3AB_
z#P)ZFY;Vhzx^)9Tp1n?3dD|^ul8=T(2ry$a0gsq-p=aJSbkH?62mK&&LzO(U>0j*6
z0f(i>wUWx{i%bM>j?Zi(#4Z<rB8H7$^h(v7Mijb`){<$!md`y6I+IV3x+@5D{jUU{
zOQ-NqPC6P-Y6x2(ZdNqV3d2Hxm#@)2q?bw)^&uY`zuXpWM7OmIQEvUB9k(IXf^F+1
zkgDyX77S<w80&*MHBur-l95FKE&MG!tOYGnRk?YL+k6_;43SM_G?3-KiGMT$?g7}3
zjB!lS<Lv{ij`iC66mKPuW>%2a^M07{39PVbiM)aabDAutF2IaXD?{7dCc~Xw(jArC
zW;R}yAfeG@&#{|N_r40uMgPF)dFj*wvqMS$4>fvB<mqafWPOk)TCO<7jiu4Ex|q=e
zt0kL8r$$dh8G(7Fj82Un=y#82O}?{!qelv?tt)`aPqcTW=I|#g@>SdaIay}}#Pl87
z`Y$~F_c1Qqu&&G-Z5sI8lfdR&8SJ^RMN&+hNs+*pAs*K^{ehN*7tfas@dox<@rF3t
zAG$@d3+6!Z&???hnRqa-D!N&aRxbYo43E;)gXs)0y6$o@3KTn+W?eUIh-CEWtC0)M
z6t+Qnx3aLoG3JI>$>ZQ#IlsduH3ikP2C3mEwVnInqI%wzAH2oH&Mpm7{BA8k-WB$B
zbLH?+-DRMFEQ%zsO=-sygcH2vmXodV@%8~0NqTK)F~*bP5waTQ<6@RmZRRwa{C8VU
zz`&|uz+<t6mEJ!n{KAc$A86~0s2*T+Nm+)bI9C4Dyf9ywlhO|o?}8D<-?eAIG?H^e
zcmkWEXWv$ql~FWgB{5X5uHW<j6k~<wBL<6M|NbMEO;teKF>HDEyYzENr*s0HQIaaN
z<DB7F5eY!l7!ttyzFUr`dR??QHvl=<K{r8>asRUdJ1NbKj?Bc=5=cYyWz6cA7ElY<
zsk`K{X&|}_3wanKq4xl<ARKU7@TsU|u+&v>sQO0Tu|x&j2<t+pGSo5O1oLJa)g~d1
z1)5oY*1QIzK1+zC>c~nY1i*pT05m9)g{}3P%OBB6LsMYsUhBjrWYl8`?s9@j`YhFG
zZ4~Is0)Ifq?_;x@9Qa-?4n<k7V!bZ}`vQ6hbcA`pLp$KlM@C?Man4PF2tp&jq#<B$
z*MAS`h-_2AI}#PBl2C}z*ka9+LW$#2(;i7^TqzSne^`)>zzZ<uZle1`y`RGQf=A!O
zv&oW`um#3~IqZge(U9F}3HpV@As$`|FXjYhtM-)aFV=&T78rRF7%;u?SA5B6K--$S
zBs6Nez^QmzI2C%_AmoeG24*wXvfogg#xnXj{}0d>a|E|I|6=n4u?6{{%%OTHE%Q;>
z!qP222VxZw>f{#`ju;!CgcD95{A*}(Q;Gt_vl0dTc4o(uW(Ysm1?9KF#<ludBRV;D
zMqyk4ov=Y#suvViI3!lGVpQLd7@1r@Ks*p%qdxH8=&>PQXi4H_u%!K?WDu?)qFP-z
zi>42&-bn=)`fB?}@G|@(=&evu##e4j!rlV!Ju~LAqY|Qn4FYD-B^N8u-rCTY1^&1e
zP&l%5EZyD;x*S^2IB+agAl@@nqFHXKi7yw@wZTE9B#WV)CjG976Ln(P02(`;_4wL=
zqvFvJAZ|mL?t?@jEZYlFqB(BNY#R4*Y%B$W&>0D{*veIpo=qDictt&DGJClgUsehP
zjOdZ^C2COwJmC=zYWolQgHA9e?gIH-ZNmU(IxX;&&6hvuiOi3Qb(9#lHGPzr`8P71
z_$j$~K@#w&hw&tGyPX2UJ9g$jWo3aUuW{n1%nC4KA5d{XXHvD}2oBikrOolahztpU
z#YpByP>g0PlWA6stqy1^55{aUe=5BClO1%i;REmmj2uYsAHw6{UF?KoeRu-abyj=y
zZ)LS5Ml>M$!!=1#L8~}<D^^c$jKwgwx`M@Tu#?Ajbum_Ar%slj+Q%eI!X|=YwVf<)
zG!OaK9(K9uZPQhY3Gysy$GT5s=`O|uASnvEu?VZ?1?M!NZK!kYbY_W@$l0wZiwHl-
z(uA@3#7weh41LNIAe=aa=BlZ>`)H-<e5v!M7;?7)^f{Yn8Kjv+A!8~GiP$;O)LwIC
zrY=H%)PHK(xDw&YcwIQ0jHSA`a{jx-vt&M!1tcd$C(>QkD$4lz75j~nGPh7vu(?eu
zPH8c!^ZO9iwF*lmmOMi|mC>PQvo&qe&V5J#0tsT504z31)d8tv4TZ+VmZ17y#SqQ>
zRvBO7B&?dAPUDV+p(6*};F{fSN+ugnvvve2)$2V5luE>^(Oz&QX?f=kvsAQH>(-Cl
zC8?%_%`BhNc*#~J7`hB^RmJ&#AX!+~ilRI{rzOqG)f}+|`%Z||G7%l&B%@PaZpI;k
zOE^ufRY#J+M>vV<3}NaHCoi0Q7_{U_)`e(DBM(sWd@MAuuOopdUq=e<<Q=VKq8ZxM
z`Xb0=Z~HO}Z@<@Ui#DIQeahzlqJH^wKO&`6t>i$+P=xtWoY;fQ9>!GoRgL9Xo$dXX
z7R-pQ!VoW%2jek_cOLR3SdHl-*hPcqAGBe7`8KPvaz9#iePJd<_?)JZ23jMgPGj;@
zz2ba-4lIA!JlDVx_=>t+4Ih)~msAsd7o;IS`Y90-JFqo`A51#YR|7t+GT?{2@&i{1
z@SKb31T71Y^dqA%ux8Pzf3apL*?2-YjH+nV`XkbdJ&6P=HWPl5Y;}|1tc7+PZg?21
zg)N#jrba5Qq+^p%cSHoXh1H)c7ElN*fuV_Ug<19Lqa*i{yf26uEq<^TB*t7)9kl{k
zf2w9-CORFB5nK~sL^{20QDP)iuo^NYAX`E>#vb@W3nfh4o^$YICQz0@ybR?_OByVP
z1H5?qt6Qb^oGO1wmUT5_FQHfLfPsE4`Ujc=@dM!7k1!Q!q?`Qdn8peB=#6i(UIgL#
zJewdkC{Z0HOFR>NEMkinZh}fWt!8M}QdBKqhzy9&RBRv#%(+&oQnd!(ujW_Olf2Xb
zFFB1_RIPy>(~)s<242R@+_q&ac5;6Q>U+GKghntVCz^GEc4e6cT3n|xp~kP8e6bW^
zus#f2@)aVzxH@06i54oxwlGs$I^o`EixOxj)S-&JEeeAggcBfRTe>a}gs_pP(H<n|
zq=qnfV0CF1Vly*37>q#4p<_qF29h}INlF@X!y+CjpqSJ^Y6#)Sx<Thr*D*>8q;Exd
zmfOxwU$9x96^#$bl9K?0(+eX1n18-EYWU28olg7W+E^M_q<76_8V3_LF)iIJZ`BXX
zr2u^+BIpmoo!vDZ+Qg(FY(yx=m)1X3BnHPhx<F%SM$`g65cSru!TkKM861L85OG9m
zOtZ?GscxxIj?iY}<Su~ADPfhU1T{ErcLw?d?en$`yz&ME?XG(J(5}|!|G@yTL{5}3
zBy9$JSNt3&K+vzTO{A^Bi->Y2BoK-x=}_H@B{_q$zMJAtg5qv&h$Wo*!sytRrrgc~
z4?Ho9@+E$P#EsE`SXig3B8XyVWpfeEx_QF_#+_htCMO>lGm@OBv=#xJRzS^At$`V&
zh-^KSIME{BXiS0uVPk@lIM|apl3ai`hPN!@vfhFK&_sZpMmH$LH4*^zCavR$ar5Xg
zj+p@y&SmP!`R@THc$U?%DVtBpdr(-cn(*^j10hhDlgXA26zms2qxU^S%f-5ASq)8l
z+rYLO$KY*XhVeEaKd%0PV*d&>t_zHW)k3imAfM^P4j4Mk&POl@Fv!OyMW)Jq7NVt~
zPb6Km`*?%q&kNJhz8n-%g#&4B{c#E7wji+S&3k!r62ZZ_CVgAwtf5X+)fZgci$eF#
z^deVkIm{kzJ!N94Ow<POLYzUG1s*8Gp@JyoyTy3vYS-}!)=}SL5NBQ27L*QPl5&G5
zlWh_O??6+3m+U2|0?bw#9AzQZD3+V<j+6%Alo7|8(1xarH3g2*@RVekQ&7ficeWdx
z&Mcb&SHzYHx^Si`S~8G04XT5@+VMR%e8~{9dibn>fl;a)U9hx7Esd0^BY*<+D5fV_
z!i_{Mmo9<SUeRT+UPHAArxIm0s6>!PAsyZ@x}-G}>XJAnb%Y{yq|kJ$=zZ1$j^0rO
z1hKh6l^6Jf8nL!+Oa{f#nLJW|lDdDevS!(!;$+9CqE5pX&eE=wjT$Q^LtsHRpdccY
zM9`9-AR$|%rZWnDW=3%#BA<2PEeXR|{$r*@1h=5~#^xCnL^W%`wvi^10?;5zdl%j5
z1W|Aq_vHQ(XUY@kOrj$ul$vl=lyLC?Gl;&XH-;VPe4iNXcj=)a5}Ik54yoBtv>|Fz
zabi{u0YxB_)?c2He98>fwBrEzjM!lEI3gzUsCBPrebaXh)M`YwduBRFAn1=Hz`;oY
zhK4SQWrV<Jn4z;_F_4pNkV(twXZ`~^!!k{dGWv)F2{mA*>r$maaC%K-Ph%0l)(?;=
zI|(BKx_V+M#2~o`V~|3>pb;!xd>p{i@zRVUNXg;rWVEb9!%UE&!MGk4GS#gQCwWUW
zoXmcupV)|Tgtf>~o}y!Eqt@LhQR^<AV*cm^Rtn}OpB&jeFvW>2iHTtj(m7|{%OQ+W
z5Uvv8)jN`aWa0o(5txR_%#ZGHTsr)jGQFvm#!QAGI56isiIPA==&Z~JN_2YZ1`Zgz
z)FGhW!!F_#D#iIcLl)^yAVH`swIO^uMIFV?GC05L7Q0L#VkK1XD(w>&3>gF=G<GmM
z`6no;p0b5PA|pMWX!=zBEw1=o8gcSK1c2jB!#mYT*Hf`#0|ovX6o{#KZ2V(Qf%~Y;
zQZt#5J;}VBV5CW^l#d~aRHYa=)~z!bIV6SE>jEul9|!LESuV9z@?FvrWHjZN@+AqZ
zCCN-VU!btZnyan+2bCW^ldHofbvQyrPgnUGs`xWY9Vmjcppqv?0%XZeC5%@It})?(
zdtb)<Z8HUW9opRCP8mnD_}u3*Dlv5RC~A5SVs!lxFr_f_kTBJSucMiA;LW|lVt}H-
z_9SZ<8UcRc!nAilj~fVK6e}njE(Qo!@E^veMd`@u;3q?wKtw#PcwAa~5oQ!yhAMen
z?=SnP?0=|3=P;EfA3bYE9xSn&*9sA<@AMeP=A0{ioLGfAmo7*OfdJyAXlYDA6mu9%
z>&kwug0MQ~T3b)42eCws32UZ%VCWY|^4Q$ZB2XzJrk@NmSZYRu6IV7t7VMib=^xzM
z0hq67ABX1i_m9D!)|Xoe<Q)#ga)ShD#3RIji*lrZ!)UHL@qr#=u#q#EfrZy_ObB76
zH3MidHX?&v*h1bF0%|xH;mH*giaQszR&9_6Al5ThaV-2fCSh>!Qpj?Fi}Azg0NvZO
zs14p#enz#=k6wF-`2}FXrw9Zf1mp-@hy`2lGPsr4hJ%zNHVgn_ot4Em>%y%R!e%8f
zx;U=l!$Vo1zfRVNQsGVH2vgNqg$b;ZBk&@=&A}g}>@j^4RO4JCQ{Awm6Css(2s)99
zR*v`GX`W5FhRJt<KF*{RKNA2OGKLik>3Udsf$t3x-5`Z%DNCgyN~D#57IWT${wfwT
z=q(l((i3ck@8I{s?`O8G%q^m_e0Sgt5*QvL^~;GjR3>$i(5jb0xSkS#Ho(U#t2?w1
zb4%U}y(7TR6V4-P$-Zjgmt;$z$%mW^fT7?-FhLDCKyqLXsCA~sZxq`Kal}vHgffWn
zmtzSTz#%4fX3#>=d@Yz%y*@1P2Q#ECmB%4Y7@Zm1$p4BlxZaZy3?x~4Yp@!*-13AP
zk|pNCA~6-?U}9waUW+x2O8LqvlmRv)SOmaAWuiw{3#mbV*d(4@RDmZ~PI%({gc|DD
zgj$0p_OzdDQd~OfWXlcFW)RAaCk8sOlX&e~C^z5mq9K@=j9}e?^JsP%v-<q+=B^sx
zSYts;`+_J~Q_ke;i3R9PZM6va0dU$iOpOsK;2x?#pRs|%N5I1n8~#F_ci&i4puip(
z8<0YR%)Ka~<xii8iA)<7uozkqkM4^G-&)7vOtP{dMr7a-T}%veJLcUcgiK2XXBKe)
z)gaUeVnTpVR5%14^CgQEhdLrV0$^E94V#zGexh+63=2pT2oNlZ<|<m3<dWl_iFMSW
zZKg@>+CHz{BVvtWG+0q(Zv=i9{FlmD%tB#`qnu3^YjIvqopPvF35bj+E|hh(hq2YF
z(0tY@sv8_4lK@B(0oA71KR1jv;$j1lE#U!b1t`**K3G+fAoK%6o*Fc)RopdTjB49A
zfSSBp2uT`zdsf7VV&?N9wL}rMD=5gS?BlO(F$i{@w-7@&-3cJ@p(_CdFoBgO$4@|{
z?A$~ZVqr_dT1}{1#WG9E$@W4BC)_KBo^(aSDvl4()R~w<5?MG8ko(+PAYPD+#dzOU
zk7@f1jFHK;KbH|{2gd7>=mgqS^cs|SUMY)~S!-2X(Vc&pEs1+`Ko|YAv@xlVY%FTl
zEiMfyHw;8-D;JFzu*AyD_LJE*Ccocbp4rn6$=m?{=>@?K38n(?-zH}=MbJ4g%Zg4<
z3wPoRP=tW5E$xC!a8lS6l#%PeJxCZm1vbRAppbNiNUte8b{N5qMUwEeN-$S>Oh0JR
zx@k)m**Pmy_6^D6+!s6FrvK&Pk#g0a&>NVxG@<yGp1*cW#Ah=^S?i{O${1BGADz#Q
z&H}VN(MPIWWo*?9W$KoqW;U*v$t4fNg#Gdhg%FR)fWZ^^2@)j31Vn}4$a>E{Ye3}8
znFY;RPhE{!IroC59q;OD{vUMz;#pWNKoY_(!1dbg;Q9m4$^E3k2m&J7h5@F4f)*63
zluZ#sWn9VGsFec|!-71!)nk}NBUsZ~Q$UW>7~0}kA8Z2-@Cppx`EUT%fJ2IpEMY8U
z235iKT+t<OLxh8tW*6GRnljIo`0aCLV;IIr30Z9}N6p~!T$Q>txV%-@d6W1~-y+Fm
zZbC@x7E-gAQr*SQUIPni(&fqc&)NXPDev4u$DmbZ{vYt<o4d~_>d3c_C75v|P*-xJ
zX<+JqG=>AL_K}*)*g%}9p8yYjh$M=MNBy|73`a4qo}wHN*5crr*^FYWn6`bdNL4to
znb4=XB3WBl65ypJK?RHu?J=cEoGa+mpIV4cEg_h&gStssfV)k7+9E)co~r0cfKVhu
z2Qck1MxGLjsg!zjhUE-E0d!4<=6Np~)_~400*nexH_5QH5TGvAk&nSwp(}FHU<yhd
zak$tZZ}ef~0>e|zq4dyHsY}@hKRhI!z86;64(t&sK&uRznA=xBd;frTNZ2n>p>izi
zBmzS;Mqb+ki1|0#T&1Oc9QRtA?x0JpBK$W&*VPDc^5`k5LN|)i#9VZnd<%IB00F=!
zAP8p&)bZ{jXbk>8$$%)KKR}h8?m?rlvhA~~iio5Lzl8AUCGo<S5pk|IR7Z4G8RwK$
zXjP2Qy|U`jc*Mp)<>eC^9vz>6zFf7?h9g*cKR05MI819t1D=@0j~S!TiMd%<ZOys!
z8EiMG3H&)CB<Yy4#v=|8R}yr7hK;7_R9`e6vYjDYB9c+yXtE9?>PudFC_n2mWeB0J
zB3)@pi9%VdIV`avKUZfwh#9{88>RJe=neD-ba>tmr@zM(XNZ87Lq~E}`H2xRoQUHQ
zydp4qlVwKNsZby~>kn}SKy0KrDh&G(?$4a8JkXjKY^l+yL1C{P-73!Cq8Fdx9ayf@
z@#xA{*hQI_!iaRCb&OG5lJvKFa1=<DvpUMJ!h@h8h{$S_y%iHU5D;mkg#na)DRpEq
zridESI9%UxGK1>@oWOV;4^(*^JG1^3I}-d#D?bm?7Ydw=5MyQ7ViT|)IA}ZqsTi9(
zO$2n86qOkcQ>FXHmPEF_!>B@bG%9#%z=sNQz-(bID_57{<<h{j^nq_ce!%YzWBh)u
zpEf@_xycj>3X}(8T*?7~**W@rqCXhS4~d~59u{L5`ACVu%ialqf>9|6%6~GCatt=N
zL?jasEYBq76k#}Xb}}=Kx8J2<B;L;B%ywv+7_{s2KxaqX{87`yN2s*43oTwGt$Y(H
z<e6iUe3vE@Bplk;l`LSx?}uiXI4enMsh?!6ao3Fun{JxPWQ2zWD}NOi7-BKWg%D_M
z+DO4DitPZdG(Br+FIpHFFqPPj6$Yw(b*>RinijLMe?lR0Ugx@rRX})PyG)A-dc`^j
zk2SU*Er#vnodDEm0~U|>9Cm7Bnp(v0MpFQq#)+N)G&9sPuc?+ULyJd1S6TikS>!oW
zF19@gqj6LUP<EL5&XFpO$tlJX;*?;QRk?{_i=mAXyWS9;;N!<Lf_i+df*<hElLN>*
zjKKhmz1>o-aSf!SXcd<bX$a~9Px69*AGxjgPfd^>zh;<~*<_Mb1A(4xA3}#PSd|<?
zSYU~GV@W3(p%m!>-c$b$zV#2^qgNs0CZ3A)(iH5V%n58j*Jy;^$QQRfNKOPm*hpbq
z>5EX)v>Y^Nh;RuT7KsuUR(K*vRyJ56K#*GEouUhWvZk@D)h4n?^pbzls1>gtv#rGL
z0!DBlyF-dr>HMiGYwtcPYaorvutEZ)?#jAA6a)kKZW!Rn<upHmJ18s>uL)*`67wll
zGNDdnRq1CoxAX+9MC23>8cMQUcac)8U)u^NYNlM4gCRdM=EuBJAH!i}+N<Jx+fI7t
zwuRd*f>F>qSM+BxO4N5hh}cam>PV&HKq20Zt8YS2<6ETZ5f_*Iy&C*&6N*jv6g6oY
z>l?I%ZV288c2zgvc&;KE{0oG`9?CBXAq^7DB6_JmcC3SsX@uJ02o~*dDb#@UF{x=0
zSE6DupHblqN?rM46EfH1RH7`ul;*Ov`Pl5ObSS{_C85=Lgxcr{_#yy52#c<&Nh5?Z
z*n835^o7AhoaOn|ryI&r($Cr-bCAS8B2&Nx4u|$%4fC`C7jmGR$M*+bpkQZcH8Z3e
z8Hp%^1XvD8T$Um8X$n-Cu0JU9<e3MiYQ!F>=kCH%Ako7~{A48PGqZy@+H6ppE<y-h
ziAcZ<jwH7NN}u=Bz}y`N09<eR2*Gq>g$|~}$QSZsVf^qexZH!|%|8W30A~F#W?Qa2
z1SRximX17G074z+Es21>Fk7OzF*}5B05isAP6M<b)t@FQ;f<JxnSf$RLWCF5#9g{r
zGlKr8g0lmcEL0`7)K6&4$EpDp0PGBsROto&U@+f@Uyu5PYrX8|mP$+J4fF^l2d%C`
zqvFxip9p3Nh5l$n_@g~d$Q<zc*tke?;Zo{{>-|C^bVSPvJ&;W3A>G#rZgF+t#|G8B
zFf5Adj~bQ^aMm--#5rsdMYzCdi&eN2(Ul3=cvoy2kzYvLfNeN+pn>sbzL~Bs6Ar=`
z-(8GY!b(bpTH2%&8)2s|fC)YVmBB{|{}wR__T+?>uC^jWsa2n9e3l_-)*es=1Jqup
zH?eW;vW6ZdYd&b<(HkQE)V|M_<U$*L@bhK&Ittyvq*!6#(LsPBbt%V_x+<<KGc6)i
z<{6r(1X=()q*WwT0d?WLu!`M4cHs+Xs{m|-H???yX0W!??3h`^891{BN<}a|(GvO!
z28VFt9)xl#58OmppIDy!ioUTN;A(DdX&e5CZH4amJ<<jkx+vEhuI0q+6SvK)Oo|%6
zK0Dw^1G6*iyY`{my2IdHU<@kbT6|+DA9PH1Ba~2CSE&V`AxuR%7zH$`TwHHjb65J@
zr}2Xen;M_)DvaFKg%q+FLD+EmrSNL!A<3ucA<bZnogny$EN$ALN#|5%4wOK3m*#jD
zCNh<VuR;A@au=pVGuwov?vhj+t1Irm0Tq5iJ2@;`pEIxLchH;?Bx&Y!Bpz__?kWqB
z!KVx-$luC`ig(3IA)A>AH5>MX{@wOb|6L0;(@0EcGfh!UAsh&Sko-7d8fpdW3Vm(p
zr$xK~4R&#<Su>AR6*-v3QMi>{&AaiRDTZ?`R3fMX6#xzkbs{rL>pHtS*+}LxrO8a#
zx6K%i6>5>JYJG!TA0G+=i%A_2qhU-YO-<1kvl}y2b{Be8&>&zHzc}utN{B9_IaOkU
z5>7-{bShP@jdD3~4n#5}@1d#Tl7i^1O+mbj4OE%M#CbRd@glyVn6sPfEI==PESabJ
z1+X}%QfgNX#KwT4N;QC5CF34_TN!8QkNFSqhtq3{7SEIy!lmnlTp_~|Bela9=#W&c
zwI|tGVG6pUgPUt&B5MFBL(~SI$C~xn0K)0V)NLwYn$HFT5aZ%9M+u-+(L9HhvDUzr
z@+YGdflt`*V?PNQ`mpF9;PB<Mh&BN_bQS#&o-bK2!jHzQKh9EI^=8b~pA9PL5%J~q
zC#3YHg9lW{SBEqT9#bVfwmAq-@^9?w?}feluCB=Y2(w1Z$z&?r?V;2#V3wC>c+Duh
z#X3*qz$4X0_*`x#;==>KSVv#*JNzr)s&oL1t3|BQAdT9u1fv1<5oV7^htelM<6hf&
zg-Q^a84i9uyNLXpYU(p-+iZlmch`#0a6~%0YW#8~8P9wF)%b5~C4&87aQNd`5sHsW
zmIKJj_!2M|njnDV34a6Mw2sC@5lIE0L8$k#-EL1RC>5!vtW3};Tz!S|q#_IK;3IbD
zDeBm@G2Pnu3`JC0DX0Kz*VUFPB)}kwy$u0b*mee9$x*QQ$YPj6?)!b3*Yz5Zkbh9Z
zO*d=$lgXj6ix_A=XAQ!RuBb&$T@0I^Pxu%D2Noow#FQ;lu`H3&6M3BSNl2)H3*$Jm
zc=05W5?3UYV-hee-^VQQ(R)`$T(VYNUWzUOlavaiYQxFzQ)}Z?7qqBwM^vWXu|RN&
z8bd#fk(Wbkb0av4sIg|y^S4Zv3^$HSTEF(3c^IW&cH}7)YI@u(Q(%y~I6ylIvq?E(
zEDZdHFByZ?9t<`c0B{P(C7b}Bu6<+UU!9G84EVPC^rST&JXNm|VV&2LW(|d&<khn8
zDJI<B2dPX2+W{D8KQXxzoH!zw5PnkKzZ%woD>>Fpp-~_D>cu{D+QX6?z1a3eM=z~*
z(4^%fh^_Jl;i&;A<tQ}|oZO6WA+($MNsB!K{SjD6yD+?$wg4o=#A5ylC*meMzMF>Q
zcbvlO_@3*()3V;>_m9LV?DPT<fM(Jd1kM;`sp~#PX4wK^bSh`zW=bo!Y9=mvSqz$P
z(-+X_07Au&3`l@o2YysoH&_Ud#4Mhq!V9gT@dpxCyLVUd8Kdp2Nk!aSNgcz$0XUX>
z&`+A0i^UdTgi55xv}ItBWt98Vj3oFYF`pyE7_ZH_V(|)?R-tgbaS5{Y9s9C&fEwK-
zYU{GHpi?CK=p46RH!>qyGc-tSZ_~DE;Gf{EYlBk1?sCY@`I0o6Q@~Bg9&|T#3kVX4
zEC8o3|MBEF@Fy9Iz#?pK%|eV45;BOpU$cRLuoh`tO`*az7X?HuHb?R3t_s>kniXwi
zm?eDE-dtK5fXd|g2IN(UsL_ATrpL%XC`-WAJJUu38;~Uu3MDxI*=a&s*KuU4*kQ0j
zoQ7@6$Xg2kLgsOMZ}6e-IEg_uflvOKtSBcVcFb)qG#hvZ8(8;^!<)q3VEChCS}}8I
zcukWLj|o!i3~QRVcOCn97Q5$Im-?CqQN&T1r`1e4u&mP_v#G?U5Z*MlNbmw$n{qbN
zIycFDAVml<CNHuftb7I&*<uIi$lRhpL}zqXNDCH>vaknba9D;r1n&wmplsFVL5YtR
zllnu}MpJYTs~{<ZU;@oADmtPa=n(Q0HgM_@Ts~S<i-YOnhA7O9%p|&o4&Z<&4lSd>
zi<#9OfATA4SApVYbH$~>$$0>(Ds~pQ&Zj^KI`iWg);ahr``?_3csJ)MlMJA>3~*i~
zjE!B0ICPZA1XE1SfpH*oWlAoMR6v3dX`2(2b}1(5$F$y5uo?rnEW$hE67AbykJ~!E
z2DiU)3=hOhCc=yb>=u$Irt@`@D>)#_4lbIv&{EWT@QGBNFey;<$9aT%=b4!_8kNoz
z3}%9TEjAG|xt<29ak4NIlP0ba22Z7T9tA!1IjIw8#$3{juF|RCB6VUj235niTuRt}
z1^C1e(|Hq;cv_4D)B-9|!HswvyTa!uzJf@sqX;}4ZZQ?bp5x#{8bnNx98Y>V=Ly40
z_PC9U4%ZM4pIro{=s}?Q9c~bfTR?Nz7AY5TndsfwybBKYsZI>Q%;9FUXKdMb6fa~(
zqfQme6NVXgl6X@hsbt`e6EaTf<F5roOvLjjX6yf$I}1&gn&@>j7~+U!&7u(=)*Oya
zeF=}I-#Up84#(~ZU^Ke~Ye}(#DLaD)SdmsYQpM3J$_8gS%Cf2uhF{&^f+~uHjw%#(
zmW}9FLY5jYOa>8);pc%IHrn<=Wq=JI@@fhp5uGT(b&JTR(K4P@UkzS`B_P_B3WfcK
zVU|V{JIe+xILNndGE<Tp%p2pw;z0>AMzadEi*JY<WcD4nig;H%x&S$+R@_Vb_I+NE
zV#mALpvaC^<F-ZXfaAv;2Z%K7TH=@rkjyTu?2*S-nF;_V4SF&iYTLBfP*?zm5?Nn}
z`s|ihUf5ul@JQmFQmY_<E%2p?>ESXcfR24iCin>xkb4OlNQ~43H4<%T<UgBi5@W+^
z`|9k{*}c*3WOnw>tFtTn`v=osMmsMKM~4%9I6N5b%|_$H?djg*$>Hei>)+1&eem6M
zus8X2XM1ll7#$8Kdz*vl)?jOUXL4q9duwZO@#359!@=m%=JxFH()jJs-p?1GJ-v0~
z#mlv4%RkKq8$BP+Y)*D2hm%dUG}xVPP6k&lU%q+$`kC#$&B?pLt;yBN#@5Y^TU(o(
zH#W!Duid;lzH<4?&B=Icw6S&h=El{@WaILU+sn(B7yNhT;>C--aGtqv;lkk3=H!=4
zdq+DvXTJGnaPi90jcbDomzORNzWL_N#j{7V$zXPPusuFJ`_+?;pC;qO<;}?!u=4a^
zx<5HMe1CrOZhv}kI9nQ={l`Bhv&YlTqa7f1@Bs)un%o&29vn@6`~0iH*3q6YJov}<
z-r)q5pHKdIw0$tSH`y8;?Hrz;Zv6E5;KSfxa(HyGH^8sK|NX!G-*Rqs@MpchgJOVz
zweIM}Z(j|5yL4$VI~ZR&I^5owU3v?mOb^~KAI{EP{AF}7_{Y|0cKFk5y0<?%9KRiW
zjb7CE`E&emkzX$A(>Vazu5cAKdZ4ab{`@QNZ)dtWnpGXy8?=AsV#35|b8~HP`*3@-
z^Uwf(u{YYEy`3JOZ*U|KbLQe;FrMzs4hJ(Y1fb&a{=sy2y=LN86X<vl*!_n=v%EVw
zcr#fZk9Ky>|1#a)99#z3ep>>`DtW-mfn)T};8pbbdH|}Px%gW#o}>Lu2vh-x5332w
z(qM0TIPpPkZw=1>N2AAO@6L-PxEsYZBmfYY86O=SO!f{X)*pi%!|(pV<d^N~(JY!d
znC$P2-uDb8K`L0R0SA6{@9^L~z<4v+n;ZZy-hy7AuR2*8l#n}i)F6>lHn+Sp*?V*N
zcJQac<tA=UOjF{G|Ga&Wc6oWZf#De5Qj`+(udS-+KNyGrF1C&84gUB@Oq9&;z&?TM
z8Bt%)0?V}^UZs+vf><6;clSpJlk*00jdpui;+}8F)q_ES`9^22F27E=XQ_gh3v{+C
zEwdo_f&Wt%j=DsFjw*-Sn6eH>yZfkj4?Ki6em!phmT2$BN(1}7eEiUqj}OX~%v<Pm
z|A4-OxyC!wJ!tI7eyubLvPWYYp>qXPT54?hV6u5M4thXquRpo><j&wZg={<-{5aZs
z|Ks4-ZSeTv`~8Vg2&E=7%*2NmG24zdb|x41Chra}YHt39#b)D!?ft`xR_M~+^djb@
zo$c}V;YBoOZJft+w1jCKGWq%7>pwN7gv>9a{r#QyPdQDLHI`ut+?$S%cF{oa2ndig
zc__t26miMUQ4c8oFldY4;5VVsY=)%mLnuoWA48z%$2Inui}s&S-OIfb5#Z|m_SGP&
z_vwAq?)wDTFJ1a<Fq<A7j3<wQ^zFSj-#`EM>y{<8ygS<eRBMcF^jc)<;25iHeC6hs
zmp888yfwZ(xiQ|nGQNHD`qucyja%18S1#ZB^4j>?wd<F!T_68WR+&KRu*|Yq_TlU=
zlY<%b-`P9Ymd+X$W!f$;U+OZ0&c4p(FCKvpA{;f&n$aysM>4V*WFe~@R=b^7M5&1_
zLSE4OfNV{43zcCWk7?q+)W!t19Ab3@2aFajSV4IvBKc@-5o-3jI@0n1%Zz9Cjz7_*
z-8k^_i2(z@qW3E&RO&ph&U|UX7Fip+^IUe=2=i)As~G~=1lA&zQhF~fB)my??l8C{
zSGTPnTg0evIEk()>G~Si$|Hk4{Gf1u6C`u8XwU^d3{dzsaHc<FMFonHY58eIvHbBv
z3u%n>vzX5*dG(O}ORWK1Y&uT(dCWiP$d1Lr$)`cN<Cb(x?MHxDz0$&GEYF1aVyhsz
zM-kSD1}$e7;dvf+k!ZwP`DJezT2@#NAfo@|$b(;1N^uWbH9BhD2cQi>4J(Zj7j$cs
z7}`^Mi5tu*ddsz%R)uu>p~@4HNdwM*;81>m#k1g5|EQ`hotMVudZ#~xQ}w{P@C$Re
z^lSt;*ct;oJ;I_f7W8Fh1Stq84u-$sM$vD<4y@9p4<8LytuFP$DV9@vhg{cg?{XzJ
z;Bw|3)~J(%!4?(<gVrMFtH1Ag(GP<(qc07#8W{ZMm3+a1vZ*wu+QEmv?+pg)d4=E;
z{!;gAnP<&!Tx8>2^aP!yN&KApy7a{tXzGi>-J|WD&B2I^@PR8kuD}o9P6k}PZ*O7|
zUDzFFGmQ2I+qR+#gH>&5+Fu&{`gR+uzwO!Jrz5PRMrlHgc8lhgSx<Gpf%!PvExRK4
zgNr2&^yYBNxw6@R?&NT)MhD-RRWuu{U_rP4o}K?#^vt&00<yvX_}1*RA31I<xz*04
zzrzR;y^|HvJ5`^@NSY(K(;NUO@_Fl}k=t#;k6d`NbGHP=V&_k`#ss5~2P?jqbu&hR
zM&}2yk0a2mKUnsnE4(*vM{K8!-=)Fyz<4A`MXoCv|9I}GK}jrOJf;Q0MR=aDPH=9*
z|EemV%0iL^E^cD@z$}Dq@(w%(ivWw0y^E9G{loVKT1E#4qxb5#gXj7TyhT}Vp!Lul
z`Iz?J%;7;UwdVK<$YhDl3Q|#=pjWWgA`|@{o`T#;wVH&n+q=Rd5Mi}{E@*yNPl1iB
zSg}g$*1m!YKl8-U3Z_NrN!$X`^T4zX5eT0{kV>W>xQm41Sh2g!MW*x3D>E3u6U#ZF
zpfP5y!x3ChBQYtu{bJx+yQUCywq_4+skeowU3vzn@KJeg&r#3ictxx|*n%=?=nn_j
zS4V=nm=^X1k~mHbfeh+>`8z@klg{t-sSxwWEv>!GCoHVlLWSTvAkKR+L5aE6oT3uM
zQLofLv>8uqT+Tp_j)tQIl9x@M<nSSM4fvctOW^eC^8qG;^_EGa?j^0j<qD>D%*U>p
zNzbkA16UD>GE0Nm_8vSKP^=pVlhMyJYS~}0d9c6F%>%rKE@wTdU_w_2Y-2>`VzLpi
z6uX6c#$F`RY*(sWOjcS_IIl{Ni;1;M3GPNcuu}>0^T~KhV=eJTDW=qdCeZt%*$n1e
zaCe?y&})+2LOh)xTn38|N%DzYQ@;&qqR@6#XbDoSygB@$ngdX=vcCfd9b+~X-Y>9f
zGPp~xxVL4BbB@={Xu61KO96bMa1REB4@|->*I6NK$9u~<1<WVqigku`Ep{r(0ad%~
zx#<z42n2m=`k^+6dw54&XUe-EXvH|;9c!@83U-+$`$jM=5weEJ)#<7vSe+ojUP_8O
zI_Yu|Hn@!-SFFYt$Mab>&wG4{?559`$ZyVgnL`6+@+FA%u^Xc=9uIFkyZK)amv@^x
zqve+~oLjlU+OaLV;9lqD<>ec<u5L}PZfuUPj5aoIUb%5|G@9JJb?xTX?eUe3n^!O2
zxOVmS_3M*c+7`__pY*m>d$tv1+!y7J=!GjwSFUPf^a5nC%h7h`LeC=nY-6YK>{qF1
z|04XXEy7uryONJr{`Qac=PTb~UwnP-$#?&Fxb|ZG$@3rn@$Kq&57r+-w_q#Ti{4v%
z@$}o3A6D;mR(QIy{_q9LzdCbaFgSY&I}C?Mv$IR~>+s!Eu6Spc-i&5XvGI$|-1dif
zhuw+oU2IHj-W|;*_a~|B#?Ey7^Lp%FoIP{lH2_Pp(7#YEM3hX=JqdvLY3on6@CobB
zGZ%g<K<{1eG$7A=oami%_?)#10Zbq^+5y_QPlP{)gwl8c1w%r+v`V8T`2JHXmDz@7
z>dCKBF|S;51CUjpv&=~A+2&-0rV(cE%5jLlY$3>x2B_?wx|dkdeEs#;w*RTtowN<0
zGu{wy;fD66gB+Yc=-6_J!3In<1O$(qY$P>ah*kr-KOG~d&eMZ7P~59Ln9OGDd7^QM
z&(~cUhQt*MFt#DwC#XA(ZuyZLxfPSo0i-~)!&b?td*6a7+NELI7JTSHvH1362D-E>
zEMw=7`-P(Q75=YeWEtV#(cd}aF8yRvJ+CR2=IfZ0z4>K?tsvk6VK&}cwY4tO=7V*U
zgz-NL0N*dqrn><M+4}s40fI)}0)5<2TtMS4V}Y=9v^klbXT8s(FB^|bx&0vX&m9^h
z;Nq3UNo^5u+6dK!_RzwAeT1lw!wON35KL;184_a7vrrPrZ${he04tms)<IYazhhVw
z_EVQ_AgKIu5`j6i$JrTuO4`j;@r}uN#DF5&aJl|qcl*s-_+xiw)4>Klzy*bUULz+~
zRa2~;QV&)Xr4A;$SZUDRie=f>5rT$j=Wp+#!sr+Fx;w?2**-Rv9lqo6S&$mM7}9)k
za0OvU^Xjt1ow+4047&MNytqC!lz%;V45nD#-QIIz%<0pWQztcvs+NR^*tw^AsISyh
z2}~)XGc4)$Osp1fV1OZ)jciQd1(|4|-C;GajKZb*@Ihi%yav}50%Da~a7(0Km!ltT
zA=d2pew*-l-|C>moxgA6gy2^li#9Pes0nDdPG^mcya$2?{NDeM|L4OCF#FycQxYYF
z(690We2zG-RLZ&-4BBu<aVzopZ$I+E5ZJ^zBPu4=VaY2?gR8!ERE^f!aK-ehqAO?J
zx^c2fX=HWcDb$e|s54}$G#0&shK~d^C|0j2HV9)r-b%@sp?2<W-yAoFOc^ldxUm=W
zyfAVsMQo73k=CA9rN?o@zDmoW8_)*Ad+oo6w$iTV_%fUa2+hmI_T*i0L0K<_0cotq
zIW!D^DD?>r4Qr!tXq?=a!6rDOl2uP)fS3Fk^?<;h)jE6YTdnh(%T`8zH0dCox#0VQ
zA6R<++EIFC0SiXudRK4y+P6Rg+JL$_K|ke+`=g_NnvL`?>ea>X<8t_NYwPyq$>!wB
z)zS6Q<m%PY=9Md>FE_rtvGL_-<Mx$}+t;@y8@Df?#N{C9vfF{N*cUz~=;#0QAOU)J
zcSrBGcaL^qKkiI_g+=HgvK}k&W1*B{*7>n^9Ohk3TVl@_6$mWdEajH;%3ud-(p`iH
zag-odA6g{LVDsV_!S3iiO<dT(I01ltA-8jvxwiznc;f4zU$=L5xYvNP@@mF<Y_b_{
zYZq+;cmcr$)UW8`JLk@xbMnicyVP>_bbW|-O=nNMubn-7`?|u<X($J`j^N$=(I?|x
z23){HMk*FO{mH)Km^BviAQfI>8MvpR9PfQ~d>YCDzN8h~yQxb~wLMH)#&g`EWU^%5
zG*}&a1?KI4!%&U|9ile2dMRV?Du<}OB06pVOzPB}j*X7OPZ2&*tJ!u45&I?bU`!8j
z_Gtz)Qb(b%8%y6#_Rzq~qgjnXQis1zv36vT5+josaL>ukXRABxk`{dST8h*R)F|Hh
zN<wQ@&3A+8-p>27gleH%dWW>~_J-Nd`=!AKcG=d^_X`F44|b+AfT3BH5Wx|I2^Cur
z2#Q9a-(+v_qa24n(p|+9PCnz(hleqb5F^RC6xKqQci6Dl4#*D+LR102*WO{hecc^Q
zP*AY;<pu#4a2p#`b#*Sl7Iz!71(zOYk$Gy|`tv!f={VM473x!O<2o>+Vj;X?4J~=_
z8K|;9oz1p!nuET=O)%Ir?eWHl=*J72h&B@d`l7a*oU2kP9QBdk5!61M!pjM!mMe1f
zGpIgAFf6SuM1G=Wbj&$f+$FP0t+&HHql@+)vSWrF1jMZ^<oG~<vVa6O!kkO<eiUyD
zPBWm+!K(I&{T)bCha|)hK9HhjGnO71@K6Dp7p9}0#ZMK5DGEc|+Z>s6%!UPVHyB)z
zn9K_>dS$k9&_#;x<Qp2+TX?0UWNkykKBVciV?(3b#)#sBkJ!)9P&sG|V}Yiz!Mo}M
zBdu*|=b&`(oBUBpZ%vQ(HkYK39m@zy9Zw)QSm8lp|22`q=1ij_V~^qgx6qL0a*6^u
z!sJQekC<s~BxtrkOx752;@TfLnCxuhK-qgtb-UY#96Xwj-q|H1fo-dS5nQ94P$~k2
zcFbIQ#V(CuwLK}js7cOTEgO~?X;$olG>~Moo{z(zi|Bm-sqK~+e$sB5p)s-Q1>(}q
zxuT?sRgJW>G8+8-Y}$YM`&p}D(=YLNZZ>%G$hu=)p>h0nwD)E*bNpdTW^;<USqoT(
z!VPfBE0(&Lx8H1!g+7xgO+f7}DMJ~s@%SS)q*CQSY(pybkkEFL4JoUA9P8A&ChP=k
zH(B+;@%vIy@YwAsaiGydP?ZjT%noU1>R7;C2XqoOX@g4FNmnhtvt*N!f!f~A0IW6E
z+Iw5JHC3)4np-bur1pouvSF7~rjN6=lQC~|N_DVF#MW#8joqETj++2_=b}`JK7Zdv
zOS@+gsM@eW=bhUwHufG68Ut_uPP#p1UCi5_@`kZLr6=N$m1<fqW6$_xTU2brwes;>
zRE<#A2d6RXr!nhoGhOm{8nb>Hv+lOtY0SE5_hhy|@6Pm)N`1l>ueDKZ@t(%47wh`}
ztugB#m+s&t(jDN?`Qv<j>tkfU)0=eF&x%rUDm}G5=8SHAPdXg_!ZRA2W>Tm#O(GS5
zUl##HM|!;cgah`L;n6Y=cuoYSD@d6KkU0Ur>y!_VJX1l+d<a@G>44oroD;9dYaFmQ
zYL=ZTe*n+qFEKgl8)c`!RVAJ?(-S|AE%l+*)}<**VmCkE13>Y752@q7MfP3YQh_AI
z>KL7PYJ;gRpV;@b4Fb(m?=fKknps0uLZx)@L>u<i+DCtp)FC5Og*~Y@+e<}}BSA?J
z67o`BN4;i-3oDBjJm;&j8Ynk{rLyo_j5LOv#sS~<m@UDuPE=>42gMB46gpiWgwzOK
z#3k&i-uQ!hYkzTa6`2Mxek9HCvEm1^K-!O}&K&r{hvzZmPz*ejR_0lQIg2=<NBWAg
zl8BO#23FD6GG&N2?<8AA+I|&rN{$mRq1OWv)q54M+jx+G<FWlrJsA>_%G#U7RYz*o
zGa6T|?ia1*_U(zR(QLzjPbDKQE8uff@X6p&J{j+mkXTw564KZy;}m=Vy;`uZil$DG
z>e@$QBlA469PdOaccZG(Xyn`;NF}SZ8S0#)Hn{kNw(Z)()5IuXA2I6xM~P9&M4um-
z$8&vc_1f_1{adX(p2dgX=djw9t?QdNuHXLh+U3ieS8!PE%PY68ZQUAO|ME*@le)Ea
z`Nr0jTemkySC5MvD*?+vW9h8g|M(=HI{j8>_>-^fk4oZc{n_EWvLnxl!vM?E^LXj(
z88CFBAfh68HPY6}9a-lTJXw;MIw-d<2DLnL&1i$uLwbm;@Z%<RObTfPFLjYn)sG%9
zCWRj@vRg6kbr3}CQ$#?Dwbb7GQa}nnDp<Wc48!Wq3B#}gjW7(pw8JL^uMU?8=oW~!
zu(s>!VD&jW^mSRoP#KDUVs1AO+{@hzz~D#3U(}pG2fD%);J&FUs=wUbz%bjT84$oe
zZR?_Ty?0hPJ-HXB*yI$}p4xz7ae8v^^yD5+SvEJlDO{#Bik;YUe-Bbti(PwnvlP+x
zKHvfkoSxiUd~4Lyb8BnVUN^T!?d?goMy=Motx+rSzv1Lwy#UB5n>ptx#W&>V^cY`f
zs`{=8zdViy#Sq3xI!{)c<86DuRFxZcWn=$c&i3{3%kfEzC{s<#>Lg2?Kjfg_F$4<u
z9PTq0@_&)1``Cj`^9$sJ--{hMTA);JviDFSShM$AuHLueL+!p#^G_odE|rfyjM!+S
zK8x7+_&Yh2u3aAA+}OPJ<>=bw>$k?&CRc9W+PpkLCZzF=O{79X{-g2j>tBvf;86O#
zP9nzbJ0F>T{B%Fgu4ek9Gn*$Dx@|X{?#E##<a9sIcU-ZX@<yBBr~7fI`*8|>INgua
zcK7K;1^;_5D!|eG(;Nhg92bHuu1NaR90aG=NqoXRhDFf6Ty>{82u^bl*u||n8^R6B
z(;NgmG7o(_=R{Av-)o`M)qbzNB08%xHw$d}TFss<Uw+JI9Zz!*03F?%--g9Go8L~L
zdi!0pI?X`<?w(mDiNbLmyJx342$Utm_Y!#)_lq)9{hSyAvRr{s-&Q!yL4cb;h#DMn
znf#H-N=_PjVH)Bz2Z1sYIDytqa}exx$goZ&=Xn`eI?X{~;&YmV;NU%@Q0k=EhMUtI
z1fLLObDDzyK~SeT2w*py<{;1=t6Xd1y!49l2r5$-Q^6JXrXOMTEqxiTr#T4Lb6PRC
z#}zYpnuFjp2Z8g$X%2#9$yw^K(;Ni6w(`&}^#yLa?p#zh&UVhjT^yUyeSFBV79nR%
zMSOa1o?pfHiTCFH?ZNYvhkv`d-o7`l{Bp)F2|z;e?z{7DULI|YZrr|hd1JD9`^M<Y
zt;yxlmD@LN-`e_ebG(5!8>8{Yt*x!)<wbAVQ}o#A5|YFnUK+nW+WYxp1rP7i%Qx%s
zJmQt58`lOGc!M7D*k8ngs`Ki+i;G{K7eyDjI`3jiuGt$$*gO};gE1H5q)Tu)-0AVS
zP_AsY;D+7D>{Fe&_}iHbdS4J@6Y_kb4ZYJ<KPS&J0ZbqkR+gR2!bboQNGNv(J_Zry
zxvKUY&`h0XtpP&h+C@NX0>fRFX5jQ}Z&aOh-V>t+iJY>zd@}5^lRx2R9{CK3DHYjC
zuFJNnJi-;Y?%6V_S)p@J=lDUFEbZf7>~b6c*NUpwyOJk31RF?!*GBt(IgaYG6wUpF
z>V&~|rRr8=N1FYwdmQLzx$klubS|!TOm{Z`f|Rn?%cT$V<v3{9SiB5`2ZyI<`chD%
zo(S)dl=V^oy-;;r<|IP}UC&5(y?4mF(~#11a*-FTUBsKo;2WjvR@&@~R_M~+^dh3d
zkuGoh@FFhlwl<2)Ngr`J4uB;Gl$bk-zAX7O>H&d$m*b$f-pg_D&9R!%A5A)lXE^-n
z!J+lqJ25N~F@3rhW5syq+-OtIiXR<B-fX0fB5!^@&KS6|dHeF__~wn9H^2OH^V;>z
zo3}@|u3VlV&%ox^)yw0}8@I-{$KzX@zn3wfVRsk=*%~;#)duPG&ncnhr7ymaF@Abq
z%ISS6uX(n+k#bagF>~DfGC7#>t^>d4s4$*91GKW+`veyWq_@OhND|Fk9Y!7Z(JV3H
z^-o6#&oT|#+C$e`@0cZHc1URv$!y%4xL?9%O9$ojz7+U<{};z9IX8T&C2xBuh0Uo3
zYg-=Nn%6n=Y<Vk~EYXwL@(R0AJ_a^|ebi)v6oRRRRYRsv(+I=)6uM>wm-!wX;EpsX
zwNMxIROwciR-8)bLWr0@&SLg5pI|Sug=)#AOrv6ga#d6X#*q3dF<0sz<_jj?pStkV
zB9RE^Kj(^L7Kv6`QaG<l&mxhvO9}4ovpG3G$34lMlM`Q*8&{eKw+?Xs%>HP`%m0GA
z#qRUwROg3N7rxPS5z)3dtdCy|TTjJe_%w}hF^Qd~5k7n8tmUUvmP<=R%cPRO+_gll
z%1Ar1%%~Hj5mx5Y(_FuvYqCs%s>Gb0-gWibs+}?=<_u@d=}E+1yQ{>n{QUpeyR+s-
zt}I*7@AWHWaUX7*RSX#19YC42+0`ti6q=<>sq9*syTcJ;DuRqlMr5X{tp9s|>i{4@
zZ~_^shqkV&q=E$8kDp-=Yp=b}@#pLFL(6HOyN8~xkD4trZIkMU>(f3rCj^&IvqNva
zYECJ20Bo*W|80YBb}>4-G$)4Uw;%lHzYhof@54dgd-CK(-ukr8biHWLo~*oL`0Uw7
z!>WDz^3A91*(byBiH~+p3cdZRe>pl{4*z^_Bp<ix+iEf!W<xz{+o72{nqfY!npwSE
z%%?*;na!uOr%xA)MLQmMeO*tQwr>~x(9{la7%kg&G&I$8IcXN-(X`1siJPk0&CK1=
zlaO-VAtU>jWbmrT^Y{KW|M5qTzWi&+`~Ccv??3$D&p-V5x3iMW*&N6D^ywxmxc%Dn
z{7<|qN@4$s=`Y`X_Tf)IeSh;6KmJfXum1A+^p-0={p5r9t51L0T=C@UQ$G6g>u<mL
zta^T18(+=7`QYoXHdp-XL)!Sh`RUWIzxna!o1gOC`(OY3-Jd4)%~$+VeemTEKmG8*
z=8EOfYIV2}zOoDltf<R2VmM3|wRG^JUoAU_hIFIld|CI^q^VbRJ<KQFVp><-q<i|b
zo6ly8YPFnplV+H<RWn^I#?xi9Sk2p2-;8Io)w1qp(|d|xx^kc#=F)vZ+~kY@^IzWE
z{PyTv^ggYBY~KIiyC0J}e?;`IT=4my>Q8_C;=8YJyx>oD^Zx9|55L%4u+2DMJmSNT
zKB>O_>QC?A*uvM%FTecs`6r)kF8J3geYmrQAHV(f&%gZ8e0bv{o`3wqXJ3Ev{L>pR
z_{)!<SJN*){$+E)Z36YBR8f0}O}l!{MwAxI*{m6NUCpMo%W5^AG|n|1Ek@ONH63@0
zVc}ro<)nZ5v~QZ#VqDe3P*vl;ZOGtq==;%VsFv-#lAoA1L%V2i6{TzXajhI(b6td}
zjy21F{Bc#)|J!UGoeuxk|2)^FKh$jPuL%9TYP7DoXd`FcVkLD|&+1XVm=D8ZJZ_t6
zF<Z>rX~&NBLq9B5{fy_VtEQSwrbD%w49m&TFWRP_Rm){RY39{xJ|8(~yPYlid&$|2
z2J5;W?@QVh{r{=??59tvkH5N6d;i;tZOV)8vSI~Rahh9E+Wx(Dbj!(NTvt`Q7<aRN
z)p2=s$ANX@>AV}w+p6y-<GLO_eL7oJ^>`SOt7g@%=F@sSTCUppn5S!3<fmOVtCi#0
zuaTPbXYN>{^Uop+lgHKgy?^!JDrHdbmH&To0j9qB;O8%@ub+Rh2c|YyYWwX58LUqz
zFSGOYw_knw{YRgFcKv<ZZ@2edn7d8GKYdoszHNTkLa-g^v$^2g=G&_JsrvJcE$rFL
zt1W!>^B3QJ_~#Eky|INqe^-Apt-ikH5kGzSm*$t*7CBvg#1DUZ{_V$~)j6|2P;+zm
z-Noc?Pg}cwlD6M&?%weU+u8r_$FH9M@ZCo@Uhw%3)9-)&>X+um3%>ZF`SJZPKG-6=
zvicX@`~IWm!#{uW(I?k;Z~N`0@g0PF{Tg1qp#I|dkCV^e|KY|KW?%m0<LZmgt^v{8
zN6aQ4R?k2D?#33r{bp8w|L4!Yz43xQDY)9nJt??)!Oxea;OYf?QgHQx+4C>H{pgo3
zwix~D1(Uyg@$vg#e7hCZtCH~14<G&T_49Lte)WQHe*BmuG?N?W;p1<AnAG2W|ILjT
zeDcwcAAa}Q&o?jDXV1U>{+sFalN(#uQ`xJ-yi;ZO1m>#3?Fr1)dAK>W+ep-YWVg16
z7dr9dCa$|)C$`^i=HO}vf4VHNS1;I`#j6+WE!5Qu_7>{u1wVdzQ&_o~gFSh?+QPm(
zW|A(ZXdBpGKSkSbZxoZg?p<BO{gBqv<H(xX<NCdSosAyPE(7Szp!R~;jicKhLi*wR
zUw!!Tmw)~4{U1I?8mxJQt#kX^+0&h`FHZMdM<pMhN!YY+hA)S|4=>N}-J(<XUUS(^
zZT#^2>*4Mua@9o(pS}OxN1uHC-52Ng?R0zl-Nn`4AH90}vLr4)K0Q4-{qSUY?E|m5
z?7B97IQeZj{{BsSylhXG=N;G?`$apKF1={$hl{F=4^M38JbC%j>(Q@Sfom_kww;fU
zErk5+O_RCP((a|#wq<N@-iAh6OT^B|c3N3qbnX2I^x^Vq{&+T=qVH}Lrrqx^p7`h1
zw7vOg_`4SkU)R~)?=S9J4sV9jSK{lPv0Uo#*25Fxo36cR?da^|&%Xgz7dx$;_hoAr
zwRGKe7p;^+h|3ytG5uT9p_S{dyJ+S3<n&eh^5{QyNA^uN^If#H)1#ZO-axk7jKmhn
z>eIDG;(+6Z&u3{1__TGvZ5PA6JYP4;&NY|a)W#(-*pd3nO<We;t+6>D&d$_qzq@$e
z?T0#_x3M!Nx8HHm@`cU$|AL9znWP=Xxv+&7<J$Rp*KVCp)y^{AaOt&e{kMr*hdBSg
zHE{}){>OV~CvQ*t;kiTTkB(pb_}!QP_m(4gK!y1F)*TA%{DTegfdlK7;~HT<srqS;
zYn=>uGrvsc9UgWvT}mM>ho?`G8r2-HKbm+OT|Ky10$_no8%?@?zHI8gtK|l+qh&81
zdWHE2Uv`E1*pl&h`}f}4G3Af*_tt)uKX$b1LQj?5zgJ3W9&PhX-+cSwXYbcve6r!u
z{&oNRFP_gn`=t5&`S$yBB5ng%zk1$${qx7)d~?(HlOKNk=+9q${P|7a@9}sSME|D!
zpFaNSrw=~+W_r{8zsO!qfByE{o4)_#(^>V)^ppC=@1KA7<u^ZlvL*Sq&;QT7#^3<=
zR^IG&yUq8Ksl7S>{`rUXx6Lox<i>VQ&)1~+=%b&0`teU!Qx}^#dH=KTKl<_W=Vfo>
zr3B69`!A|5zW)CGPq%BfZNJFOO%Ul{-rMix7oS!?{<-?1+RWTV66gArzw&+k^T*#$
zf0}%E)BT@(_r<r<UnXDP^nLwl^Yv%%|79yVSK8m*zF`)we7`3-SH9nqoGah&NzT>p
zFH6pq@4x!)+aEvpX8Qe2<NNCC&p!Ukx3ix&-)~pxTnc`kef-r|U(B}ibLIQ@f2scb
z`FEdfHRH<jKm6wT4?jMCzLo4N-+%kdm*4#S^`~1YyYl^K-+uqq7a!g{|9hH!<^H=g
zdrv;Lns+|_J^8pY{u>GYjeOpar7T)-9lS4A^JbKNRYCT$oL2_0C%{*}-<#ko-|sEp
zmGAc!@XGf$=1{i^d|5!R+<$|BmI=Hrvbj1#dr8_WBC^-RD@%Ms4!88+GRQCC#N*;G
z>&fGV3}yXzJPyUOaaiuzcU^n=-S^ISwe7psLtTOUuI<&8&l8gDd2G+P-Hnv%uZbG=
zKEK3Zl<%$u0+0XYYC8MPnQfS>qZd!Rw?{9RPv4xCe~*q=C)?D}%~xzw+4ISKn9dez
z9hU82d;FqbRI)yOy{P-uVgQatDs?1_MvK*?p7!;4yy*LCJXDkMc+||h>3B37M)P6P
zSN*(Mbk`({Zt2Aih`Qyfpeos<h{wM?`OinMPfuQmx*z@9e?H1F0AIDQhO<Zi_V1}y
zSpV-B|Mb^aC(E}lhqGsItle4J5BluoQJ0^m!&&__^Y!TQeeRiz#t*!$dDzot54&yt
zu-g_7x@|JL_if9QSNFbWI4iT?pPUX4zZaX;=P=NRwy@cQadP_5297Xe*{=N1`w9N5
zqqBFp{hz--^x3DwD%1DS+s}S~)t$V2$GiVAynOlF@yS0PxPr~o^$vui<NoDaao~eY
z!0hQs_qPX6#O&$WuU_A`d^Nl}Iep+-Xu|=8$1fh*fBWVixDd0aF{W5~+m?{G53!*0
zr|sGA$Nf91(x#Pn)2I2<htI_P={xD-+^GjIz?X;3;bJ4l4_bi5JIU|jon+75?_dTN
z4__}{syljNxgRv)@o`dd554zYB*mlO*<hrNhZ~ICy<W6;v%cDSu)4YT`0cB1c!=Z8
z$spH1xd6jw!<%294990r^2$CN#ecoB%IB92r^DM<>uZNM|2R4Q?a8b5ss^twfAR99
zYp+__^_ORiw=+w6>9r@WYL9z={5tf%4X01q?&yXd{I6H`RK9A@etQP>zd3FDH&60O
z&L_L`jtuhG<&)or->-EX>uy~<AeWzszI5^)xBTtw2~q$1(b6z}ee>p~sk!tR_q;tm
zx~i7@J=%`_NxEi^u6m#K9r^liXD7!`PG9#=L_%**+h;j{t3MrR@Hd<8-7sId`L)f8
zzgnLs;obT->zmh6R@%Mio$E&K0*vb;YaCOv9G+#z<muJ<xD?S`z5ZDg{4Q{|d)rz*
zug>Bv&*8QI`s>NbZ}+&Vd%IfQrL?=f>VFl-{*@5*UTAP-s&DKYG<ODB-{Xdp<Fk{y
zVECnuxj{X`oBMR?^!L}!eYn*}?>=IgkoF#zAGI%zPZWvtXNm~g<Ky9~wYhP^mdE!P
zh>M?XT-bf?I$<jRKHO`{1cvR=RTaB&824>|b&vk99x~`_t=^5@&(&V+eH)726_8wh
zj{zJVpS@<l?qhq_jLG3WIv(y}s7~(D_t)*4tA6;#d30vN>b{og-Ztj-+vDGR2Kw;X
z`9E)m)87vPUb~CTO)X!lojLq5Ik4^UtMzBNkC|Ct{{a2p+z6_iy~RD>WAQh4{$uFw
zH7q{+ulCkhqI)=kH^bRIL^ww%+-D@~>mM+AZ(iPGz5)e@zuwmtzHuP#!KUZ!={-d3
z?VF=}T>bYu*vehy`1?Kl<3HN7t3dij6B0B(oc{IAuhGAI%>93aO+I)Ux1j5W;NZsI
zt!oZ$e+=we;*-Cf2@hVqIyqkNb{)h`ca7(UTMMAReQ;}h_w1hii-4?q7wd2ctlH_}
z#m$Ku?lH8B8=cRU7iQf)wEuPOGrQkejECHKz+_(k#J2BG-rmJqTz~67j^6ybJZ=AR
zO&oez)UF-s+0lz*RjPOK?bkngIA)0Nq$sbyxA21>2ReTI>gdhgxc=JSqZ)?O<A;s>
z<w^hBL)I9kD8cVT?!Bi9?W*|t_ro8$dvBED9`d|<>pgq?=ARpbbo4q!S35b*!+XAM
z<K^(8?SFr#Chn<^+b4JJ*>3Ug{kuLKz1}NkzJD7W{_z?5M<(kN|J<2J*j2ObK(1N6
zjO|IGmP)n!db!rD$_Kvs@Vt)xr}6E5K6?w1Lve4>C*|1mA$tPudCviodF46lXWsKc
z>zm>=htuAa-k}aRJoN0D{21K+>h6g5#ug5c$s6y@bRE6PTdQt`30LmFMh>LVFS~~=
z_x7x;$*x=+L{{B=dnB%@Ztw90TX^N^zYhO=@V$pP@|!!}w@0s^9I#xsbiVMtLZb(d
zpvddp;m9q6h?*BGa);2|G75e^G#9mb$LT00;^F<cmYO|Oif^L0FW<kmgs;vHLc8mW
zmqYjV#X;BKyh<-mUdUVBk?Xx>h13i550<e*k}kJA`{Z?t1bOh&H>Bf(?@##s@S883
z>^q9~=Ir8!3-<vw`sfvAVr`k%W^y?G`|U%&dPkh}9i7~{X)WR9zfPAw1Z>}M^I=GR
z=jQbQ4?(?GZhHOlEoC}<kSRBMrpWH~9dfkupmGZ&Q1*!(yaeSg@_tu&&i;eS-ygo@
zhwt~O&AF`y-*oRq+RXH`J1gyWMzp;L`^!5XKBDb?vax4(G1AvOP8Rm?d5E4}zWNr}
z{2g{NX}Mu}0iK^@9){x=_h{u^?%f0Kd)bCtx_*GoxiI|6wXPlbE;uZDdU>vHhL+bi
z(MPiHl7zeZaX)BreMd?g362h;tIoao^^ILKw>C&2589VE#9!}kzP=EJ%kz52?bpq~
z9k*Q5N2A|tq<(S*iWfg{xlgxUe(#CI@jNN{l!MUJ+BbE_&H}jZ`rCSzkzF3g6`4JI
zEwUYsme0<P{xLjx-JVL=ujRh&j#m%9`4Dxv`O)ic?AgrQ2Aa-a?(1z=Un34z=H*=K
z&;CKU%3FC<N~R>_pTF<eh070pKr8D~j$MNAo4Xz7g^{?ick6b)-**0wY4n<jlQk{H
zLl^VCGdrp6xu1<WYgfZM)Ba>w^QG(N`s;=Nyf}sv!dL7*`cLXxzI)w&T)w!xOt;*%
zp0@W>)cO2qxqLbNLw)N#@BY4TSF4kk%Lg>@VtDi8@e$kb`SRe09xcBcfQ1J<jrV^s
zJm9`-#2_Z^d|G4uQ#ZA{99I|iyu9l2NbhWE+xnC2Bvrtcg@30eUfr<JclP9(dAQjE
zq_r+&{F9_O<>%J3^FcmB{^pa*qquid-=IJQ*MDG(-@om$*Q6W%z&5X$wA*dSHQxC4
z8`e7fq<#D5L`~yy>rLg}sJ1avFOP7VmnZuCyK_jeE4W{+@BHxm%lq8C>B{*N?)~&@
zX6yBOnQs7B*UZ-KH|#F$MuKh{>+KDF?--b){_~`&V83^2>Y7o%$Pv!NO_ct6-`h?7
zzWv^79(J?p9iODUb*sUbIJJ`Ld-Ce-o8g~jYu5ApR;FX6q~WsE{BaNXFKGAsxRYOz
z1^<<uKYz%7!2psf{sCQf@^(+t|Bz{abNc)HeK`&Lzo6^a1vh_4uirt+OV;bF2>w0&
z)MaHU%^c8;chRG3@4bDQ_HQ{C%mbzW#{2L0*n?$u|9OXs<NkezNZS5A2drLTj@aqf
zlcl2zUw9+Z=_Xt{;NDGj)XS5loeSH-pF^n8Yj0fdj=MF1c<p`tc_!)h6}<N5yLZ-H
zd)xLs*AIB24HtLiQ`QW^<!N;q-(f|mmv1{LhjQKX4%udS?bMtN|K|a-5~}h+^Kt-X
za%p&ni}l;LSeE_EvzsGHG2s7}4cx2t?9Dp7Ds1wzb!qdnUx$~eO}Kq}Zn*dEy~j7)
zxO{6P%^j)g{adda^%|&d2YvBY`2yDRVvgOfE_j69PuIlVnrgcGd8m=IORcQ0-=M+E
zUu~aycFh|?cALJqZvWWu?Nz+>6^G3pS|@>Pw%R@`+4=$z_vht+d)2X(y<_Emy8sVT
z$i3%p?<#Gqj{Z3;-?^3hkHog8_47~L7YEdttjm7R=Wu&>sgOQ<)^-#=d&mx{n7%w4
z+m`(MfV-_J6-=qh0~d7r_@l&42LuY&cmDp<zX?g#-CpbB?XL3jgD>5F|EF85ZPC|5
zCr(BEgQt8WEL$e&UE4`<DLyCXaom3@n6@Ii51ohYAlCP<a;WE_Wv1uabh(X^NZWpN
zyK~vo%I!_-zFgr0-=Qt5eTFC--rT?%-eGbtcgzNWt7PRnbgq3V!~5#@KcZ{x@o%Sp
zL_7V<lef#&OXT$*(b`(~`}X*cXlx}#-Qhd`h_;U8YPW0q4hy*6TKh+|bT0E<(*A!$
zi{Y5gq(c6X#$NwnIz%C-f5h<i4Q7Dg1<3lEQ-3*p+5SG9jz7J4XWJHQ?Om*NPl4F0
z126x+&q3M;Ui^dNhZ{PuMwRC(atU#65c;!^3jm}*QZ*-Uc8jjRFK3Egx@q0u%QEOE
zWiIfZd41ibtF}$AdlkBMCx*zxY%loS?ga-}zd+t>eeP!^aJaU)Z-(P+b=bMsuO&IL
zJL%iDpL>_ykqx^?$K@(FUeokuf;MGUAy2pcxQxNi;rXSGtv}toboZKX3dwZ-`E>~T
zJe9ls<%z{A+wRvqKL{2CdGzsjA3B=hb`-R2;@S3>o7<XA?x-xk$l~7J*jSzYAJMhd
zQTwKx(e~3`^~@Cqy6w|VBfU;>H=NS0q^y_E@e7+1^`Eq_kIq-?BI>)i;F>RYB&Jj^
zUUP|z!x8Q!$6@V0om6gRZ6`Ufd&PPf+fS|&pRVnOm+N!a4u*JZilE&2*T0^h4s;MY
zTt9A8h@l-ib@r@$xT(&#LkuoG`pw|j3r9s9^yJHTp0+9Ve88Qh`fp!4uAA8P^OnQ#
zS}J!K{$qF&)<%GQ_|5D0z;8|6K{Jyow&6a*DlYvj2(P_=&ki4o0~7jT_4efxd-V^$
z3&GkRckU8=2wyFkbmv3wxB2?y^gh#n{`B>o2X&mcc=_8QJ^Y)MdXi%zpOu3kp8*2x
z@!Qwo=Z`s^+ZX%w>0nRrlXW<>X`sm4{ck&9G4{K9z?1fG$v{IX-NEMV-}V~K`Q{_{
z-t)dg2PK#!`KOy2x%EOEaPNl6O>Ylb>YdA<{NvZ*_&)b2^QrG~JtUMj(e%IG<DO!S
zOT>7eo4VhYtI2(Ch{zt{5e}c<?J*AbxFuV{OEp`}VEgLw=BQGnbB}G%YYV>L<l+54
z8~WFiy7_H<j{%$wuUI+OpcK<STmN~xR&T^>bLTeK;z*QKJ3j2zf;S#^Yq4VwyVX&T
z54$ne<zaWeYX5fEZpWLZm#RJV){^FUSch5u(}Ama=*kL~$i)N2;`E*F-rW4;<;lrA
z_WsHG4CUKnnYH#_(TXz|;9*mL`tVy{Jn)e(A9&w^NyRIZbNtX7U)*)#;!Rrg@}W2O
zudbe1cd20MrYElVV%|ptw#IlZ!0n;OG;L;gd$(Ba#RK*3Oz3yEx^u(u<q?<XojrTi
z{`1ND{@=w~_ZjxKfurMhYe1di#mwCS<gOor9&9$|J)r;h_GO!KE3Z0J=KFvrzIbz2
zt?MP*w0Yjk2i;W?Yk<a`r>k7|$Z~At(dw|ng*M{6>Ft@?*}L{{U0%%6Q(NtXQA<Ut
zN96gg<o<pG%eyl3+Z(v%<G-E#^{=b;H|31wB&hpfu-ty1>)(X$UsFMcqr>0Z(-#im
zTyIIa=WV;4``?et!TO(jlRysE|IbGoReAJpkLI)KXjOHq>0~mRcu_z-ah%7rnJ&id
zc;5AGJ6<iSrFV``s&UiLyUA+0s4H&=@YOKsT1W1y^^b6UT8>ElKD#R){hQMwhX3dB
zqh(*s`fAlSO}FS4^TnuNjb`4{R4s=|>pj*EfgcuCH>-THTCTj4U_P5Hn&o^pTh7L-
zM(eY7I-m9Ryq-^&tG=C$#+`oD!w8CBRnt{Bo-OOe$iL09_SS=b)J|62a=utiz4ED<
zX=2`vC*zrS9n70yQLn0MIvqxRqjOc`{ZR9%e}>uAFcy8=3`6hb>dmyDuck{6TrD)=
zE?0Q3)Uq1JlSMV382xzOWD*vur9sTwZZ`Jzh043C+PbaB%cXXG($Bh422yoivCwy`
zZfZpBWY$k+3kRH;fbn?JPnY9mYv`-ltR1)Wdbw<utJyGXt4Y1A>g9N@iLv)McuYHM
zs>!JCoB68sitp)s>^<Pscs4V*el{JC$IE8995-Fvjfds5>Dr|!o-Pe!cj>2XyXw1U
zF<lLHSNGFyIhoD6W%}QYXI(vAcGav}4b@`qxmKsK4$a7m$A_U?4w>1Tmwxv_9=}*L
zv&Cp^;=Ae8|Jr=kTkmn*Px^XR50<;DXKmw!Uh{6{W%u2x_6o1ra@8IDpn2cV&CpbG
zt@bQ$v+#<CnPtptE&A26Uk$T)S2xS)Y*Kk?*lIo+mW$cA9;%VIqi2c_8&SXP`>tJB
z$ay~*hUseAw99HVp7%{PYOC3}ZTe9&8m#AdGM$W?$z(DeHPdcHH2UUtt=XNrzV1h)
zd)AL8)vOu35N&8WV$rm-g|~VvBX@(fuDYh3uWDB`vuZLS5aeOHIDA9|eALwQsvTC7
zc{?>-)28-@wN+z?t=~tJ`P_4;KUtUzwHK-px6yL4TFt#z{@|&bOjf31@Iw1;T2HHm
zH`<dtIxy;*VKtp~)tG8FeKqa%qH3q(ZaG>mbY|5PhsnVYnhov9Yu{Flwa>dx+J4e5
zErd0g%}K|&?mTfZ>zKce9Wji#)o1f&%f4CE2R~>^uIpJf9?i|!YDu;=v7n<Pub-RF
z*r#^1m`%uK(>5zBIkf$B-qZ`4I$ABJ2R~@&CJpT{L9FzYl_XUR=CBx=c49K8lVLQQ
z8^pYyGZHKd8#OYC(-CnP9WHg#&Z}d_6$=nUIA~%yVZv9_D(1hMG6MVt8#`*ddADGR
z7xkb^^M(J7inTjTkC>T`QClqP1(6-qay+AnXK@*Iz3k`H*{H8-!)1c1mZ=!cr*&<8
zXkXn<4j<919~P?-?U_y~Q*mmQH{YxplD(QNXR~HGnUCA47w6QJYs^5?gT=J<9YH@_
zk1R2dH03N7ZPPM)lLc$e$E`YUqi3Ec3%}30$z;Yh4CB?TACJ3!%s9;J+2KZYKJMGT
z>brh1=|^U2(a+d3^1G;pt{D%L<&-m|#{H^UE@*bu6GJZp^1+mD94vKg=%kwSxG+Fd
zjTa*?U7Yf#6TMwc`k||r)1etLL)EgCrDJ`0y2;qkc%f=I_(7w=4A6Y`t{W}2z8Ehk
z(lFxOIJ%h;jJu(uLkvR2lN0QTFNP&+bRY5NXs6Saxnbydyw)SSVcC#oAYrl?E$56+
zT=Hbva)`5m751u0ki^)=!|31<d3$9wwCv1m1xAd39fq!+4)a+9sni{d-A}rXn~SAr
z2i9~NpV#n<D+uG@2X&fb!bY?<2AK_80ABqp;=x)^hw*Ymo7tQivg?RO?J%23<N7&(
z&>#Guem(+Aps~@)z+k|M?W)z3f3LvCc|U-LORtaedd~4|JRKJ8YTS<eHDfU*-Qjw)
zAOPKjY>ffG`LG-<s<!3wfUgCFHgH!RS)5HKk@f|T4{S9J1Tm^tMC0HQk+-qOFgmRz
zAA=p!*=huj_R~o>VgK3%E%h3$Ma?&YR11i-WueBc&z6U;Q8UaIi`lSh#;nkotp=-E
zfqFE|_`&I_nnOs_<#JWCdIN(6Zm!1N0#J$(ULHImZf-J-#=?%(h^rV@eb2;!4&YRo
zzSW`w!AA@JHO)iHqkb}hi&u+#_@mnE#75pLR#nXOoZ7Q#%dYF2@pNW1Ue$_fACIbj
zR(TQGq5)M~rW*<y0*Vgzu%kuW)?8TC%|}#)3z&`;qhVsI=FI45WJ$yY{j`F67Ikbb
zyEg*K`KIx3IDlNv;2i*N%7re+6Slk=PuN$$x9Zx;V8I7wgL51~lPoFm<9_=NJgOIg
z`G+~a>1;mh=2O9gWtow?ddcBcZ64H!Ddq#<B9xgnV|ahO1bxPALJdDw!)koEcn`B-
zPWxeDhHY4QiLTorx(R_3Lio?JuIgq*w<e=y*Gy+Y|9xB4)ZDiRk7(7dMyx&~RyDN%
zvY%I+g8*sXj{0ud)=Lj>7T~dW%ZcC`7kcrWx6utl%Uc}$ATW9%TAI4cx{te6-d5)=
zzcZkvnbZ&^EV69pi}`c~n~!D{4+4tu#G<I#;Zrx6HS+<ct}L`S<1IXE)_6x=FOCzc
zjTYT<wHmd3$DV_D-kV3|q?QB~tL3sj+^BZ^>oA@4trr|~2{psX7ZLYKU4!?PmEjyF
z3B+rLPV_kC5|>aBGdR?T8`XNU9CJnqA>p9-(J6Ez+%ifAeP9InLHMVpM*^pIKAH#w
z8&B`4Qg!PZJ(`WWZsp36>G85<dcx-<8WCOA%h_l?=LAjFYTnJ4?2#~a29H4BK>u_e
zbKr%8qxoXlhy@f61)h<hzMYS$m)8+8^TW8C&MV<+$GbUgaNyPi<4fpsSZZQ7cpA^S
zB!N-YEheLck`=SJBB-M9k-@d|rUT5DV8o&kd@Okr>(>aN>lxL!eYnk}9nEKTJDQ3i
zrqJj#P9aesV>*mQ0Al8rkr!b!;1}ec)x>?Y!k)q^48yEiaLrR*cwG9`vIlj?Q&#*!
zS5F$jDO`sJ7zBI6oK$<lfOg>E6AKNX<`NnM#!bwKmEcP#IYa9;*{B+J3A84siAPL6
zSk@Vwb%AdRIy3GCX&zu-LNy{4V2Yr5y5NkMb#b8y8j-vSxWWxuT}#vPhD+)j>pHD!
zbdE2pS{TVJgYvz07F|6C8;7xFqW*Jo-V!a6CuE@bEGgBQMkl$_F4zGb<CB@Mt*vmK
zO{CZr=s$*+hzvL|NhB8@XT?G-TBDt$357JwC<}^C0!3HT217C)&vQvV5>GO4BVjb3
zV8XB}CN^<|KxZ_fd74<&!*tQ~R1XcZh)T0m!qJs}Ff=A;0?N_zF&PE9>!x2q?ueF|
z<u1N6s7U8luu3y>FNg`PGE5Bm6ohR|krC>ZTXQ?)F~zC~cfE&mkzU~B;I+E;p7SNd
zgYIG>qF&QrQmX|AQ<MsE(o9WLW8Cu*d)+i%e?E#_)ZNqqP~2%C=z?@}A6ON1oS<{4
zG&wYx$q5J1(GG!R+Zlb}YQK!^3t>1@?+k4Px7~OiKVc<TFnU!l7J}U#?4QP!&&;J>
z6}pN!7R?*UWn~;OF{qYtjN`bW=sX%nG$5JCHsM+@p$h{Vh{ecD+s9}^besj{&AZ$E
zgLNBsIGhP+X2CL4(=i%RCnA8j5K&N#e!7|tL=}@KSSDygJDZS|p5xv%9L<VvuKCSq
z!UP2<Fzvwqg>_r#)uI;6BP?-&L8VBN6`dTX$GmiZI~npwKs%qJg^)!{IyFXWaF45L
zNQBu8Nl+7rITC3xVW;9qJMmkaIKN+j43?&8(6eLn$na%_#VL>j8H)Lt4PbYKyNab>
zB2@%rLRl`CGl4TkT+{AwVI90x6MAKC33%if5mPX)2{s3d1Vk$d_5@;;xnWxbNodx(
z5lh@2N<IRc1deEnS;PI4TdHr?M0Hkx`VaLe+$Z9MqVu1PnQ5jg;2v8#E9@Ub#I>_N
z{bV`snSr4ecOo?`f{Qs7xCJkZhbEFJ5LnZU1)c{>MVP5gEkfmJ7Lzd(Htm`v4wx+R
zfU`NsXPT#wiqH>V8i&Vbj$=WE|9y;{uuPycaurp_;W*@G2~Bk<w{8VK;aG!1XEi`D
z$M3-1h=9fuQ8mpZZo0DU#v1C0s*!W79c$f*a?r#yV`7PMLfrbaUn~XHs3jb=iD)3}
zpfOl}g`*oKq7&a$BW{{_;*vUklag|h7;@;63qS}=ma8e?xSV#gMN`f6Vt45W3O(RJ
zmRP>3hd5zQ<TaL^Z5lcpwa{VI1?sjf*1K<p$uL8sV)F-)pbp&(c(LX%<z%GuBQzLo
z7BrE0rX5b~Oc^^nt{2vbQNl8gFz=%TD?~dH*X6!~3bRHJCYckfH=EEkP9MNsAfSxR
z+l|E}NLhpBmB$MafQeou(!K-uJz@-JV8XH&EYBAcCISeW<J)M3hyox-ugv0Xd?$eB
zy91?Yh|r`izIf4fJXeA)uqG4QfWaI?D;`=1jyQdhD(i?!rJ?$dzgYHIRCtJMF`3w+
zs<Y@x5(t-u#{bPaBFY+xs{}S&@~UO&yu7)RcpxVT)Dcb=k6A}RfF83$dvF@)lci<k
zPI3JW)L+qEYaJR0<-oL|zv~dprfjIk1UH7ZTTL3Uy&d9+MJ0pzZ25BbzzBddfOyQ{
zu~TE_hlDU1mac^&X-o`4H8pPn8!Ar;gwP~=pi*@W8Lse(3uvNgs>(e8&V(nL%kT7=
z?%6c)`>vScUU>Xv$0N1!7~FQ1e&fRd@=&*6D}z8&@jybSSjRvVu+s`ww?~?fz@??x
zfaJ~KL?gAVh;<ZIOc+v4@a8(&1V#2394QkZ5mv&{h}X)D=}yf;RRgR54Dr^?M&;8b
zO-aPa;7CjHuS@9^o*ScN5Qf?<rfFgcc`q>@C=>}RPoB=9p#c{}m`x*;qcavr=(~VW
zhLKT92uypPO_Y0i#wL6y_hcl5$g8~>uchQ2bHo^R2rb%<^+e=hoqz+-3meG-)ts$t
zoetfs*t<)E_nTTBYtV!bNp21-#^v(lv~vKT=p%^Sk0%lebp=TH9&W~kN`l?`phxUE
z^`(q_Ez^PEZoHrz=n#4>C%}~EVt{-2F7wHU$v2{HS!mcg_K5(3-^}<FDT49ufFB~U
zV&&&BvLq(qw!BjyOAG;oGV*ii7+ox2i7=xFDKKX<g6SAnp_sg(Da5&=bcAZ~x8(~%
zit39^?Gw>;btONv3LcQu7z;f(JW-_eq~YA27<JN5V4+pRo61Xo8YCLCi(X|QkaI*4
zu@bEm^0jzL=}JO2$(l=i;t8eEkfErF1?s#r^`ePZ5(i5XH8$^)T3AuMV6y<jnSl=5
z4LVNIs&k$==!=q8^Q2}W9;jcGE=HtdFc8TdtV1!OAfSg*eq;eef|=#VJwUuP7obE%
zP=8RK{}V#8p@L<G4i71vI4SE5RaKIs)<B>%B*VxL(N;4_xEWgRa4A#(-W%8oM<vjc
zIiB%7xNLJV1CT`%xC*|PG(q;P9nOrhtt2$D{n8W?WPreU)-S+bnO0QTl+WjQHGzAO
zaz-+;_sdm82Sl}M_#`uF)*$K@vYlt~8T|>6JBUgJKH}sgId;`R^aM`MQPS9!@dRKQ
zmyj&j#B*2#69JcWye${V2ICbcWQ<qPr`z@Ik@x{6Bp8v?N&X62U~=cypDPh115F&n
zTrOo`rzD(#LE%ag&^&AszmG(Rp_rnZWHRX>LC2yIj}w_raz*UU*7Ox!k^V(V32TyG
z#;5e)l_pSjY@VB^qJnlg!d7|?D9`~A$TCT3Gf6XzQN9LrU7^;&T5uQ57#SYpoCSY8
zhU~Q<#%)tmfGJ>s=OYjA7bv%;T3ToERwJlE!IQYzOxkk~z2JJ;Eiq!hut<qHEAU^i
zjIcAyl3(D8U>o+I_i|R9fOR&WBzfJ8xLzGP%*ZXV_n24#t*!zg=p~31!Xll#F`Fk0
zmmnh;;vzW(MwRqnAN8hR-eu&-YA6k{>0-hXB)08HkSdFLqb_0EBvex;z{UkoOswjX
zfn$Znp;R)jxP43mc3{P^%GG0A=2n26NB%+Y$^uphFgnJ(SLom{kkle!1O3zlMr4p&
z=EjoOgT2e_0g<pHV;dwa8VIo#P6Lp~n@A`Kj$uyuIZXsW1{Yw+I05)@ETz`q>WJ8?
zffQz<2$cv0G%ZC~+(AfBAhTgc6T=%Y`kp%((@E%{?Z&Dz7)mgL6vXt3{*%^?k5xu7
zBn^tQ627Dq<FZyFfJ1MKk3|8-z?`lG@Jn?PXlhPMmJdjs35zDkT@cbgbPCE$E+!It
zvw%E8`tob6F9_2ydjgSI?jD5)U-1W0uOv`u%2+}!d_M#omL=d+ETwhPhX7hJ3}mSl
zq-cT<1fMXeMk--BAuBl$6GFQylgMC7@6Z-_D}n`H8b~TC`Y|IEtB-X;+^KWus^pnX
zy6l$VN}wo|0zOEpa*hczJPY)wRA+D>&=><6_6rrsw2XNi2#ZZ+8OicWMZ?g{<yWXT
z+hc7)R?Z`UV8B8RhpHZhI9wD8IArEjtS6ZjXdvs#!ct0+HyjB0uoV(l6{2&9^x$UT
z6Uz%xFc(wdm1-0$i3x!wP(^G(g?dOOKsXJ~#Y%!OHDA1nTObTUAnI|15vD=Vk{~9!
zvzk<Ke)85l1e7zH!&Ug&f!v$<0p{;w<S-;iege0Y3D6%hPuY{59<RjKQ~|g^eYAWL
zm{2io6p|lX;p!-sCgcl<l>{g>SP3?hz@j7mNkM|}&7`PKG7&VA&~n>oa_ObiH~`C<
z;B-auLJ8ekGAx+2He@PiS@SN+6C|x@4q|O-tywraB_>LKkxj}#B!Wevd<~Q?H5M9x
zR*L3Pr52~dJFvlVsp1=H_Ry$;{Tb-6V(ubZooTKXLT7YsAMR#FF{k38kUau4q_DMN
zVQ42iLiopo3d<FTDO$=vL?sL*>5|At8l-+89J(+LyRmX1B`4uv1rQ=@6Tcv?mvmh<
z^$-noX(fG+!odO}ea#)vCnuH&2?;+09EQ&JEPBODkXnoiCf->4060;XMUzAdmo%4p
zl_Z==T?(2|V`3j7-$T8HxC1u?a!@7zLB7U|l9gBMg`1bPBM<mbk{>p9%IXV^v1xN1
z;)l3L;c+js+VU1;pEF2#TM0oBY-q=EkjRuy^!#o@FwsARDr`v404rbdWsUrU^eW<K
zNe;2UNhsjm*bv1S7?l)vpy}zYtn`ZQMe_o^p^}9sSUDjA(11Wj2p}K?i&>F@h%vi!
z<!W&zz)3&1wD={^fl(!wZSF`mxnB&v!itP|<N#&PR1?S{K_#RoAfr6WpX7jN4YP;i
zhtFNU5Z#;OQZ57#GFy0XLMyPH#N>!;;a~vUx>ckIW5|*MB@1RHP$boSaVLnj<wB{R
z3&l<o7!RX8%0Q-L`BXaB3dck=Mk2pa&6HxzMVgGWdkqPWM2WDV%6%9UcDio-|16@V
z?^aZ5$edzpVLky8re1XbvxN6h{Q(Oh8qi0^!@q|%XSJ|Iq)!tlS_LAUrR*~yA6JYm
zutwWM?C`j$o5ShNm<O_gI<UM+GDuOPXd@R49_c2_G9^k57%{RS*9~vT;zns@4d_5C
zpuhr#khUWiNCsUQhs;GHQY;d5oD7Di&gKG>RQ}Kdfn)e(ET-O*H6~afnz<WIn^Y6_
znF}qjfPAXJH<2rd2`s7!4dXwRs}w<M6Uo9bhK82X<woNYutm!_0X&Oj83p8>de~#y
zVLQMY^T&Y!hoiF6q6DRezQ()pin0>y$4nMg6KoNkr7>n7qGTUMxtYMKm;LP!XBAr*
zeE|9e9Q<|VlT?4gfnhcufv>cARY0fUi@qymVyKg9?1U1i+EBZ&BL|f%O%gUd^%y4s
z+?2VP%a^8fa*A{p$0oEeXegeSr7fIG5_CM9gr+Lem>*@6Bm9vHr4l`h$~B=NZ`Ca1
zLfB-s6~lo2K@-Y}3kMK=aMolARw0EUV|G_tyj;nugjnJ?4Ks3V66Fqn;ebnlD?N!I
z1QsyI93zjm1a=TF)C{#4GDuoVEdigHktA)P){!wZ^B6;}kOPt$rL!8COEW`AtQJpC
z?eXLVk<qCja|OA^gxwh7Ll}=vI3F-cPyjU(jvJ=J&^%UX0t$c+kz>6`3@O}M#Kd-#
zjTVv{A$c$$zJXZDoiU+pmym@QB)O{G&>hMy3Q$6_qtjS(&;WD9c}O1skW(4nxcPCr
zA{vOqlv_!Q0!LVqh&uRaQS?HG=~=@8v%smcNETnRBT!XcjHr%wv)69H#4A7~rK}V9
z9XQ?vqL^$L9M2DX;xGw}yk^bD0F0bBzK~6Y<dGrVQ{oS@#g|GSaTnuAXQN0JJ76q{
z2eC-0PUfi+|HO*Hu#%KOJ0~h3gozb0Q3b|Gby7)6a;P*7pUW(gQOw>934pJhFw5+{
za$x}jqA52?ozPI8Q~E^-H?J2iyW=yN7E!-)6fR33ibhib(<%28!IfB5i6+;Cokkz8
zaD(g#3SYQg#qbHA!@mJ2Vo#<`fHBk(x_t<_ly-7z(g_$6)wQWRXw{ymtFv$jjS^7u
z@B$JA!PH8x0mMOwW<ab=z;lWwmt3UM0uDvWKLskpL??wDrJ!+zjN~NY@8k*~WCc|T
z(6CFK8L+6j&|;g{SU$mX+$JXj84#Lj;2KHeddWUzLpHE8D0NnajYv&7Du(5hK;a_s
zSILsWf+Rp%w;n@LX@bj8*gz?eOw2W&X_oSKj}WkoczARXb{>VG<Wb7LAZUvtA?HbP
z0#Xqn9=Qj+2S^sLBrh3|%fuj@p``_@4%rfIv35#C=(PCR^pB!ua5{Jmsgg8&9Oju#
zNV)d3m2#D57k5vrSVjvhu^t8rSIn)60CX#zkS~H#WQ1hlB7k-L4H&J8QEiOS2CFD}
zA*))&#nb=~SRfvxLz#;~yhB~EZM3a&5vVLFCe~NXB0nbAs^hvnVw@F9bGRfUCF`i7
zJ|-t&E#JW}2zcp151SzNQ^?JYY6bnqqsMr&*K9(f!8l$hkK_lsf;K6=2C_h4VHGHj
z(}65OX0{k>z{V(1VcR1p(LWYY0$J`gmH(Q^^q47vo6E&CSaZ2@1x*r&)iU)2^1E!R
zT@h$3E&?N`QYWmNGR4@7sGSsRQlmm3ac3|jyqsK`kc*{a7u}yyuLby`B$x?hZ84>A
zX{?r-d{_c%Or~+6A7GY^2SA)>D(~cIRTM+?0#%_1W_*VBlDsw<qLr+Oc#{|~YJzoe
z0zINyl(kdxsvJk;06t1I%7G<pOnw`MWQ>7UP(zsu&<=+Hy)l^hGEoakS@KfCQ|t|Z
zn^}5}4-n`YKyr^<u*!bo-A2u<FRxFP(FXlc3q(<J6an7~ha+X;P!i``2^AvtTEHgY
zRElgwPsJ4hFp@wZVn{x-Nd^(5@duy}YC|fWqu`K)4kB>|P@l~PNwTJ8MMyrg+bIA?
zkff#p#8W&;kHIb3uaS5MxgoEVWCNu`uuH3xx>`(FY-jdBFfrJ#XsbFY1<5Gt6qkVO
zJqN`DN~){HWla(<voy8LYLLmg@Pqz}ZIjuN*Ra(h*+${8SOA?waKS;=2dWb}$oz=F
zn7CTya6|e^NRtWx!81xc83$;JmX{Qrax$)o{g4NhJ4Dg}V4Mh}VBv8?U|w5#F(Ztr
zprDNGK6(xDEd@XrWD^-504R0~%m75-PJtoTZ=n|eKX`3XZKQ~ga-ZxszX(hTgOCO2
zqLrw1YTBnOvV@*kAS|_<Ny7o52H9>+fE5xSC{QC5@FN};ya%f}vONT&E@Z+{QVC{5
zjR2Ag2sAB<8Ke@%QTFVzFt(6eLKqVO;7x_fbVQK`Izm8Veg-+-02LEL$ru;9&ym!z
z;Ng4_F0yOvW-1&69YR+jE1odv6XqGb)K{SbXGnQX9PUOHH%A;D0RZKDCg8=0e`4+#
z2?o7FVK7z1Gi5@Q4t*tu$9f_b*5nYog0<5GzHFhF(3di=<j+brkq8LK^hwejsDKkp
ztg?;;e-*MEMh@32qSr*l3SnMFvit>b$t)6xP9_uj1-+7V7H0#UN*_RG%sjhB*|ST?
z%xVHTC~us-O!%!4(uO?{asoaXK8*%!Lt|rE=gR+6bnXv@0SuHUCg6r}qy!2zry2&s
z1<}H1LMZ@E=#1`1SLqeoBy|CbQ1s-)<X7XnH6gn8xMVh#iQVN2B|IUKq$;Z9_vJl#
zWrYQu&}a&mq_%`w)-WE*P!rkU#j=jv&kQly{2Z&o=0jPaiOwhiV!NPB#zH}dQKQq6
zuN72BIurX!F3%XD6gIO_#D^*2M>q<lA<Sq=p&?g1ma9Snv5Aa^`t`D<2z*GzfI4I0
zy?l$l$rFoMte*ep4nk9<a7B#}z5#Qn7)&;f3y+J<K)`xNBAyyE1@M~^o@hyrw3#%B
zi%BqGEggfAUCDB(y-rC5Ry>PpR&b0M5xHRHUmz)Sz*3<;Xo0$?;^5dut2AlYUpXxD
zZ_+Ic6RHWM9#%^jl%x^d1zqqlf*G!b7}$O$dP$}P6p~j+k#BHD2+LG1#hXciQ(p@R
z7q#-v3#79>7~x6<zUf@H(b!W(bHFsRDiC2(#HsXsS|AFLE(az1E<S{p=pS)X<%I=Y
z0)BqL6Xp7%I?fXHnfeCCGBG_((Th>)(<niT)5L*hNF9#dPf`S27alkDugFiRnlTUt
z38pX)90L*)z)KU%t9%JZiry29noCH@q-F~qrjJIbQnl!C6!(O}6Rn`v$*8SdCDg^!
z%P8ZfRTlFyWqVknCI~hK^;{)$V<E+iAv}SI5KW1P6xJ$x)Qb=fGD*OMB$IF)z~OV%
z;YtpNg>OV{Y`v07pcan`XGqeAibcBf^O~?H!PJaVlopVLiajwba2HrvP^9#~dYlvp
zzz~q=B)L@l7|Uv`nF~-q<q$G<a2-95V`Jn{xu`u*q)()xfNo5aiFLvjKwIh+qT(1z
zoQl#UNM)-QdK$R|_Is`%m$Q)(Wx`eXW;>-)Th>*Kljs5gm!Kn>N^-3Nen)!U%;A6|
zop@O!Hm-x0Oce~U6wSoVG1DkiK{4tvc2*OlSJ@DvH3SPyOE@dA;$HAA%86BE!d&!I
z&I*yk8Z48Kwn@n9s4+<|z`!nvGJGQaRbS6Y3(e#*!6RHk3U?F*qG5S|z9pFp#BC=*
zm5hWY800#+WTmNPYoA3#{ir0M+U)DN<Qv4C=zwH#h%EOh46|<8Nt8%{DyovOohEJ<
z03EBI&mK^Lh(tCu1ux8(+Rh%FB`4WxiZozlW$%W>BiwnmCBfH`7(_U)A_nB&gtTz9
z2nsuyZL7(_5q-~OM^n`k`oGYG3QcLM;sq8)s3Ap`aytvqtFsp@v7^uq_>jCiUywZ&
z7y)M0`mS|^krvIP<g#fCdJZou>kV9RhNZL==3~&ZIT+=IEn!)?`#?<8je%J4)N4i|
z*cmmoLJN6#7y|59Y-5qkJrl<l!|e(LFl5Yas7N)WnF}l`=a`KE@&&1#ZRAyuK&j_N
z6=t_A9IPDHJ_urr5~uqD{{|JQz%t;#@?p-+7LD})G#S=rq_D;|24zR7TA?ty#3`bQ
z<Wg8S79vEeY+sttd0RiN1|*K(GeHWRsRx0?tD$~?YI#`&Y?9_NxKr%4cwbUqHlff#
z3`DK;3bBwF*(^_m#*|3U5)6sJW}yU!IjMm!Mf&Dh#z!);@H&~!lo`33<O&+u>14%~
zq=#u3p(5<ihWg`0fpR`OHE3XhygCLGKG1~dQtp?pmio3U4|!)+cm^o~(K4au-T5VX
zn`D*k>;R$dn-ldV2hyzPLTMB~BL#p#O0`U{xYP70USKTXC#KgPaLFvofC2RhpT=H+
zAGV<AMYth4iy2pQAvtD!A#C!fc8h1qMotB`n1Ix3Hi}buNm8g@TRp*=lp>`n&;Sy-
z_!8MFol}cUkEQ=A!7Uh#jK$%QFM&bJ1VhTIJ<zx?hF+L7^cqJAS*@^jushaD85<3z
z_6#j#AeMk7Q`MY8KVCeAkupqT0Zs6d{3G8ld4wz^X3P^dlQPS}A!mhHDX9=zF)An*
zPXe0&A-aSP(*$8Bvi_gxF@6C6hY7<7f>Q4(C9h3IiF`BE(P0K+D1;Uw{6G#(D70e_
z086R$T9HknKQ1VgOIQu{HBbs30_iIML0km}vJNd~L#C(Xe(m_?NRz2!DMRZEn^O?Q
z@eoK(hYih=DQryyCO{K+iu7RdgzN=0;<!B%>_>Y}qFo7qh&{SO4WQiwiB@FDDr6}<
zGePuX`GgfXRw-%&A${rzJ60=kKc8Rf-RVC?9m!w`kN_WuOO{nSPwyofRT3rjh>gv3
zda9}Af22kv#8b6mh^PpP0hZfLf}msxQx7AZU#ef%$!uC;+R}t5DrAeG6!$78ltj#e
z*~~_Bt@2!?P$m;uCY<1P)lPzkidj&hvskSqMw7+2Vv-LE4mpF=iy^H*G}?faM%8oq
zs^{rQia^O7e`ehj8b-|k4S7~HdqExuV{|*?NIThc1vq$cnk$}+fq)&=Lzc~rsnq~X
zvLZ}`3U$khfV6!aRO9l4H?sp1hiF2qW@1iau6C1O;GQWpnx1=&jv$OQ7?i?s5grLZ
zY=s05lY*PnEgnsrMO$zI_D-N}m_0F!9E<dcCfErxP4|E~k71$`V=;c>7$4Z&Wl0dY
zYQ_jMG^55(=2U{W5J!=VQdxwzRX-;p2NEM6JUu2%5dt{`2sBa7QxGoD6b08{8ZVSB
zCc)rPe<C@4Q2H4iWGHeHKx!%%W%KC+AO`I5LWyQTH~5up#|@z6qwLuYkU|uCM(Pm-
z!C8W1wX~=j`I`iMCUJpmOLZ)&CVWl_?`Kv!O%MW-XEs!Bs8gd}Tp%RQ4Q3;D7zI|;
z7AF`_)e~mJx|2-0kTh@RBBguw3JDOoUakPtW^i$pDIujELMYLaV#$1!WG;gU=`iI$
z&msd+*Djrx%yKHBku-K_N%ugRGy1LbNE3yFdLa>D#e_3pCB%q`OnxlANU5T{EIi9d
z6rO+#n`>pO>U>y?9IoLQ0Cil@7A8pY$NvBu5WLWYfPpe2#IX`S*-1we2=+q40Jyeu
zFtyUE8nQhO7XW;u{4|@`^fwtFy^zRcq-8DS14)9+5G3X-4K-G&!M4$kc^3{S3}dE6
z=ETix5oE}b{nA99FTfTSak-$G!VSbtHt<7tIOFiMn6+%RB%#<oyazNW&1a7l52*?E
zL{69e2gNKVGoRc5TGQzycxlp+FhL~B=<s85BdAYCPu7u(EBO&1NYimx#8xQfiGpOF
zPc5+p<pcm6%ogS;EV+1ydqtpx?vVS6vL}yD;K4uOnafDT1L?yWtTom^=2pJJ7z<Np
z?Enl&N#>ci74K^z5RJ75OBglz>68*FnN;+_gRAP}5siU-z?ll%$1nv<0F(kTFhs!@
zXmNYb6&zAu2$eP<2LulQ509M$5*8y2r@8_;5$2mGr4y=dQdFcDKtfJ45F<(y0Jh9V
z6rTiu15WV3`7zYA0Nb7j7n>p40lc^_*_=2;*NL0(yX>nv9>7r(p$ND`b0dy49lSZ~
z%>;uM;zI>QvMj<M;-6mR+y;a!E?kUArIMP;);STS28jy8AtjvcQa!}OZILab@&*1g
z(<%7?3-NJCWLSeUlrPck93qj51}(veWG#s>z)gT6{AAuhb_$odu*D+rLv4eFRA_c2
zlWmn!B5r6%dYO3O(8Hh-e08#f2(`~+3Y4^|36!oB3>zgb%tm{WjmQO|rPzdck*lTM
z9voFN&`86iu}g`RC>^1aN-3#j#ZVG|#;VAG6H9VMV4V%Kf<UKg08OlagkM|_0try~
zX3mmXijJTQQiCN@7N3czM9Feg27^2iif5NU_Fqp03fU9J&jvr45|F^TG8xE!OXs<C
z_MnL*r^@am2h{e#)-zcapnPNI<UX+0>>i#y=T%4v@!Z*v!G3HOl{sU_BtvCh#Cdd{
z4Tn|GY3jzvLGpEIa7i@hL!|Unc<ET5Y#@rVBWi&B1b=8+PCn=cFNu~@*djC+GD5rz
zzM#hrS{6>;hV{-tPrPQrezKs-O%Q;i&@^C>?LUGm6*Md~lq23{wL;di+BqPG5Xx=Q
z33OOQD;tZI1IU51Tp}o{rTkuL4nJ@FyrOC!!%0$GVGoZh@2)n2en@l_@&UU*QjIrd
zh`^qm=5lmW{?I%^GRDci53Hv=ktXm&3wa>w9qgn&Krg6vwp(C<xC+2nx;VSZ)Ju3+
z%vcvBAMl952vf*60cD^us3D-%1Vm071jFHZJW4pI8Ys*~c3|0~z^yQb%EWYCk{()s
zj1%WrTnXGXp>jhoY!?IdgK(5M+C3)EiE&V*idYKrvw7LH3bC@iO5}p=hdzw0_*BJ>
zY+Ew(**C#_A%+w9fF&rL)E#$8cA(bHNj4INMUy1UHVME|FW4}vN(h9Yyn{+Ql!&w(
z=D>!ekWu&!hE!1yfsrl9jwf{<p!^aM6?RSNz%HW*M9YcvkpgCsge99Q;8WCzs8OJq
z7==YoHrMGpfp)w|A!3x{Cc`C+Ofd)8q8`y2iQ|Mw9IA+m4+{_!c_GYg0><J>;O49w
zNf5mdmN0Z!nk0HiyJ``>SY4r{9)Hv!)360N04`rRiqD5mWq!dZ6zVbq0cS!!n&N;y
zsL$a<ramDA8Dg$YFLVI$1icf;p5sv|rxKxXXqSs>Jx(!|HIYcN#lwjlpg<xWELs9(
z%p&9xG%8Qc7^HfV=;MKyQsdL1yf3PK^Y+w9aZaF%A5l{TPAcLsGaLsp%ANrHp(v5{
zCFIGq^B@u*a{8>acvL+RTIZ2-=BQ5gCD<C6C7{owN1lZ|iA61){E(#*CYeeR2-htO
zYMBeCh>OuBYytNN(})|e$q~R5!`nCDd#oqE8on@hsZ~eQ<A1Yb6_=y-L4~a*8ex%$
zn{29bv1wL{S#cF69AHhB$nvWDLLmY7GY~(MYh~3VBW<v^=>_|u&=l4bZYn0hwjd&y
zA(=CLCrBdz1KgB;C-)6XT1e(Lp&?S$V()HBkfusWebP(9T_D;96q!Q1&9avwlgd#-
z_e9H6bpwa1ipRcdklenVy_J%@Vig0$g$4kWcvi73^2L64+NE$@HX4Ou*QxM8F5GHb
zkyJVY2E)io?e@-Nfxpo6%EM>W40Q|OBoRob$W$PQY+Z7sbQZ%TuMUnou|?LgjoG~<
zN4RuWkJ3A~00_uNCf3|RhJtj&q+pWKOoAS}ojE~}u*qQpFcg!;UhmRnj(|Bqbt&>i
zNFrou1VO=+At@P0Xj^4I&?eTR5@54<X~-_#Sh3yS$rOQ_j<iFK3$b%rPl~aFmOKGQ
z6;2Rwc?SiKOfjNX1g6kmwVgcu{@eusg;cVWIIIg#Wa3@zU?gxUX4%Ig#MD=+2~LrL
z(48={H9>28y@SZ<sg1Wp7o<`uVndBXcKD-I;j6w3$&3i&IZ`f9GZjX_RScGg%=YGv
zd&9U1F>G9h-s903784*`;o})IJqFK+Z%H(UA4)Yxs@Kt1L5#a|m!1DaI5Y^LOj2ZZ
zl1D(A%6{37gQQPd&n6+v81IS-$=N_C`0QNj_j)$~(b!6RQ#*l367f0Bj!tKfn!p&)
z7J<``6rM}oh#q-1G+5|3$&<a_nK&f_j0~f$0FDg=RaD}H5lA9k$veKsel2{1j3~ru
z%EUwX0oBa)YOi-Lk*~>Op&8*&6?Y&HQZy_iVngL%Y%4cytjq)2Q{cx^5LbK1;xTsT
zPEZZ*Cu<b<YV`nK2|R&Pj)Y-oq}|jcz%F6}Ng=rscAY&>ZqO?4_0ASdrTGdAfH7Lc
zNJuO4YC-ffs0n51=nF~MoP)-TGS+AcTM@{WuxWqpViS?^*eF#8szW3P#r&cs(97`T
zgD{Y>2GBU7aO8S|<*fn&N)j>EyGO7eRwbqpmjy?PFE|}>5A*6kB?(8RTfB%6PXPh)
z2JFKBCnOQ<H?g{@aN{g+g(xQ+ecADl4<RXeU?q6mkrA*VcCN}@Bg_m;P$r{cIW=Ma
z5Ht#QLla;pAt1bt90I_Flj7JcJ!z98mjto9$3;?J_V|a)C}n*J0G|X4m=uAT$&~13
z-<dPfzGGNIj$&z;7xqYG&$pQhi=ZQu%x$(JnST;N0WmxxQZzqqw*=!-1k^^f%xgiW
z<~PQIDKb5H7xSnI9FGJK$#r@J^2B7z{c!jQWL12^A~BpIL*|9*+w>liO9c<;Yz0u3
zngH_DPKZy@Yn*^u7@+}VOi3I<!fkV5sP$MoS$8Zzn1)au&>%mQz(6S^6VEp|Edale
zYAz@cjhZqzP6*0E&#5^{Z6|}@QF99{E>$k<yr0Yk`zR&=kgzb8(J*W+P>6|5R0JU_
z6h1&eU+PY%nhcks5XVai9@oh{rSODESSjBluz_MhIAJGNKxr6`7)zXk@Dy-SK~NNW
z2d|9Uo&=6SFOt)ONEwwBDK$C&R!&%mVb*bysfnPFIjfB`VxCh?Z&wK>L-rh0)kJ&+
z?csmSo#Nn}C4<L;zq99Bz`^ODF>^!&0xc&QiVeiTsntO_#EaV!U<E~C7B49P6cE3y
zCjv3#v?QpVrQ&PGf<4K}E07$BDQH3u3|SF%YeCeK8opE$o4p1(f=@C`em^i@T9#O|
z#q2N=O>rCrftS%mL|zjpHr`y&BBvxxL>XxnDFxx7V{w&=0TaZPqI-oq0Az}MF)^ur
zFPmDz_UMphCFhokT!gIUQ(+T?6Gz4avo~?WxKUw)WDavDj|kjHM}$pafrT#>?m%T~
zbpcE6&1M%#1%41XMwuy~0Fa!yNnQ|%YysRA*O{V+9Qg{vsSagOM0(kn&12ACAc&)<
zX)HZ`H5sa^QrsmIz^n^o(hC-<Xg<7x(_x~;t@vR*wyGQ)vB)7p#sw21grO8xF2FQ-
zkeD3FQ$xx`=ja`7Sy0JcONWG5Qzn}7J_I$ij3twOO<>OD<`@OXU6e{63xT^telgU^
zg*X!zLjunbU`B!Fam)(2xm}ydlzjnEDZdk7U_nFqvDPFuTWnR{K;S&M6MMi8Jx)Qg
zC{QDUPwvljC1Z{)3n{GMs%SD7h}6`pd9vaO+_@@F1t#Il7{Hu)7MPk%o2HY|^F$o1
z=oTYrRSJ<H1(4$o06_37aF2wB$&#Ly*uxkCOGr>^l5JZ&Y)aq53x%iZih!$<OSHpR
zWhWPwA$3MM6^8}~f3w7Fx#|ZDf~c1rYMph3>9Vg2FJK^ikN=_DAUX`PP+gpjK~_Q%
zBD|cSBEGV0SVRJ>F2G{r<&x;=3L%}7O{Br#Z>U#*9Rv`>lu92of+dBLlwQ~}nwlaW
zGo*vFNK(2)%=JPH!mvx0Vj#c*C8{>Jg=mvm0?LTCBt;SvDW8PwNFXmB)}B;b8%;pC
z3WyXqWb081Te%G>5wio@A=|KvN|(f$1kjD5%U~&iVeANj)kMG?Zd4xL@Rc_38GN~`
zXo*_$q^ioUL(FA4?1ZnftJu;CO2z82ox+hEkeL!Nv5leu8U~}7Q>Eal#jF){3oNO%
zaU}$UOHj)|heaQScx0Pxca-TuE=!6dk7ePcR9qq!P6;S|5!EG&4Bqhtcn}*kWYKb%
zP6i@34@Gj*!uy<PDhrilU|f@@mNOxwv@qqVs%6|%b(wVTDP@niQcXx~Owsc^M%c=1
zYPA<u=zxYwy=ABsg@=e7=7HqN+gLR^hXzx!7B+b|ZnASAX)5U#we8%A6qhJ~-bkik
zVkAJ>LKKTSWV+~(4e3lQnCvgAQ~qCvb`fIEctQm*n>s>nIMRfSVQ;h3P(C-6)1bTw
zV$V{^%wp+RC<&^%hY&?C6q(uJxCx~*$IuOmHCf71g(A2#ZK)$l8bELzID}RvfuMGA
zHM_kNq1&?(`pc0zM39dINZ0|rv<FHsuFsD0HF7=?Gk`G==(B6eAaDSCz2kK-i*As9
zLKr~ir6;Tul*hPZyhKq<F(j8$fXp$<LL$q$C}s&*-0fX58aXMzU~o}1QD)8KX(kI0
zv?D=|gE0-37AeU(rQVH$!wIq-d%a^QQ_06&1`c^LSYvky=ztazy$YK+LQ=yh3DM{T
z>YlD-!o`#OF{dKA93@rq$c*E<vQfb%SPfJ2IC4XPoJ<}N%cHV?OlJ;5&kj6WSue-y
zsR{rg)ni$zQZC331{bm4%!sd%Mgp(w&&0CCG@%G1emQ2a6bbCkokFG@)I#$pg2hAk
z(S03&u7eGvu57nb;v~Ni@5<gI`jlrltcm9B%bijlbW1h~n;#V~(4^86rd)nZW<mfZ
z&6m9!npH%`D?9K3R1v0#dWxFv_D*0V0m~8Cn1B~U+HyZ)e1gSP<Pd>u_&}8KgG#@0
z$V-l7LAa9C98_?5?vz`J%H2U)vi}pQ5ylUX2~i5P5@Dzd(Ux2l=cc?2{AUN%PY8(j
zb(W=-!!knk5~(#W8=C^j<X3sE6kY2pgPTKEs4HltgE^Z-l^IFj>m6mKqp{K=K_*Qq
zPB59U77?715_M2g)2Zf+qexjg=ECX+)pDYHS|KBwIzS9j>Mxu!1K430(eZM{TxiZ6
zQTr8U1Hel8kq{6&Y-b2rU+ilIsq&Q}VwKS4z>w+!?hTbL+_ZU2dJfejaLcJn?5Nn3
zvJz7?CJJS*cgiiYFFOYn#`!s?Rzgb0u+peO(vP~9x-OgU7-O5;6wxY#V5y~Pr~50b
z;wnXX92ES`B|#P7DzKI;0DZ!&3L9{ky04tXd^!(9<iyed>chUy;xz0UU~2Geq7Q)+
z5EQDM6ek}p_d7EI6hux+6)Ogm&;eRLW1p)lE32R=ww-6U1vtn<A{<UlbWL_xdA`j-
zGzy4#5>X9P0^qAT0GP|pyIrlIKq=D{#H1(^t!@`4PNB%GeTSq(8bG_?3BuonP<&i3
z9T#qn_nDZOFD4|sJ=u~wcY06i9i&23F39lMG=nJ$B`X58KPL%Tv30f`@#8^lyS*z}
zZrG1aGV8%jO6;=~LIwO4*qf6!fjHrpcq-L%>b4@v&RnvyVsGw*ZSWS-#HK4rC^0TT
zBDKN{kVs7_qC%Fbd%`e?92p?WCL*<6mXz-^F=~&)Tky<riHIa>C2o-REO8a?g3N?6
z0VzxiCyekZ`2k!uqHC{rym{=Hqpt`DIKj)PX3ud`shXEtU`I%V5LHwo?U5>NG6ckC
z7y5W#?pO!zU)g!~|A``$CE8J;C{D5jbj*Pg*fez&$Q21`fCC+43odABngkP<?VV6K
zhXdq9^|(7+qR=_#ttQpW=#mINLbQRURFS|5*$s=<5{SW;LjsH4mF0D$YbEm86WKpm
zCB`@#oMZ`;H3&%0DMfP3IBnnrstWA{3(3H!XAMszezg|@|C0j@ayknXKspk4W;YxV
z3m=Xt0ud4mC~LuEWs|d5eqC^ao5p?<9e|!+4!J^`MWA4_>>xkGVGA4iE{;Z>KE#5v
zgyqbDX)`KGy#xrzAR3YbGXsNQ*zoE}g_kM|iY2-h<_diD!-XD@8pk$(lpldAf<trM
zkOL_wt^x@jhG+r?$(f26NVc#Gy@O={hTTkvxa|b63gh8WWz{LL6s)1X*i<S3Y}z)M
zuYe3YtW=Zaw1<dVa#A+as5q-(+Fd{jE-B=o2<n=}{tUbopeQ2J9B7>yQ#E7wC7l!j
z#DHL~6)vRUNuAC9Vq?#7I4W}hX3@7Q#=Mz`Bj)QcD0~FML%D@mAL(LOqy0kyc%hNN
zSqOAl6tQU8eGh)oIf<pzsHGSjNu@H{x*?%xPj=}k{EN>_{RBUW_RGHTz24z)RGi`N
zWzF1{<T5@@jLOiVU@5JwHwg<<d#SRMCFiNi0a;c|_Um%*z;hl$-42k+p70ay4^by6
zjHA^Jl%{x}YXSLC%$ztQf-n*(vc7x06YY!K?c6W`NJ<F`bT1E}pQ%nUiO5#WQb}$L
z6<Cd&_$EAysYWYY?w!&_q7h2QVF0Ks6nW7eM>yebm@|8BgZ2a%fE&^Vwonym20?^%
z{ok${E0xYWmcZ5+K1J{5xtyoUCyO!EE1B8=B9XCNBsXMLvETxki0{7pplcu+*cF<~
z1`#>|^Gk6l*Z@Scaa6`V){0938ife)d2G6JFl@=*+^M|7I}2rV_>0pe`AX%%XeCHy
zilWU<rPTk5KT>mpy8@px$0@f}db2lokOMLu#{tAT^TGKPg0&o>BPpUpmi-s3X*5|z
zxd%~64n$&-1fFDS-$3&#B66oqNCF!UcBI9c37RGFoVdg06#j%mN6*-7pCvMDZnIMh
znY`CKp+pk1fJ6=t^4=}#2*|)d>a$=o)07)iEtNd7xZFVz$QM;Zc-XQ-V0UF<N5vBG
zC6ZrhZrKiqy>yE@XosxWC<;3;(yD=NFH+TH#zM`d%uxiQcaNNoWWiM0u~Kr9*%1^5
zAn?LO<pia2;9O`;JOosp+=$8!<QGfO7h+CSCm=KwC;C}sCLZyIR|YJlcXPH7e<@X*
zx=od<A#RuiJNfKR;LS(`U&s3LS0<&ff)2`{)I>-jF2T%M52zzMd00w72zs*N7NbE(
zK>9SnO<^f$bx!?Miy|&my@vT0CEC3%Nx?SAdEi2jfDl~>CnpFiy+l?Fg@B<8SZ5AR
z0y9Mh=1(rcv7gR2gM%O?`3-Iw;U(NRQB!m+`hsl(fP+13^Gg-BT%8j`a<G$-Mq!B(
z#T?)kGEqq)BGZ;6taXec(?fFzth`@IB+<Pb_9Wtzot5Yj>mdD-=V6{wsDSI?6(pdc
z#xQ5{Bl5^9_6TDs!`O8be6c~0AV36Q$68Q&@wRv%%xFpoQ5g_G&b5aw00PzhOsNmm
z??hb%pF@BBtLDlEB&k{U1jQ*T39SIisNcX=kdx5;L?PvVkh#y)=ctGf%A&vv4(I4&
z-GVOZQ?}^ChN1%-umL|n1}a1Av8Abt$zhCqdDtWYzI0VO$j#%JR0RSo46EaK(EcGz
z0Rfd8Oi~KasEQ!pffd|z_GNlLGEE2{a}KGiLgV?>eVCM-R>L3hErKb3NEhR}$clgp
z_rTQ?0H{_(r8X7+nx*INB_A32s1#YV=fzChMkex9SEQOLoA!;Avu2RM5!)ykg7i+>
zJ-txppxRO)o-70NC!SVYmwF3(wlHS^R8Eeu9Hfmcgc}?dlp0FQW{EXnma@MmrLbTP
zq>)2M<l}_NDPl&$!{3k>G8R)5-i*Ey-((|lK4b=xH;z#lL5ylH(N(r_g^G#ERdbUf
zmsl`56h4EVavVIexD_{6f_ia;n1S{M;UWX&+hvAmUQWr-X$76I4{#$5VNUIBRnsO#
z?{hW+fy6K=D#-Q<u1VG(%OLfN>%dsRiE0#dp3Xtl%sOO^h(?v?e2N^i<UyGW^9W0!
z^B72hQjUMa4k|OXIRreBSU~-#?iY%KJ6uL;j^wB_L1HycFr|=wD%x{WF%K(n%C`R$
zVC1EJI1G7ujpR(voKh@OL-NW;;?eEF)r1HfVs-Kgwu>7{HN5I4v8(MwJODi4P(!;W
z@VH_VRVOq7Midf&GV4-hVURin`X#uK_%CRi*1+ze++~8e*1Q)+fPi%YO4YLfYj#!P
z8C|Ux-n&pX736pbc>+m9L>4v~izjVD#Bh|V&8<5YmCaJ=BZI_dv8(E3V`1U(Y>(v)
znNAK5c+MFc6dYrjXkM3jAAiQa5=>mTw3Cn=gA5Q{#;*xFjU}f60MDKkOs%$<&(6j{
zyU9`*jmE@-fZ(dOvaM0NQ#c1cCBb%!VM;A)4)xBiV?elU!&AAOU0TXf3A<_pwXEWY
z!n0xwfEOC9-W#M`MtW!uJrIIAV+%h5CP{j6a2yN*h|7m*P-r=@h$xa51=`GKj<{gK
zQ5Gg$9S)y^qOcd-p=qQ%*-F)wGBv5O%64orn*;5LC`KV$<5&i|W%A=tzzka#R3Fox
zyvG8_vME9Kl~e&W=v!T+gdh<&kh6<`3>&8T-g5GVCe)9VeThUTd1(m_7nK|l5A1_-
za0vAjyn7gAL^|TV(Yz8|T}pl=@cAlL!csxfQ$k;MmgY+$B5tD3sdJOcg3yo~WD7Z>
z@<4I{oiIvXf#XvAnEz8{fa*+LN9HM&LL`+9P_In@gs;Yw&$GX#>`OsDlu|EcLFS&r
z5N*ovO9$aGlsDq^;6i*J+m`GnOD4FYu`=njL#xRMPO_-5gJ?Suqjm6WHmgXS*{;BQ
zf-9_z=*JY=#U@>yO8uO{Bu}5Wji?*RTx8QbZ6zGcA%H3-$w^V1uRt%SL)rb8vsug(
zq{CyRDiDs5i(3~oXXm8+sw_H&-=0CPE{;)8lcdo)PtCz4`okA<5qU$5FxbpwwlbY=
zA(>zmk4p;GwJ5M6lNeH!sv>=?25JK_D?Gxyu~S^6@K<CD14gvOqcmHT0{Mk3M|mnL
zz({5jPR<{u%iJ3h2dAD;2wbK5WE6H$Jf?~4kt@|&Bs5kbm8qg`);&j#3iYLoM6n6o
zB>b{d5Z!5dI5H-$F#C9DeWF@CUXB9?6*)+&C-Ir0Ke=fP2m#=Z%fWFt!?3zc74ITE
z;VS%YiIIyK4K@P-gUd7Xpq<SIQCptZNp;#%2q9Y!ZlhWCQ2x2>n#H5*Bmb=~3=^4P
zKWDoL)j0c{$0m1<+l1><r>a1Sgkd?<j!<S;Ds#d3N-3)>RF^?CNHf+{p$+jBtmego
zSfXr-fnE6;1wR2dDOt$2j<^adB@@X_tIOiT@z<$aWgqi)KEOw<k=;i4W>^L!&Z$*Q
zTu`;t5ip|(ekNH??a7B&TgMJbf1&!IDh4Ns-Mrlg2FJpv56kJ~*?pTcF7&C$1?_{j
z5gddbewJ~R&3AH4K!F^91{IcvTOxf5$^tfW&S@mUX(^FTq%+7szJWBjPW~=oAWNx+
z8zj$}s^mo}74}qyiYpQ&(|R<3vX1i3Bc4*Mm*aPVanO{b<45tGfE-m4Q~IwuH1LEA
zlTJ_Sh;I}7zzt=q5+cEZiJk-MQiq$(|0&Ev0p|!j+iYw*b5TlDaR(0Qlo98=$vi`v
zU{I+MGfLpOXP{W9im9P1KowLg7O;B)>6dvDR^ixD@VqIA%_S;N(ggJs>7zd-DkZEW
zw#}Aqgn^Sg%;q7Q!0EzgF{Ua(a6-J4O^ZmD;6h&k{<gb2UKOOFd`yl4XIWaJXjL4-
zmi#DYG%P>%5KV>t73L`^TgCr#AVw#gaEv1UOV-ZCT%%)FQSEp*+G%>}o7I&0r>TnG
zY!Rf?3`Yh6GdnVZbIAEw)WZ~|+#rcwT4LK35X3L$tW?%q9$bOD^OfOdo`S@s7lvTx
zjyORnhUX)etZfd};FBbWZ3qB}kXn=|GZyQOVWmZR<7$(+kWkaKTq)DZjVrG(<vDR#
z;)!wL-M}}MzF92A01*z#&4?rf0BAKKdyoT6?NU){TB-)608KE+jNlAdg&zSfv;|jO
zga#?avFET2h3%RsX9<fJ)Ww=HvS$$>H1-8&Vp`eKBsJ+*c0A_{$mHheiM@)rm4wZ#
z7prA&L@*t{CocuI0ZnF~2^56cj>hELlq2B8y(Wjk03gue!BVBpn4q`JGIW)DIaTj@
z!eNnPB`^t<D8H1D;E{0U@JNafBwr5Dif4C>lT;CB58(<m*f%%@1Y$jem+Tq)$AYql
z!bBCVQot#YMwm-;ar~M9cgRBM)|_sLCt+Z0?;(@?DpxO(W6%`KrL@fIr9jH;pb~P@
z%`z(@ph(pbn33a2WNZW|>`9>Tx^^#n$~X{D0SshJa_pB9BKd8AwQR6d?yTr3lbq@(
z(GZ2@Q;gM-C-@utw!!Wk@0nO62VVt+kpxK({AlK))OCl2&HiiAo>di~LqPDf{D7QD
z#5%YXX)UFJxMkOj8?h|XEQSxAWQz=E#NhF{s00<y(L1Zbj*BzZC^8ecNfC)ei6lG@
zh?`f1v{*ZVh(ZoXkrcwEgnNKn87&}2I0@<HNFB?PE!Ok{sm9+se@UP(`)eSnv`pqh
zNXQN3)J=zV6DTO9WF!%`uq*D9eB+*wLvWtxC+Qi)Y6Lv{)tu>+a0Z=e3k0)?y-iXK
z%s^tHlU4nx<pWd5o%&vhg`|+2_@Q!26FI<~K?@qdUQlvy2Lys6s94GF11eZh0IS3z
z9J&>hls5Y?Nw8K}=#&VU2^NCs6zw6&SzE=Dpu2nxI-en=mex@^E*o^z-0`rmVl22g
z1QY?T<)R%V!euCqrAv6T)Q)3rQRp0@3Ct{_7E&)DwC0?W^3;TVtI#XWR@DVji38Oa
zDT4w)>>}qZtV7b(@&g>8S{6czowa>OV2`fOT##d-jSK@0-ByPYJePMz6T%SQq5Z;<
zSwVcgR?&F2k*3%j0c<zFCTtVnM@3lpcMe*5EL#YWm%N^n=fp%Z{z5;?sQWU;Ds#2s
zXd&(g<y@MGw+4&kBeS11DQ9x#Tub|JvV+M2082RsFBmtwFB5p7-Eu%pIUZH@JTqZ#
z9T#UNWuk=}sTTlO@E8awdA6K{lb0HCYrLN2!aR!QLzwA>UGPb6aTfBy42ElycTYJ5
z{T2mkU&pv;yeIgPoj`;NvK4WQ)-@6NkQ^iK0u4^fE{c>Oso{}vgJf6_M4^LJ?C59a
zWvIDI#77b=!r)A&#7x`{<7iVdGRi}ltN3N~Gh>B{#5fC!Qaa2D(mCOe1HhCTqU+|5
z{`ccYC$HZeogAM%`nUgl)StY1eR6j6#^#zgr*8+|a_C>Sr)@5{=A-BB>+Pq*tD`p`
zU0nS2@yp-OzdCz<vV8k;`26_IaC&ln$I<c2qvPTGleee+;Nk1%y((8e`nR!ey?yi1
z(WzZNPoKT{{k2OTKRP`**?#u)+1Y6{{H)x+(~+|`r$_ypZF_Ip(-(ukW=P`Ikv=TX
zzC1ef!N32z`jY?s_}^!f$28i{;xT!CtSG^U7k@QAnUzn<HQV1Nwa<Mr9iM+v{_@Er
zpG>qi)!KCIXX>ZgUbl0{rj7G!r`v1B>6l*m@49<_X|z^85uE6$Hpi78ZH)DCJoBRm
zW6zyr6rMYA-Nbd1^JlN`IDbm+&y$>S^H^fzv1s7@uRL3IYWZ)z8T(29*4NIr*KfYb
zn9sjiOnln-nfY0_koMhEzFDlVJ-=h!1J}<p&ljy!n-&(25r+9@k(F7uJonkePwl7N
zU!IpwH#4{Mylqd?PU)v>ckjyQ>yf30>2v8}X|dds@BLJM%Jcj?^OL9fp3E?le)Pwx
zIB>_0>#PbKvFWk9{T4Y}|5iqMd7koI-)e2$oAVK6oVhzA-}EGZjmua(Re6k`a>c})
zkxUrQ6$-*0qcr`vZ(4dXF}fo3YTeVuw2ZWh4Ex=8BR^KU(rTsEN_$nA_3~|z^@gO)
zbD#e{W|=O2^B1XG6!~vT`=iZ&AM<d2%3W2NiSm4w^Dz{c7AkUFk>g716*;c7U6bQl
zi#0i}$#L!K+I6+-YTrjA8s9g*Z+zeQzVUriWMG<B(tgor^HAC@?UYaINap5w<+t2j
z=9FY{#6Dvn9?K>9v2J=Kx;p=~++C;dveUjX*LB*R=}1vi2&#OUK?|qzUmdh>!*9|T
zj}er9Ot$W$jQyBw-B*z6$3iu^#-fya%N+)NpF48(!=915?$@jBa}FQJ_KrN~u#xZH
zk>}h!SNnJ5Ik(U5b$8@BH?PM{cjP(Oui$NW<T+Q@{H{AZXHQBFxT8p79bKs-lSIXg
z7VRaK+zv^ej~++Ki~02-neh2MvK)OI#U5BYx8>UMSDhOcQ414o{O8w~kLHidLuXO5
zSsvnFLcRXGJaJZCJaOHJ@=31uz1DYnwE5oCo6YB}_qwyLoXyr<*?hui)U(I*&hs+V
zG8&^;_dlJTrN1VBHhNt8mO*)VnrhP8%xD(nLF31B(_qLtt4p5lS@ZI^(PK7{VP8xi
zFRI526WW-L$BX%6)?ME+YkpWPK1D3&hh-YEXvJ1$NHH58w7xhdWjl=?;IA^z^Uci7
zW2SVYG@fhc<v&?eO%;c_?%VpYx!U0Kl~qb#*B|7s{8~QsZ;^uH?p<02kq<MNT)$m~
zvdqQ7Tb1H8({`DVjmTtZn|6)ay+&RB8y~P1xQy5|n#}ExGcRQn`JkBcxXm&xBG|_$
zUN@KDOx^mg^Uuz|X?Cu2c+6u(XMWgU3kLZ5Vb-k~g#K9ZiXSfAx+%@^<2s|2Gxy^<
ztEZOkG2+FK9#}s0ZGI|0`e6B_w*AcgxDF(cgYe@zkU%k^AJ>5diWmI2Zk)9&cb4(s
z7xVYpjaO?Qkx%UAdW`S#!&7jC;xIq#SaCM%Z_9OrRi&n%Oq~*k^55cWXK4-R!)+5k
zGbrchrz`}~vb+AVxW<oftOoAG55csOjxP2?sn)Yk|LuX%8X6(L`7uMq)$?uTbF<hK
zzt@!Zr|tzEWCHzYAFx0Nq(9}G;zSDw5sl=^^KZ&;1#0-bNTS@a-|}>&eERP%Ybnsr
zCq?Wxzk@rQZ~R-pMG;g<5%;r{R!{|pyHFw9)~v34em(=9ovY?2;))aXTRzV-_y4jQ
zWfj-`(el(M)AR@FaDGn_`*L?#6Y_vc_QR`?2M3G!Df4hX+Vmyg=m{xO@!_XP#3a|9
ze<r+;U*A3_cN8GFeX@ezO^?calg-QhEWHt$$WZv%&Z{wKF=B8Y;h5y}t`QANq3n9y
z#WG-zfsYhZ`Y{-yBqH@=GKh|{6<FM71kWxbKOPxHG|?hlKST*`Ma%giPB5yI_54sw
zLzH{+;~HI6>*2@mYZ1z%&bGsqCcAiMF^{F!>xEtScH5(k=$E_Q<2mbPEb-iWwCho<
zM}RAL#de9x(p)^1NhqIW^p{4h)k&r}Q<>>YN4C?o?TD!{?2C)a1*N6(<jvBa-@2V;
zx36cc%+%)g-6bhYux(;@5p-!YfkpBIim&vo=u@UP5><Lybdg=WnCuGy*qQXQ(8U(z
z&axca#W}zJeB?!*OF#3J?R8}W*4G$T=|Kj4{z-bf?U#Lgu1RdL^Wl21raC5^;lave
z7PpggF)<o-6}eP$zG>$CBF|WCEyMb0Ci>zs6H%tdWs&Rkr8}|{#fz4lFLxP2)+)nX
z4>tW=OP#Tm0i4T5F53O@d~$Z>;QIAX8|%yA9Ia;P=j)q!EFHL5ne|m`**t&DdJW2z
z>yB?)NtesCUQB5Qu@2`lck9+SpJA0w@#d$)F+#JDGvQnGDy>oTVilw2`8)nH|LT9S
zLsY#;ArnykC8uR9%)$C^fT3IuYL)xxS6S!6Z{(9gf0VC?`1&jJTpkv?R-P8Bq;x0z
zNqKGvlsq78$0l@-$IK@|Cq-rnR&fZ}5azjDZ0s3MV)vr*O7xh-a+fJf%Z2<%%dsVE
zF^GVq<!}kbx~~a^@(CqP%Y|MjEr(-B=L^wLehK@LM=(qR&+?1@q=$uwD9;KLk$EfB
zMR`_uiFJbvZKeee0@{?jtmV3g0W>}d6|x>X>%682OkI`R@eA8upqbJiLRBOIvG91!
z7+CBL)nIkk;sg$r$rM(vA&&UGgw!D$$}jkY$8}j0OHk)ood4sxESx2%%dCd~D&64I
z)-VX@TK{6AN<<Srp#<k46*j-PI8P6?u>J(B+Wg{KMUZrU{RypUirC;An$jO;xv&Fa
z9@f|f{wbgb-yj6aw7`Rfdyps-PWU9`L0L)9T*IPp8s$>|uG`(jL@Ja-9=V4Tot2xm
zk&#V!Vv&56xTLH)L$(Hbxu%G0t|_xjsS8>QQ&6B^LirN2g=HwwLjvyNA`?RwZ<w%n
zUMAPb3z$mqTCi2((KR#Yp@k6C(-Mj3==$Hp61t}g>wqE=Q2tIBlz$To<=+HE`F9&g
zBs9w3iI4Jcf~5Sbz5MHWn`n+Y{=e+qTW@1Yk|pZ*`4xqDJ&Fw8Fa6ZODa>GinK=W@
zV^1ToZ;Vu>LW-6Ym6hFp{(Q?eDNzbtC`I;Lb{8`!a$kJAo13k*%-mT#B7U)WL@;Vm
zi2&7taY3tv>H=AdHt<9vsfz42YBE9;WjB}3+)tYWiEAK&i_5A4j>}U3DkRn%;~wQ8
zf;Y=SnBWxGeB~ZBN#gU%LBvs%gNP3)2f?ICu?|Kr=&^a@%H<%Cj8Sh6s4CGeldc>D
zq)K4U!MR{rXV_!S+9Gp%9oaQU#W{SkoJ6t8z25BlBeXNmCI4Jb;zvvCjSG+dp*q1w
zAv1t@z02{rYls&3Uhniny$ks{9Ott-Bc$o@&bQ?-LaO$krN{Qi<+iy;sMYu`r0Q_o
zp#>pbhi~(Ybw;{-|L*?V^vd|{{c-pAxcfG}zrXLHEg@|vNwwwfz8Us94yp8Q#w!GF
zJT4TDs#u>nqs|TOJG^t>@iV~v@GiZPdxZKO&dnL)RdSE<o%W6IqT81bm38y3rg!|t
z=tYBgMmK66a%Qd^LP#yGckVX6%RDGo8d^w0&9@o*(V5n}+_&gm`PCwO`*%5`zK!jd
zYb^pf`qs?L{c)ah|4ys+@6v*t8*(ToTkkyYD2E1)>_1Ce%ECfG%iBgErRb(rQEo?n
z8~Qjp+>pr8<AzG^-??u&Un6yRCl>8B;Mn8{gEGO&1EYlA)qILgmdh==SU$I~Tgg$O
zim0%*1nnWj^-h~dzZ;7k9d9x$qvs9i7+r5haP+;gq0#w<@Q&U$?Hk>1vN)svjfIU4
zSd2cr%NcdwK$X!e2cnFhCA%~_=;V(^51nk&{+$+#*_$BKa?>Gtqh62hd6#}hSG_CS
zNS3PHHAv@OjbQqI%(`S&l=>6yhDtj(3{EfQUD{VJJB)7snLZdPb+9VZU1tD2<-f!7
z_8Pm^k3>AIZzSd_JH0Er=kd#!3VoJD77inwkjsSumpd<FS^m7}=IGya#+W1teN??t
z4G8NVA1&~$fK!ql<<&zk@o~o$SuMXFx;e7^0{i9J(NBnP`mZqV@Q<%o*S8REWi4<1
z1iBF&D$M)|beYkgK$i;`;RgRdivNEC-9LdY7yBpBy@R6y^awbU7TQBup@0AG{#!F?
z|JnU<0`K@)SjPU{-M0Zf_1T|5_fMc3dhjRE4dgurx?`RvQt=2glbzU$cu;G-3(g(u
zYet+~pb^g9e-@m(KQ734{1(nF;jeJ+2#A7ni`f^>9kss)ICr1qiOhNjbVni;oV#z7
zo0SAmICoSDgL6k!FF1GK6gYQO3_UI2AM6X~j+YC}Emfdk?x+d`=8iQ&(X>ZLQZRQO
zn0qsPX)bTiyT6_{pD(X&yu10|!}WhvPN$A;td8MosDf2D7sf$|qhoMCaYi~k93`wH
ztR*}oOr>hpybosx>nU9?=XoCn6=sDyR83oWci0mCGuEPMC8;HXbSbe^lG0xzy<&JJ
zxF*#b7#gXS(vs@4`^qgE>v8o~^wdbH?lD$!(N0tG6~)xOODEOdRDkX4+H`d+#NUy#
z^Q>t@)mkO@;5>}a4+WEgwI@<~hz3I&tE;ptqYojDRaP-d&mNT`s!1fGJYVX&=nH6$
z_s%cHLjO4L#X6}7kHxhe8=Zho_(Hvu>*hY;X`Y{YIaWP+o}``w;h;AQ#Juvo{-}B<
z&sU#2j`kOIQlXR2JUiZ|G#nRjzGF@-TXLS~PMyYBt?|ZE4L73r-B)Zx_#^od`xrGH
zi?nBcBd{!kp|BHlMK9}ceXr~FI)kc0htsMythUnTJg+`U>Lc02r1jkJP#O>gEu{yC
zl7X?jKtH-|l_JD$z@eyMRh~e3NQuFrL?LAdV+li!^FDUWrW4ewOu;int5Q<n6|FvH
z22t^IoqU#3gp?s1N)K`@E#4eccHqTD7(2xWUTiXBUS$UvLw0IB$LucqNd27aS;XW$
zyY}4svIGD6E(&Y3rHHRlprSoRF^J$A4Ixrvl^?M2=t%BcMF)3<2>PXp3-qVY6c>2u
zUmDR^KIa-yQle2roroqBHE1j>@R<Q+1ZPZ7L-`LM`Ib?!f46e?GhJcAnqy4ctTHJ*
zug5v_oOvAH!z4e`0*%q%9#@a61Y+8HROe}nVKyoT;4D4oV(t++w=kDGMP`b?R5c2k
zWKb(@7>U(jR~15TT!BPKrztL3c~edPzD6Jpz%>#JJeXkNecGOL^SLL`ya+mpa1n7T
zwH=3(pk@#%<?g8;rrkY>N3L|c>y-48$s1$VzS3BdwvSP#C(;$VYD~xLoCK2?cmjyQ
zjW)vfB>5wxCYd9RBS$2MBl^hFNE1mARch$NMRPmc-2T76G?$-;{;#(;V?a5Sdw)8=
z?1z8+)c<sQlN~<(K3v~a5&DP4PurhtHuGQp?_d7c)n6`$-%>^Xm*(~_!)5=MtKDBx
z<^5m&pa1yq_4?}bb@L@v?fK|`HD6L?{x2VX`svg7zsswB_<5{1zZomcyX*6>x1TP~
z+q`}nZkFTS&)#y5k$vZBtM}b){l3#S?>lY#uG40dH=ovDeR=aa!%g*mcXd6y|J;iU
z+k~*R_g>-ia5-2oadrLP3s`+|-Lx0)egua9<^1MHPXEX6?`^xJf4c9zr{DbkrM<fN
z!LxrGE-rq(y!!2(Be?phxxQ|G|LOd)yZF|>vm4hxUA2FEcSo#$y7{HK9{MlCm#gb{
zj)iMj2y^-QeVw`X__yyIi1klduG3d9-n{Sjo1dDS-!Ho#oJ#wv{MdZj{6J4^e)^%g
zxcTXN_$<ZnzCPUU?YIKyTSM6PhwOLzL$>GaA8-TP_m7t-)t-N5`0wiQ#5jQFz32Xj
zrMUGEJB(c8{SG5%kAwDO-q&^B?RcDf`Rz+PyeIHp4*$4)`p&iV@Y8Vn%g5pJ=Hn$4
z`Ac*2%Xg!EcbJ;DZ(qh^huhz-u7CabrTKmakB5K0xN4j4z3lkq4d;C^eC(Qwi;s?K
zRMLIyei^!7hwG0`d;Uxd{`t#r+k9zme*M&4UEW?d-R;MG!ZMpz&&Wgm(trGQ`2ESi
zF*fV|208rZ{L5F3e8VY!yZOk}|9;+kj9+eVpX-_jw{gz5%k%H2<>M9|p8aE*rjNdl
zKI0kr`foQ^mmjacb|23#ci*m?tS0@`T@PmPp?S~rS5E%=%lXYO#^+-{+=}w!$yb-V
z^Upu!x^FylyvS>S@t?=GhqZiaZf=I_@B8Bcqxt^$PnqDafwSY&M*IA}7hkxKsQvRV
zS69Ej;iUGPHSn)Y+T&Jrznow6KN}^>hTm`-Xzm8G{%&lZeHaty=IS*V{-9w_xFwXn
zrBT<vf4#jry-j^6?Hdli7i@p-@a)UsdvEjX^Y@o;cn}AF+J~^WoOQ)j{(X2;mm!AD
z`S(-o*~fV6^>=S*|L#2x{iN4>w)r`FcKV3t@Hafb`Q^=54(u(yXH-m1Z_(xO21j-E
zhPHogZoiMi&-UZj;d=L0&-7*=^Yz>1?;Qtydhh((x8eHtQ-Ig8qY<Y1s9vYv=6d-0
zhMBKD!&}_Uc>Fu&|Ng{y+HYS7e5XIq{><No_D$!A*+1LT!VtY75JaUs{VuoXZ+nvQ
z_;+;P?Zq4VD^PIw`K`Y2_VyL^;n*s_UBAJ^zTKX`;po4=qE;R^<L_^XkH0lH-vjAq
zT}aUUaQ*Y`FPVRD==*<<n*1USKW_g4bUi~3o^9QcT>c!}|7X~>_{raH(1R~ut}Z|I
zHbeO|;7zYR&oieMD1G_iMtpZH=bzHP7|7VVc!yJ9)lm!YPY!Q*!=v4wXj8lE*YV|(
z_iTUXF<$PI<B_<(=Lwzp^of3%?CRTVy2aC{{&s%*OMl(`_5=@oXlhSB>fJu>?|EE{
z!>;;QCCaCpUHV|Tvur%{I<9}R^`wU3`tp5GesR_P`kse=mR+9E+dnYH$LW50gOA-q
z4D=25e0=H~TYUSEy+b<xs;pxoXkFfrFka2Z9NWm@8W+Roru+SeF7d|sc(`-h+zdZ-
z-{JhLRTtYIy2jDTwtR!|UyI~NGvx3fPmErk?PEzxR}y8{<8Y12M83NJ=I_&&jqT<e
zL=MG$BcF^x==%CK8uHyaCs^ip=ZyD!W8=n?5;ceGjyb+E9iF-A%_sRWxc$rPjQ80q
zoM4mBo}2DEzde5~IDL2i6Luhl{?K6^w6{++CdYPhl34Zp=`pL-;^pzWR|~(p`!9zY
zf@eX;3%5QYkUxKR*PMU-c*1bK(D>4OQKNT1ec9{l#Oj5I$TTkx{EErH@D$>FWG>U@
z2fJg4i+F!Ko|I-!wc_U_?uX}(p76`fNoaRG*e?!#`+U;z&yUi@)n|FDS8}~CjF5VP
z?%g(aO48+pdtZHRh#>F2`(AW>_xYjU??3q-p!}d|@5`IsZ`>#N=<_d>iP1BUZgRN%
z`^%61{TV0Bz@w8!3$OovlwmsoY(I1IX-NI(<naMdLA~Fd^!4JK$@I!d9G#VNqfa;8
z)z??-=<z9#Kyz{a?{7Sdy}wqT^Y}*fw{2Ws%a%Moulsgw1CLjvucMRRJV^VV{`6|4
z-O)`B=TLt|$J0mYaGq=|bbhkgA5N2nJ^7q!?ZcyAfX!5fO3MxXJ$P2Ccr&Pqd?Zr7
zaFri9_YrV^lx=w7rYHEEd&i$#>lna~!C}qQhkf-tw0!y!W!bM;!fWk#8?<=3A$5(A
zqm$&SyJ-IO#h&Qf=4-@*=HeOtb@=+;6dv~L;rnM!f2s#wIpv8q-rxM=cTl|Iz{57Z
zboiS)5`+C%`IM8;)EJxEOBws8j(@3Td9sJk@tw`ye8p^s^ZwJ#`ESF=ug$fD{b=`1
zd%1h}$)`-0=WjhW<B`vN=|R)@hi!f7=qJqKyMDQ|`kUVvSIS&Js+3Gg$UlBR@(T}d
z`i`rNr5wis;R%8B-bp;$y79VqU;i-|eWK%JO{;k5zQ2!pC$&9q^D#Gmv0==#f86V(
z<K?=ijsLDVMi8P`9N#)$@mS**4~OZ6v&L>K(e}%E-(L*Bsc(Jb**AW9YIk+fzvBY7
zfR_m18_xTaZ+cGu2NvFOHz@nFUVigqK4AuNX?NWk@1MG<<Kg&zVDHMS9zN--S2|q%
z<4*m!0=5kN4_)H99(c7SPxQm{9w1k1BgTKEc&0dR?49~(|H;Frc=M&cl0cB_Kk$k-
z-`X2%P5i`a8ve($@`+A+*@rw4jbA=toWmcRZ?{)!8ZR4*c0S&nadG|~Q@Hysg^1s&
z#rtpX{oBJ)dimsiQ|=CW^WC55t^F`RgN~l)t(Q+Y9@_np&pqqQ7vktGxGio4`~A?R
zo_Old&CN%@=JL!_`_`Awwfp6BpSaocQ}6OB<*kPq{6JHypz-m`x7*<#wKS{VRd>j1
zJn~R~+zlRD;~#R}tfKz<3$frov+;K~`A>L&q>3Y#`C*p-gsb0P|K4=}_U-&JF8D+G
z{wZ?vhg|pvth};bW%zH501qciUFL*l{K!0d^4yng;PEMUhIyj(KYRY$ZhNxLKEB_n
z=J@!$Q!MTAIVX%>U=Hr|%T@o;q98>(*L%8j!nynEqKm8E%7sJW&neRAlP8X=<4!4O
zdVIq}Ch6r7eDbERudI3UwB5JMQ>q6>Dd1sqEx33spYqgcUrsGbeR#K%awt#T@04YR
zPj=1C@Ne%Jhe(z0>X#EFlLwD?x><kwMrC<?cvf>HDMmrHeEhl8@2<JI9qCo6$)Cp3
z=1;#27pYBnxqF^D_w}{M&z#tQvyf)L-2K${KK0bqi+2y5ei(JQ0&5pnzdiWsUPn0e
z()|ge)b#!5(LQb-T;=En10DAGl*3(bKJ~+{`F3$TBFf$4hTI>Qy5{DIqeScP0yckW
zoDkP6wf$6OcLfn2_sa?Ao_`*vV4ZIj;7Jqm(fto+)irkK{}}oozRKI5#ImRH{@2at
z6Y5OH%Bj0PJe*w>(l?)))`ZU*vQsLiANI!KO8$Mv*~ZiqOsUE{2lR0J6Vb*q-SGDA
z-&4}D+2dS%IaEIEwFjra{q6?qP%!u2j#E+p?k?XO%Rx!{(d(qRl%A9QINshBMOvBe
zd;8(=5aao~t80<{#4^*n+4S%ll}I~$^m1@{WR8cE#<qN?2mZjdjP?x)YPfwyHGIY8
zK5Uo;0N;z1KhU`5LWcLt?|($on#*6W|A^~!7gyi<onJ(i)7h)BKk$I#-0zypKjLCL
zDe9I2`bS*rT(0&Hc)oFI?H_TaJDYEl_WvWU7>(&h>G&UVv9EvF95Ny2f5hWGc9_9+
z_aN&^P`?;1n%{@(=@VG%(ZNdh6o`E}@o>sEvG>G-v$X1&28^ikZi+mBm3xGqW%&T0
z2_#i>b$eWNJ^n24gOkP!jt%=*eL?s94v8KvJ+>-x>k)@Y#~co@Ka72LE<Yc|-0`ai
zH$5Ev)$UXe4?c)K$8h;@^cP6^+=5-`B}ok@K5^-N2kpzMBA(vG{s&FCgXd3tY8`u(
zh95U#JibJxyEC3b(08fa!<&zWqn6!|DHsqe2=ZLTw5=IlMnQ*5d^)^&{#xtVE0yK<
zS=`qzX5-0McI!IrYP)mj;ObWeb&slNz6+p-Ha+*GPfgstru6+F*?!@hUDQ%p+k8F0
z8?Ad1cYnYWUmjUZRWCkqh>XKI?IjB^j_-bS=23Fs_=xc_4xc<_K5f$u7vsKbCqukZ
zBB(Qe{`qcqpp($yc)NWehU=J9H=pXmeRakw7W&}Uw}WjjY!z|Rogbcg-K5m>9cNaV
z;bZG~s$<9d^~3O0Dt8$EefSvF20=dk<lzPlzdg9RlX@mqY{Od~t3vus5MJ~4mYx16
zHcaS--M5R6*6N>r7Pr`3w$4I6&{sny-TB`0Exz_E5$`#BJoBW6ixwBZo^p@B8L5x`
z`EK{A{bnPLPk=yk`At#exX16ygZ=e-uqOE9NQd?pD0_SRX(tTE<EEZ)r^lz{K_e->
zqUJq5?JJq{Hs`+ayi*?vnPmCb`x?1%AWk@UujHn+rwsMc;U9ndWw?CHIm&#NZ#W(j
zI<JR%!#U-Qi!r|Cr1sZ-H+#zoF<BtwEvM|aad^WiSrT5=Y;l9lmxqg^sz~Pz%b-UO
z{`iuo+lO^{Uv1g@>+}r|VE*%Ryg`<0-FzDVe0f&y&1-+=A=hF{lvF#u@6^H@?>n{p
z*!xZe<==N=JjDCX{L=jGwbhQ#b+4)R-cu{h@xBK0{MUm}@!pX|me|ER&Eoop&fcH=
z@#5<02V4KKJoWoJ@CF8W-<j9%KlSrFZ+Y>~^G-}Ee&;eS-+SWc*LGZdZWdj<_r&hY
z_j}eoC|G*#j^kR)x0t}e8IK11`kulM?|e9$F7WxC^X>-qyV<?EVEEyE>wY(%zBK>%
zIG+DIuJxA3K3w4Z^2aWqPVv6yUIB7XKY|wQ7v{aA{cnzC`{!0(b)(Gp9e1Qfz2mHl
zcb!#<H9+Il-Bm^~v!C(%N33ll&v&nFN$}*UYG+?tzx8l1tEHCOp;5ge)pPdzT5|vK
z1@1PYe=akBI6-K>{M*gXKku4fl{3~(P;bFtIsGli-$w5r^}5s1;qT4$XPa=2OH$r=
z+HvFjFibYq|L>Q(t8A?QA4gmCZ`Sk4Zqe@Me%D~O+U=HpufT7k_{ocAx@o(nneMiW
zezDuk{8~k~X=gjXWU&}#ov(&j+o;%3>mTF#Z?#40|H<mg5C3Ghh`~<*^xb0JEq2Xn
z)o$DEW;^M2ll98)we-WR*>+2tzz^F+yI%NW*Y76V-Dd4qVEWB^-LI#+m8-8CKd;d(
zH_Oeu-*wG;GHtbEIZUAV-D19Lr|W*Xo%navFWXt)O`6%R?Kj)qeAz8lYnRwGez|5n
zcahbwUG5f(`FxmkD~(&M+HSL%`)63sJ;t_cR;p;%O|zPJo87#3!`;>;oaKnQpGaQ}
zej;bFnR$9Y8<9@f?s^ZgY1*|P%-Adz-Mm>g%W2=cu1~skJIRAATEF4ZwYzriiJIBE
z^Q#XwIMV@sPp6yr)4uWOyY;%6Hk)PNH~nrstQ$Y{(Jz+$bmJ1!UAJ_bX1($=BFk>I
z*)`Ki?`KQe$;OX{tUX+}_S56je%1HWRl97bLqA`&O|OgRy$3lS`gzmrx^}gl?}lZ&
z?B;Fnw<Ov=?O#pT?Q-6?i}hkREVdi>H99Nfu$s(WbZGk_J^TF7AK%FBx7*cvJMjZU
zk|uNiYw}rVyr;`<)-Bh|!Em?Bb+elF!=~M>7k#^1ZVg4hYfrw>rt3C(XfC<7bg$K>
z^%D<k!?<bZ({9&yyJ5X)m#f~d-Yj+ue=`~S?RvT#7L!G@OBbK^L|xx?ZL>9yn{GA?
z^IgAcdOr)Z=~jzLvsh1?RX15p2IJ|+k^G#9U$64ZMDupSG`iKxv*x(#x@9+E-Ro}R
z$B9<MLcgzCX0dA4+ug3~V|RnGUbL%bvs*f1wf1u{41zuQW#*Hgh=EU5%gv%0cC$_6
z2Shr*<}x$oRvxkOe&Uy!+{g513$tOlTz1TD($99g&2F_j`9`zZPFD=e#iI2aMT>1`
zLbSa(FlkrAZoY08Q&V%*E#{q8ESmYW?I-<KV|E>Ln4Ns1_0UY(<#M+&_RDU!ZMs?0
z8wg{t-ms48vUSJpy5;^_e#B#Jj6R>Y?z`1?dGd|?bd{fiU-%6peYWe_wo7cy(aB`i
z`mLpP-%Pga8M|CHtDTV?n$FJ&Ew^UsWVfB4e50YAt;`M`#7ob4Nmj*S4%=bX_(>VR
z_%ck^8xOJRHk<^{!beSXq95GSywk02-VV#gFI&(1IKsgtdcQj_NG#(17k)#EPd2Nz
zlcwFYTb_8k95iXO^}k7ZyVK?oH`8)z+wF48WG72Gp2^I;gpB2~?>2s=s#`2QE*G?D
zxQfZfk5(BUvv1kVPJg0xH*9wkv&YZmth)+oer;*HTe0ljtY5EJy&uPE=G!?Zv=aIR
z5kFftZ+yqlPoGDISVWo&7TadkaC@^YZ!X5|T4AH(o@ZO{*R3BS;~R$QZrx3%ZReM>
z+s$%)x>MauyQW)oZMU6u6Fs%<*8Ca!-7bc9H63RCTrf0^yWOhan%Rqv8EzK>n^`uT
z-gSJaA4L;!VStsNuA0nyF3oR2Y3**-4ehd@5330`wCEdII^I{Ln@v5MD6|+(Ht)%x
z2h4o_uATI*zMXDOq+ues33O{uFtrfN9O4ibB00mJ`C{mKqqms1Ks%rB^bJQR;x%s3
z4*iNX0|~S3q~CBp3CXj0BOtB^Ubvt4Ac<$24wI9gsQ3HoL&MLkcVNT>*x~4w^I@}I
zK`P6Z$L?lrE6l}HGy`usPt041i#rJ8<Qugv$AwMI+BjrBYzugG>zD^`Js+n1#BAns
zmXKY`G?q5AnXMeZ0T8;AZ`5rjU<ouf*?BM+aAvvcVlKWfz{X8CfQJ1r*{pV3zZf<j
zw#{zZO#HRxF=p-Q^JvQe+8NvOgLd=H&`-9DrV;XhuPuZ&2v;pzT+e2)_N|ByY^_!h
z#ALZ+8Ye#ydz-oqr_&hnDcCVz?<VkQH=ngL{;%1ZrQ7%@u@R)&LZl53HEn#>pFT#b
zVZGh1huvz*3;DUl0j%Z)mXl#E4$gOr4TLoB``wb)8#pX*b2n|bfKr@rfASLvbADvZ
zjD;Qjw4EN>bsZN6I)GEveY<T7f={;MYc3BdPddMnXjW|B5RaAv7`}zF7u@v5wCB_M
zw(VAa_|4O73{%rjCyQ>qXo3Ji)rRYa!iIpN(<AI;+cZldY|(Beriu{YCm|=pOjm8V
z(aFS+;04`$0rzZ|@wNQk1SA)mro-s~vR}hH0Nh*%?WZ%od^Mf%uYm8OZTv>x5`5q`
z1jh+9$&)fa;kRqSqvbX*|Fpp8rw7;VW{x}<mNmOu_5$9b$&FSx#by9pP#Hhp2k%dN
z&}YggEaAt+u$!K4-otv>nEkLY$2M&Jyr$D3x*3B*A^fLbE|#mExiy>g?aJ>uLjPT}
zSeoX(J^6`t&2GZ$b7G6t5`pYC3&8<F+BB1{?VDxq=Bq7uycuQ~+{%Gn=cf;`iAJ<I
z`9@&$7F(J-%eYV59d|Qyn|=+ntY%Ay5*F#3&2}^2!RC|oLIeTDL}DyzeR|jV$;8b7
zQ!fnkWVPA4*LpRbfTkW(Z*JRux0^Iw%b$aIe$djClUhP5c74A*-Kn<X>oA{n&2lyf
z2}_PsEMo3{&=I^}7#YD~79zgn=&;ARkk~^-+~BZ0-Kj2T{Zudtg@l6=NBtzGnTz(X
zIP`%N6bIp-rFn!nHJix{5nQ=@XDTgT9HS5GN!#umInh1c!l-Y=oUjq>a@nsZn~fl-
zt9F}q)AL7Y>KYz_zJY$fr|Ie&L3p$6SGa)Up};d1)HR!_>9y!K-25<Y{X{3a+KO&=
z8yti+WW0wyhu$TQ$&=r)oNo}LMZ29%LM0d6-j1PS;S&$nY*sB`)`Jn-74p%GCdO}t
zKrh#(#><bpnl+Qndf80;Bq%ClMkOeO1#+f?-_cy-%nc`xVXVL}$UUP;`)JUfQWb__
zz1RxPe$cj`R=XPhVA+b43vr=c&Q{1NTt@~NkiB8Us@-8AI|%UMLIbGTLu0_Wj+yWh
zVu?x4(QX0Q<$_-Vt=Vb#h|UMgS`TMj;G05co_ouh2iTWUO;`n(f;7*!f)Tfl7wVu1
z%bS5K!l2PLG_7dZo4)a`evFcw<IBYojpUX=`ObB=?Q#k>4pYNq`fu2I!?ai)%3$L2
zq^8b1b5ba6gB{2*K3V(P*rMxvqKUl#{ipB}lK}^2VRF%Nc0AO!@wBsCLLm(|%7c=V
zK+)ZNMIrG+#5rU+!6!Mm2^uXX=rF2^jt!4MbS4us&n0%t!7sLUrXCq&n<>pxp`$zP
z;AnKv43sm^{YEbVW4&B;J>*VkSsU((ok2w!w}Vwy6X$}M&??8oq0d3sl`isxTIJN7
z4tdO}D(G$pUZ)i_Ie2ZkoNc%m;?QQvLu7i*gGr4R9BiU22q&w#Zd!Tn&4j;RttLWp
z>|)u@4S<R32Y`oW%esXRstP#{=^Pd=Ijqu?GXbJCI}pjH_4I+OT_4*=VFc4HDu~>+
zejinwFp@hMeX-nbk=+jL_uHfVu)fr)lB>95Y~GVRoQxALhSV~RbDXYBbP-J;8i-76
zn{jQq(5(j=n8jq%0}%p5L)7a;^Y-QVVBDrH4QB?L8L&L6?wCwWCni9+z$i?OZoZoj
zOqG&{EHkvBS<l!?CvYD-j@3?VUW%KU2{RHPV%mcLTjRFXs_hb)Cs@(~gGz}cJ9E;{
zUc)FmLX*yW9tM0sXg7Yk8d_fU=G2s^Aw2H<67_nqUK0tH3}Qn>+Rpf?1kx6NYr^xp
zEy&>Ns}*^6svkMNj4+-8Ik2I)pY;HC$G8{q^j34t5i(R($Q4ZBjET^6{J5|V-D(wi
zWn&0L<Tw#suvs!}0hS0zRzmg=v4y_jTaY9&>vDxlyi6rOfK7-a*<!sC{@Jamuh+0T
zBVhUu%Sp6P!ikA4ey;S)YQ6*Rsio^u|2QI{o%iWx{ifpvh9%xf)G!DR7F6ICx-1=<
zNs>TdO+6NP9xN4OHf@#|sz9@yO}VgnyXtAcY*7SUZ$LiXJcm?JKYD2b9-rx#y}6#P
zduBe6N?U%Af`C2Q$X%PEsg~r{?!YG+YjEg#2@q`PJ8(B4VC9aan$;{}+OIjI7)_)n
zQ;nTd?Re`J%OMk+88bsn6B5?v-L^-nNlP?p9kGI}gT`R_9gS`hMu*?|ZE0EwQb|M*
zH%(GOl0pt$3IPOxS-+bDj{Uq{Z&!=8RvZugU_uWxke<r7=pas*lXy*K=bMI>MvXd5
z+Cbf=p?Y_#VK%JEsMP!c6V#v=ES<E1(oQsfLIyLNktR0JwZn<6F5_qY;JGp4l&Fjo
z%KIc_g=vRzJ!~teuwH4wEPZ11)-!WW&<Ak01Srq8#MDI^A*AKJOdt$ENAJS4Ujcp}
zIKwrV(09o4X6q-i=RnYg-ey){6aYDSWu0K-I|N$n4wN!OP?KfF;%(cCTp?XxO*(W1
z1`7-gKD0%S1bs}EcO<2nq1sQs=sPMZJS4Q}Olr}hHRwqapi9Hb|E*gl${XQTh>eiE
zYj`?8@V$_DU?&9B2~C!cxr~7TJ$lFNp=pp$dc!E3()w3W|H9lg){%io4qO}g+y3R|
zOf<hK!;PbDce54P-V6!ESjnJ28?l@}@C3jaKs@E}_^B!P!$LR>L)So&W=tHyVy@p1
z8&lpSK%rUoU`j2Qkl~K5xP>NGtHr`O0M1M#+Q{#8>F%{3wtqPEv=<S-Z$+d=9z)n(
zq}}vzfIQMI*vcW8sdOOJDc&&<1?)6}i<g<^2XLv^8<4ynoVmzSR>U}B6*G?1B}8)#
zT?IvU6dWlNAQ4ug(co*<W16$%p%w$I01S!N+{VJEy_pim$l*v!iLbqMipWh-@(>=i
z-Oh7~9`f!f9wZbAD|eo6prL^l#F%v>l%p{Q2=(1UD8s~4N(jt5kqygz*kgX;dm}t~
z5=P{A$T_cG@{T*=j9P-0*-rH&<WZe~1JH{a$pb9~TiH4ddVXRbdl0(c+~^pCRrHYL
z=D=cFu1Icn4&amd2qJgWnS{b}0Z8~BZl;Awg1va75B$05Ych(pTnB-BH8;ehP2qP2
zOu1Yfa0lO|KgBTlMzSpr4O_=QF+lK}8=n(JDE=+*!z6aR{02sr#AMutcMfFX5I`s=
zzk!a)#RyA`nLKC$3pNv&j&nuD<PCKp&6T8ss=?oeFA6ECFFv&kqidH7`Jr9#fTYG0
z^$_r|NaJaS3wt=~tee3?yOn4vF9B+>Xv!{mm4hJ8F-5{kW+lqk&?TiS8QCmjF7Zhx
zltv?lk|wsK^H$em6OAMel_b+xzt5IvMMc5Y77XVGT531wI47%aMB<<?lXS63Y8K*w
z`muBz(Hw(;SngmP%7ub}Zff!q3m_88tT^rl_|gVJ$rK^|L3#cUh2%q#WsZ&xDV;d0
z@rJ4vlB31|Q5uqA6o<@KJ;}H^TH&xq6@d2@Y(=9&^kk0LVh=4_U#tOSY=TxH_Od3(
zp0}f!nQS`=O=`b1g#;NOFkN?Buvey)6gC(01zwk+JxDnd8TtEu7t;YzjT${kPwF*@
zx`Avr8GKHE2ILM{DdK}CC&_U<4X`J0azm1)woGRL%d{w2u!;Nd2s#2TX+>KhkPoIS
z&e)i!piM8&w-5LONeCH{(@FjcTHtaw#$PDGl7S`xVk4I_@KX}bz#zJk1hfd7#P0{}
zFcMSdCYww;2<h0a@Np*7O0MAUd`-77SEPSQQfN)m%k-2EymASW9iQjqIabj06KbXV
zfC4Q5K`fJ$){|zYXOyo2U3a8)uom1UGscFeG-u>b#E`v4Vw^VD1(X6Fcr$VHZcB1o
zEqddOZ>^9T5<H7rucbX7p%+>&zl9@qTZ0tNxd8u>WrCevmiz)&kZst1)5%%22<v(}
zOY(X(5qdS~G$+?n?<uhet)>DY<Ryp|!eX7GF`tKqOOP=Pyhu)gQ)NBWN3H4l*PI+%
zjiiB_Zf86}xNXaVR9S3R>JsLwP&IV|d|Uv<%&7Jp94|DDq>_H6?Nb`413Q6LuAbVm
zF#`NN@eg`e7O*3LnPc4hf*c$L(zFO|Fh5;_A~HxW3uDRa!QRz-KqTzQ*#-$?0}<Au
zX#nzc6A1<680M6pbBO@R-~tMnAOIgurPNlmIwrPTK?-XuLM1|hrXIr*4kCI2nJaEI
z9Nq(y?}d}8ISCy!?NoIJM+ru-g1BDnKWW{>SY;GL(x5ae^d+Sj4`(F-IPx}rj0JcG
z?sSL1_v$3b)Pj^OACS66i)O@K5Yj*96qK1<Of2?!1NlJo71wxQ5T@n!5RrK9j)Vta
zi3d`zEKq66R6;I#KLj0>CEyg7a&_zjfmRFyS-J{QG~|Q8hbAqFN>onBN)AManB5DV
z$YDzFm@V*D3=6#UAgQS6rkqf`KGlhEr_P~WB+snVWw($kL=lw&K3J-9ju|(+4)j>4
z&JaGJF%C597b%i!nTj|N7N5#9vgMtMhGDglUopM;9%B=+auWjt1GZ{7RP`vt5u!-I
z5i{qwo@7>_fvhVJYf@s~a3JKvS4dnf2%ST$hc*MB7+#2iyO^U_s!^yUIs}>^74ZcN
z(nBf%qG<>&MiPWsip9Hx1;!8rq8<m0&<#jSNKEF=ZnjA9leZQjpq$ADuA<it>|W0g
zFn=2-M<F5dGq_$RKzrD{$)4==bcb7;3cv;FqY;b1gay}TLW*NMTAhjI67mJiN&*xb
zTp*iCV3{NSNkIborc+cW=?F8D(F)sSa_ObiH~`BoA?RZAsDx(q91CTwiI^%_E=3pR
z36fT34q>e~);yd!g%c&e$S37NB!V$fu?9+)8jB2IR$}v{QiIdd9r)mcRQyJoJu)h?
zzXlz4++9qo)y<17>P)WfqTTFF%sD<3u?ImT3L6_9#_Z%r82^+}QMnQ@v86l+R>D!T
zE{S}iLFxyhp`&rsjhzEcauyC&03otAi3@nWr0Z_A95MqPx{$sn;ZOmIzWNU6lM@R=
zBEk;=hmo`0%e)dLSS>|`67N~N06476ph+S{OWH`iN)oQ6E|DhE81BR5JE*sWJ8%P$
zgDS-j_BGvBR$i?aZC=)nJ<vZ{e$?1Gua6p2(>59;4hfIwaVN9dh!$*LFi3e@Q4j(f
z*>M^qGB+nWaW@nU`-f1`hO`W@@|9S&l7En1CH(a4koud10^N-dQH()RNpT06-n^BS
z-toO;UZ6KpGI~OlLlJ-m0y05>0D&xKL<T0t?QWE-C71vw-Nw+;mp}(jm0dPDBiZC`
zJNSw!G7*sjlm%0lAPymwkRC#2@+g0j175GVJsLlJ?(i*kuaB!-2q5IP=-`YNv7N=`
z;I(itfNk6stcYUBlL94MZY5A8)qDvjgtmUGRL_C9(+tL=XixGW^QnBQIoF_L7>y^9
z-&m}bVr?)@&e^#h363O*@Sw_lI1_$)x$^((n3lF1QK=z)O09+Y5F|>y>Huzu?xFev
z79uo|k35g~9@(7Nq7tz_mmtw95D_e8pBedd!Px?9W_yGk5jS;nG`%(Vz*a~HhBrwD
zDM}J;?1IB%-E3K=M9Bds#untd;SE{bOj=n3bD%*esDKfqt;hwEL08TpeGx`VMS_l#
z!Eo301~EzHk9mMNMqj34YCT)yf)Ua5-DJK>HDQ;&a0MPvOhtUdTtQ4=QB7zR|G8Wx
z2I-na7LGA8w3Mzenvg&(>JtR$ERtm=py<@W9`lyk0oLe00Sq{t)JS6qN)3HYcM}z5
zCHRlEEUHWJMdqv-qxT_7{t?Sf2QE6<-<EK;;0rS!fPRESyk7Vu)t_)+l+6#|tJ%CO
z(20DR?@F0C>ZBT5RDx6+X%}`BppvCY!bYT?(j<VJ>WhthX-X&OM0Y$k)WSnU@uIBR
zBDf?$C$dRssv?d1Q8qcDAE{6(_KcOggo3=?YAYAQC-bco2I>!)P)-~jAoRgmvmUG>
z3PZ;Hu4{>Ml~swbByM`l*s)HOI{=0QE)iGrB!&=Jz#R*WB3cjZ5ME3((qhCQX(_b?
zVq%^oX#=&6oS~kl7z%{~kkqI->jE2TW(bMb66sBQI(Z>7b1KMOL9S<_ZcOMQoJWh!
z2TU>)Kuw3!hD~8;o+>m01;B^cu~vjbqC4BT*w$n-3)u}y9t=otU{-QxTxipVvWS8#
zSCt#NL)k?EB_caHjW-7kC`W>a^Z@`lm*GvApEf(DK}bxwm9!{uL?wx-gO3J9D>T?V
zTM58CaH=el#h2^|R8<#))tTM=wNohZ3J_T-?*x7aj<<m*IvWP3^TVDrOa>#bx#VL2
zM!}n2$frW`#1P>r{DW<YrP4>j#WdErQlv^9@GRkjRHRfVi&Wu1@nSHnBqh);h)M`i
zVo@ejfiqH_R7ptz)l8%3a*J$~vbQDz&?{%$GJmgJ7-1kZ<s_*SGgRc1eo?|L>P5?L
z#Z0aR>sO8<WFewtG!-zdaz6~NxT+FOp@}+8KHkv=`4bX8y1j_wL!YC+0Vud9*M?vW
zO9|aBf?P^F1vTje3W@64)EzWxPt?^JID$qIN)a9*Q4nleX*Ga2plBY5mkD@I(PS?~
zDlHIDr2JE$!b~(0<*0(j9Whdngujz3fRGhbg`iQF1T$b!b)mu5ukn1ybHb(|0~s)y
zdEgpL6MEUc$wqA8XGrS23LlZ0a#9S>DS;wH(yx*wg9TZDwC-{WMdcDghQbDug2=>O
z)0x&OZ+8oXWg^0pi>UJ?1SOAB_JyDgj)a^$B?w4GM0gY)=pG<hqLRF1KrR<UaE6w)
zygFpdv~lf}h?vv(v+kc{n!)MdHKfYY=y8;1J|X4W^G3>5o*nO=8L>Pqu*7?KP`F}a
zOc2n6bwa)bO3aAJB18b|^cyf*6{Ff1)P|}kc_FL1NQhYiJYWGnXbz<>27JeKp|+WA
z3kQM9l47{NVix%^xmFF=><Q<rP+Guc87WyO6?Jhrp|xU%xPb7Q2OVre*iRw1FzPDg
zHxWI~o4@80!Uhv~p*)r!=nC4T^cu(lfzc{ZoTdX=g3Np|)qsytqQbYwP%{5`KnY~I
z*Hr$yM7l>$G29%E(@@Rj$`v$8ATIjU6UguKsa8dhv4jYUoJyUjZpswnFEZ_<Sd$t>
zf$+{?NO(E9G?a^{;uoEtQm-xeq9m9L<!vdYaA~}jntWISYD}has~upLg$F>Kdn)e~
zXjK$L^oS}dLK$C^y(F)72DXwB!8e%!r-rP96XX%qqP(4wSLHaE1NbP>C<hkWnEW;g
z$ukC8K@HUxpdAeXdgCzZWmpSIS@KfC6ZZzd^{jbL4?uK1Kyr^lu*!bs-DH{>Us2yw
zCL46a5)mcInF#b&IGiYxfD)c>Bvgo4YXO^pQz^2+o+=apFp@wZVnjZ@$p#6ei3gw$
zX+tVqpb(Hy2TYs;)MmZGl8kAM2+QYoTLs_*lGIdyc#0>@V{l9MYl80(H{_L)Y%u8v
z?9%G2Ziy3?@5~wqE{6J**{V)TK{AOt#U<c+CqRjSlIm)4d6V#Eo@Obt8e}pSewe?w
zZ8AIZ8kSll+lUV10^}ry3l8!=P#xwV^MiqLaZ8oME7n((CKUk4Gf6xd2WZMHuN0kf
zGNFn8kO!4JB+>z3f(WNz;Aul(UQ?}DGsaX<n2h{Bd5!Qb1;7|&6FDCMD1Hmf07T$U
z#E|N@)e3+gyf&y7QY1z>Pxf0}1g6j+Vgb2mhqcai`+Uci$P-(Fr7Ne?Xh5VvzS||h
z3W*OAs3%1D2@hM*gV&r`9zsz^nP`-z1h=6^fJg-d>K4TeQVG*c_N=n-Y!SCm7##rM
z%~54@M3DwL0wK{qgB)*wiViW!I2UtYAX&zPNAn@L$gc65sc=9#P*;?dPMGuw_Y7WY
zE2<zEn!GxWcB6`0AkG{C0OfmT;Kf9I;_f*K4t+tw;HsEs%7jch@|7GO?@3q~#UXx$
zYUdL4vaMD^U&_3aKdWpa6F|qbNzxpsfD?4AvW~5I6|o#fj@FCOyTpPQqP$|V;stQY
zEi#B!CKLJvy^?gsvw=>f4<IvTo?kQBvr0(Mx&(1h-Z*QS=vxz_4S#@g0zP?sGa9gs
zj7??TDF08<xjz&Ja8T|T!VTd_36wOa8iv9J(ZXk_6o7_0ll#e4TE#a>U4SAcdU9g&
ztBKt%fnB>@G8=ukyIi4!CnS<o#UlBAc~4PUVL^);&Eb;NmY9}H7>{J=5?SEIvre4P
z4RP7x9IwLXLs_7S#wY>eyP!<YLP3Y8CZ{D|i&V!t!+j-}*PKuaoB1f_!<C350)^5L
zZnRQp#1*#{s)#^*BB!B#y_OV#52+YXXN=y<w`iL@F~(x_{J(GznJR@VYJ}(wltaZ}
zvT;IqLTnxctmh;WsVP$czb+Apdh^INlLm1x3kIyEV<@saSuVBLDXE}}XHfMDjgcZE
z7p(jXB;^ixD$<8ppzf&x9N%b^W-I<z4vYQkbOXbMx&%>=s)Yt6X#{sc7h()DBeXCB
z%g?ZvWJ*9Gd4&}D24_UDOyyFdnH0F`YXIS*M&5Z#bhZW~S}Ee2#$_3eHC1K~n8sES
z5iSK!HQ(n2QGj$gDA{-X5MDC>n3F0mDqs)zd4VU&^|3m^lJuGS2F@~^-b~SoN$S%~
zf)uCWfqF<Cj@3_61VR@bH}$W?PpFzRK!cDe%7ef_#02ni3GP+CL?9*aA*1>dQqrke
zf=B5yBUGsxbT~?QBH>{x<aIV`DOXWlI=zfCZCYiqC{xSB!kQr16x0iq+>L?686$WC
z5fPfghZNQ-d(?^u4l+r=gd`I>4&aEn>To58qr$JSHojg-B~VL8g)=1SBgGQk#d(*o
zCPCLsNt6bVh2owR7Pt$nEEFmIuO24_0x$$5I!i8<KE|_p*7OCapK=HpJGjm~PhjKZ
zNV%jvP^1e}Q9w5}lbLmB3!p9a3Q-9R#ZyU|45^lCk*A4EV88n!xq^+1C>O56H_IuN
z+VZYAPS^zjE~FzfmE{@*`i}Ivo}&TBI_a`RY+8pXnJO4yDKnEc$4!$^kz&$g{H#l`
zUS&gs)(9+STIeidCA`pEloPASgt^R5IV(aAZ_p<nZIO`CQDc%;fPrliW%NYzSA9Jv
zjhe}2f=9H36z(VrB*TjSVoNd?gxgkvDj5lv;E<QeB`Zy>rF{mG^rMo%)aGBOm2bc~
z$pOjYFj?Uf4Kr?8NfahvDyovOoF-ux0G+Cy&l*rfL?YWX1uyiM+RhG~WhYr`N;KeQ
zW$%XY5#c<`lHluD3?W=p!2!iLlopQ0ps15swwfFq(|1pPG*vy3|4SxRXlkY^Uf^L+
z4Jope+ZljPojtO|k3u`(L-OuoLDp1I1h`e>JI)bK8k;A{WziP&99>q{8@Lb*tF#p6
z<Iu7=nB+w*;aP?IKupq&2QlKQ*UW_AXVlc97V_{g1lX_G#vti?E>0|l+Z6~<$hg}`
zk!ncO7gSWiF$)3Y3sO6~l2;)DrJk2mnANgyuyR=IAeb>p+}ua}SENV<mH`Kbk8-ZJ
z%vd)dlTmFZ3TrH5P<E866%$621Vu8DTng{TLquqm?aL)J-qKH_0g2Q1bdUmP(}O|M
z)kr@;wY;nXHc9h1+&T3c-<Q;vO(;2tgIFrPA}oX>>*YCWY!Yc%$Pfm$jwCp2SPguM
z>FZ}1AIZqlb<&+FGjcY|MH>0(WW|-FM`@UlBCODc`V&QgaxptKXkdc8It3Fxa0%>E
z?pLgq`nD>Mc&ArH1}Oq;nbC{x;*z{gvdUI=fY8>>VSUMgtj4}j8YRw10Z@=qEz>FP
z)P0H<I1BiR>$L`4GRrVfKz$;n@mJu7B`8`EZOELZjH|hj95cQUHhWaNB{F3prvh6_
zKx#Etic>{NR;XTEJ;5kSu~HRi0Et|DF<Yf`YLU%j>AwYX3q})TX*lc)F=)78NLjT9
z85hRT3Y|t?6DT389kmX2r&=jvGlNZgjutY&C1A-^HK))|6i;EK3==Nk5~8H|DE3Pp
z5eu0a_e9M!ndRV!vnW<dDo`s<h2-K+U=tu@E|J4rg0VAM|IhV!egr_kgkg}N)O$+F
zyQZQ<u^H-UDFbm7s0D@}$l($S?f3)0Qfhsv$R_Mh2#VwqRYQFZltPCfy2^hrSHwWp
zp`mQZ^i=NGif@55nL3^_vOe0Jf+&H9K?*v2XogH-YZw@UhIe9muy`nYfkqm)dxHIB
z&sk<y2oSR;SEvEBnjmaNhHODBg=c1jUMe42L1UGo_8_cJJz>jhh4+j3Rqt;8o2U~R
zECdPgfw*K@rSr62qERJLQjgTwbf>%OTJc9}L_$1OD;|*)VPb&g7LyPtdBW7gNat7e
z>zK?oOLSW<fkj1ZK}u<_azaVOY`M)WG<Q{zixtXb63fsDQCICGc&M0#6uOSr>M5E$
zz7dmrP;e+1q+X0@1)`Y^L}^mJkgs~)97z!<yA#ihn?l1(GeAS0mCRnqgJ4W<=N!#W
z{#*eL9o)>tC*vSsNA-}kxG}XFfJsJ#i%_9%SP77pkArGLe(+{iVA2qEh|vt^Waer&
z#RcKnq$bk~ubCqRBNq%x5x5wS1R%9Sf`?0?O=^~ihG&^Av;b=-$Tr*_4kO1Rec}@Q
zgq}9{fH}9}qQbE_KRm_<7IzsE0<M}dh78T9@sl}~;4R@Oc2Si@bX)av7&(v_`w;0V
zVTusgAwb{~wVwjIV5TUz2Gc~LEHMcNhx)_h#6jt2a*#)nlK@gvxhR`&J^*6Co+uPH
z1G>Sld^>G`ET74q)c`3(G0#{%p&&R5IaW(cs*%45;nRs*Vq2<XNj1@Pir%k{b}qpP
zSf1WcxuH(Y^b!IgabYkEv7;#PqLw(pc&eT#8^)bwnhQzurY};uXRQ!|DD(;ipf-m~
zt4s;0>48FFONu4)Rg$?JBBaBW13lY3h`M&^ykwSB2~DK2LQA>_%3Pb@8c#G)IH(m8
z0Y(g+0V^R!LS*t|X+=sE<z?YnPNH-IHmt9et*Z0kF|xUaZ2;79L0gm{$shj%Y(Vgm
z2>}CTMucM}e6o|aCP4Ng!T`9Ib8xlNsxD-C94!F&Ncm|Nv1xBIK3XA>$w|vv$Op0n
znITBbUK(nwQiE-w9run7C=BDKF>~gow-_?y$bY#+?vG%jMM5rUrf`FBlLh?H9nCoU
zEM+ZAEm<hFkM02tO7mG`B|^Fce<G*L|AS%%lbcU&fUIeE61p_&2u;95IUR9KZiMv7
z>B%|@ag`qdf?PTQi`k-5?uaCdd}@ges2~8~P_`&fQOWTk;gx_AxkK(NlRbHK1`qxL
z&q78R52O!k@YYlVnOpe=&sa*Gu>&w5C7EZ@7T<S?Ks4SSEaBATr&CI#WKz+G2(GG6
zMDz^o1I|?7K7}b@0-zL#fguWCkj1S%S8!<hLa1f~aR7M$ctq?Zkf<0@IMo%%iE!T{
zsX3wQCPhVB0VHHM0~}GJ0I=mYGVxgeIA8}4njc4P7Es&6aH$#C4&Wtp$>t;=Iu385
z@A9wecmPM2h(sV9>Ki;#cZlY^Hx~?A;D-u`WLeN3=ATw%-v)v#EgVNQrIMP;(m9OM
z1(^!RAtjvUQXRx2Y_Tm*<qP^}x>NE2782u#$gqZBC|{!4*+e204Xy+uvb7|_05=2$
z{p8+2b`vgrVTncf!_oo^snD!QX4@*IFm7l_dYO69(4(L-e08#nh_o+aB1*355+q$I
z7(NOw%tCw226G{3DK=qV?5elgL!e3qnrN6bc9lqB=>(NjN=Yp%hLZU6tcnZ-u_RXz
z>nxZ>0_~~+H1Ym1e!Lz8LQuqJ!IE3b93dB^1`AWh&oC-1S&quX5KmC?tn#P+Ybm0T
zHDTgx@RKe93G6GA2l>-F@2s-}O(Z#0b|*QYwhy*m%d!CFdp9TdLAB=h=<M0ALP|*F
z&Vmg7V?U_e89yc&D)WNpne%)&tU^vxH^vT<uOov?qS+rJrKjknZGEzUD3hH~1LTMN
zk!c0_pc}d*Sx#XKYK}5Oyc|B#V+Ab_CvU@hXQL-kGqj&AsB%LBXcR6D7-abma;1WX
zhlX<SU0y3<Ew7yoVi=*^mN`KVi)m$Hv2p-8aGnc;GPRW7E6ow-J-?`^+Q;K0sjaX_
z#Fckf8)1G(bd>l&U0|u6H)V*xo|WcubW;A%JV7$f$+{1!r#z8M(22J4K&E%FlllOy
zFtxMXf(j&50LIeASxu&1!p-8w+93IWM+!!iLa_-b1C2oqgxVz_a<c&$j?Uv&=%8w#
zC>L3QWsQQc!Wk+P({xFCXaO<~&oQ_XxVePN4P@9V2GbA1QQ~Ozm^>%NL6It9Dag;_
zW!;KmWqB3mLhXk>JX^(7#f^MhGV@tC!F>^iLwvvz5>D!l+ax<k>-r=MiK3!Ol4Y3$
zV5t>+m{DZ}D5&V5l8z)IEk`-9ASq%Ly@MlF6vSX;3$o%#od+o26QZK7p$_~qi2z#;
z(<ch(MHZH9D#E9zlTf2TGaQ9SPd3-?JArnhNC`2@ag*UfBU8))wx~xmMtB^GB%oqk
zVpxD6=0z~K2$+g1ft$T<Btf(SE#c^>G)eTZcGV(cvARM@J@Kd|rcn!M075=GO3#N*
zWq!dZ5^A3Z0cRpU>f(StsL$p^x;_+w4RP1H7dn7=g5DWqC-A70Q;AR-+QXt+w^K}I
zOeB&l@vtKYC=jMYMGH};EJ7|pqw>_8L8>R2J{^cF^?VwX--~K)zg^oY?n5mGK{6sz
zDB{pF0tYe5ngIGCmdN`u^5oh@5Qz^teO?+LRZm3L`Cy+pQzz>ZEDg*Mn9r<7o`pT(
zqJ~a>$WWn4x)K8sx@AEPb7_jS7)_!U2!AjQ-at)`0j3z<x&hx)J?Yi(g}zIzI+>pS
zn-#0H9JLQBY+Yi77Gd0MQ<aNFvr^28t0>_BYqCU!SKSv03AkT__~~3Ds~(wXL%mHa
z_!otyuqL{xn1tFwh~S1~&gh*W4FU$ZDg93F8<aGV+-;~KQPp4{FG`T6N=bdvOXw~T
zZ2^i*q19$tOOZ|$D4~0%<*u4R!&Sv&-8D#V-Oi(tlDy&-1I1AT01BT~Y)gEx-rej{
zI4&DaLb2);J&+4Gnnom*j)1{1F;d5^b6emq^1Sl!wP{AW1#prGG^f~9Act&Sa-`-g
zg-Ko=9JgbOtYZ_m`@oK9>AapvZ`%SOAPbpza~l~V>4ZsSlG99rp1PerA&~INQ35Cw
zv+bkSrO5&TcS7n?<V%nw$eIxhg;GYO<Q$=GmH9v$u4PJq&G^!gRlM<H$E}ko0yS-E
zM;b@5vs+J!v4fV}0Y*h9n7F)y0!OZxP>X>n^jB>sPye{@0)QeaSxFq#MI_Skj<zup
zxD>bSV+=9%m1=@hWPrLeM!qI!?NRF>a`V)}Tc!(ADHXAx#wI)BQL6A&Uq)mmgozv}
zmp3yNM!;1ZmYb{}^_}oWaYHdIT!!8g(K!|!fUbz~oS7DbXUw+}jnRiv&5`PL@>LMy
zao=U-KNF4&0w}W-S)Jq&h^De%mg5lVlh(6Hh%zR+l0vdK5D7jjm%2x-8-QqPrM0Oo
zB9cUWcC$05vqlXu2DCA7^CN}lk~i3+$VLW>94C45sC7C{$p9zAsVjiv13?v)I8g+W
zNLTVs@3CHs-XJ3iaq2RBh(4g2dAWPkI)}*DWU$DLaHxtqkcTK56_T)_axlJCnD(sP
z1KAVt<0+V{HDrkx$9;!XgZs%ECA=CvfL8(!QOcGu9F4S_ngrMdCy*49E8*Aq^W+AN
z@}t&Sf~hoLVF55^7I6~NilSN&{TgZ_S=#zS5;pswiK3h}nZi;8c7--Q?z{LzVmviU
z)q&~|$w8bSYXZGIo_r7mGTs0hClpQ`&#?Te07A(k=34gw_M@uAHPW)+Nc=+3!F#w@
z8!AaSD%}!AP&@?$#2c`S{vS$$?62Z=Q{g69&<aUTH2PZckPjg#d0-`Y!jUK7L#$kt
zyC#@<Fr-XI!*IHU{v*&R*o{m;orHksI&ugA7fniFGxV%Yj$9JN>K+G4d0FEhF{8@*
z2mn3_7SJh(na-5x=HIz9Y~MC45l5*s+zWq%*^6zu!XRkKEPb1$Ncx{en1B=>jFikz
z+buFKMPS-s%c2%!s(<4wxFX#{chQe7LF19&VYzmXAfD)KxgP<afUJrSEyCdx8FDYC
zzD4g5xm56g&PIS_=@LMm+6nxWye0^!g+UD<W0S-tB*L~3Mp}=zlXa&8L}`fR0S$^n
zAqGkzxp=X`ZUOX#RC7UrWYm<w2|`d7c}~qqYCAdn)-*T3c&Tz>`~9RZ_(z-oK%&AJ
zMvq}>fkI4bq9O=cq38h!ebt?qYBF4kLToREJdVjcrSOaht(5OUY@k>W4(+50C=H_#
zQ;D+?o&qjY5EO;p!7EQ~O@ct670GEqq?}5MlvdgQR!$hj(CakG)I^w&*{e-3;+|7Y
zZ&e8;L-rh0b&13Zvq${VcZ!3vmkb>X{?3|fghS9FV`hs80$O%5#0_xZ)asBN62&bE
zFoIZ^!AlB&1SD>22_i<EmISr36u;&y_>=6s0?C1xNE3Nr$cU(03!;|P@THpAtTo6M
ze3D`E`+@n=vdo$<=7))BisMWWc$r+p<XwWqCYmEHa!S%fCZk!!N<nz&7_U+>po4@`
zaxc0AK&Hr-5|irpTGSG?M}rJ2J2zD9B4VwW3Y!p|1TqnrzeyOTjiL>bIozE*B5<EM
zf;NE#2EHoXfy&hC0+zy?#V(Qx;vjHLGE+bSAlY-1y$}-l0=O%oGer;C@)d?t9m=6#
zdRdq)Vwk@`kU(#y@$}}a&QMjA;x3s0ZXJ<HD|o1y`S1!&hl|Er>BCxVR0TL@kxhg=
z7feVHhEjOB0Mq0_;&LQUJyJS4Tki<VNTqNs9TH(pnP|%U2-MIrl}z?E#9YYDHVU@8
zs7fCLLAxY=an#9$*b|pR0?#mDPQlC*m=$shyB3ov`vRa+eurRCK_mI`)+{zlY*pSs
z;3Bvkd%zAYPC+sj=px9c@Ta?yF{hSA6xME4H0cXMYU<V8S@8tzTotDRlW1lfVD>x<
zOwFQA-O1^>BMlb2r3f085)z~UvfTjy2z~|bvCt@4($f-q6hmN%2x^*S*_H^K()Z{>
z(W%-pa8+_)J7QH<a#0ylXOvxW%;4Z}o|rFJ{Xjv$dikNoURRVZ>$>Oy9z^W%KXMyH
zM?pr_@oWmR5|RkvwSx+NW!R{Q3|L)&!KTY4(b1M5ot;gj!QgMG7r_n!2x3a54;jIb
zLP<(5EE!Erk%$@5!CoXOU1H{1frD`DlBE;~ut15b#cdJVWR`$3rY%X4#6-#`Av+c*
zibu6))yBppAY27R3LLWZD21)UhLnij0quxw)J3IBcqRjMB6b-pg&4+<Fj$uen4^u#
z!+U(C4Pu5^?kKZFt$9*awd#;^S(}}RRaO-nTBH<LkMBfBvO#7_z;GKy17;YEqED5A
zs}?g>&@Hf}*2a+#3@t$|gE@?Sl<>$mTka^+MO>B?CmzefNvSvl7fuPN`GVCYiwxe0
z1#}P#HDuAUnNA)=ZXSvhrqTQCXetYpWMD#*yVjl%Qd*SqRMm2Bs=9Q#@RYJgTB%D&
zY|P2?B1Y88ENZnD7Ih#)rQR~qio!!e4)?(F<ZX<aIY$OlvKBS@m^WEDkTjL_i`sVK
zM2ZUwFmEJNC@~VCd?ATN9kRJ-lMU%iDwymqsZ;)6gN_km_IM%%aGM&!ZUoX$#;CVh
zX(*qY%4twu2k~dAWahE7E0Tn%`UoLnFD5d#A#gKFdybJC6l?O7RfU3F>bBGoB@KXF
z2M&>ySs<ugq2{=C7`inpk-u!I!vw`RfP^2=N^78yac#DhuO}B1DFYM(M4w+%20;UO
z)H+dzvgicqCxQWFUM=CJpghi<;)O+V#gJTf0n*1L3yCb_qL?LM@wj!#Xk@1V4?~MG
z6J^%i-pu3yf_5axX)wCM&=Mtir_{R%a5O=_<5BB4%2e_Rmw`j>4Axj(0y>bzuvfH6
zAY?V15{hO{knYWubT~fwm~$$U%T`jAN9G*I%0>m7U^PrF;>ZmFax!^9tcc40ah=%=
zJuC1mWqrukQxyP0s>d=^RW2wF1{d+)+=#D<Mu=C|XHr?>nn;8(zicyDMFPitr;sTd
zwU~J(g25yAnfn?5T?ZRTU0H6W#7TZ3(Urd^^eNA<S(BOf*zT0_kXy1ySpTSafhLun
zaOLu2G7|`tG+)+kxU3>FQQ3wMpbDCT_0%*yZXIGI0V@z#m_QdJ+6q57KEvWFvWY+z
zd=N^+L8V{W<Rx3O5L{VmHY#}7cgn4>a%ZrXtp6lxMDe3zLX?PB7>2qK*OIFe+?1Dr
z|NNl(3559ZoaJfdusor9iPW0c!lpnn`BhOXMc3NO;bxN+(-pMR!0b(;%8aEyYMsey
zj>b!4f?S$Z95NYNO9)O$i8?5$=~QzjP^2uKa$)p?Y6a0pvqDBTb$}G2)L+<T2C$<r
zlH=uyh0yFfqV_Aw27s0FBNUK2Y-I>r-#(rdtjbp&k*Y*42ZmG^2ydixbkpK7={Zsp
z;+9>P_)*-{WM!sgOcKhY)+x8hy6kLJnBZrhS_vr)qe_zoSwHDo>be%)amE(6DWX*f
z!Bb1q&L5AgimMdm2~hC2kOWnLtH4^a0Ok{A6>XqlYQAz3{b@f8%!#J~)Q87&mZo9V
z09Qk2!#)rvAShBfD^5OK?su&NOb|IKRjd?HMh9s5jDKEyH?j(f;@d@bOMrtsB*Nj;
zuxqx%%ZqI`qESF3l3+Dl34pKW0AQ|_cgM5B1WK7E5|g4xvbt56G=;KR>ke6oG=S@Z
zCj@^7Lh%W`<~X`JeXPX9eQ_bt?b(*xx!rqG?;sVTazTd2q8Un2Bv}m9`kW+SaqBEQ
z632tuj$2n*ZrG1c((A!ZO6)Tfr~>^8?9EP_KpgsoPo;WJ-BwK5o=a9%JnB2N4c;P}
zSac-`h2sJwQY+j5i*zYPRKzlMPZS2skpnW>FjC89S@~lnM(uHQ3z0b?k&t9s;SJKB
z#j9u+Y$lQkNTFK<VS-QP2WZ)Zu1BqNXAC3TMz|th!Ohbq!J|ld@R{KQ1xVJ}y_OaM
zW4kooP29l&9&5XnoQ1Iw=!gS2snRHp(kR4lq$HAEgiKjSU<QWY5TQ6&&kitur=Ft1
z*&HA{swdph5>e;ux0+Nhr^_P52yBB&sUkrTvKrPE5ixBaLM)C)R@9NMmB{B$WdCH9
zIO8mEk|j*mARs-v6v;8uw1E?-DzXzSBm<+KH98UgYApo)CmR@KcNQpsb%b|jH5?EN
zA5KjKCWH$pYoTLhkuxqo7M#$gsozWopcj`Tu9(djDA+7JD9#AjXrtIA(5TagSZJ28
zoF2eiJ(Z+h2m&$449SL>fkApXx_VOKRb^pfVb^Fb;-ei7bc575HUXsK2viXqn(c;c
zNMYhCkPu;*CSZ`9DaOFE(Jt~1l>r!bG9wbULtqug!=cKmQ(%d#k-qp;Qv%quY%pH|
z8CF=SCdqCO)MT8{I(HGm&I&N?F(3t(6mpmdYy<b_;EjNZf{|uJ>(rR48KW<0BnA)%
zLb+DBkb)<5Hjf9JdQQVpnFBCm->Mk%%R~aPSVut-BM2VKEpUCJi&c%*4<YcV5#o#j
zJqo=fLv;<{mpLb~lp3`ZgA=J#MjJOG6gHGqdJ6v%GgChyPLlnyF8opJ%qbOTw0l`I
zrzN>ePs33;Iufi&Yw1mBVQMc`cJkyRRc(-E#ALr7whlZOG1Tn<nf!@3;e0cX3aGZq
z=i)pgkX`5El?J6UoD(4!VT!!(qt;>jn7fr59srV3f&$&k188TeQ*<J+m9kXHZT<l^
z&5m#ASzI+);bH5PE;5ZsGByJsWs%5h_SnLScEg=na~rgWU;u7J8`wfsq#gtj#`?eG
zX{=N_zp(_i#_=h7*Uz<|s+f#ps8`ap0YsRwT%<5$RH@*IOw9Lj_%PQ%G_Wf&mjxo`
z1k5kRrC<XP&B9R`cjYr`1F{n{ijbJcrz;1emOSb^m3MS!R5qKx*j-YrR31!Lf@J0-
z+N@Mc{V)EJnj6{`_?$jYxvkQhM|}r55YuTKT(mtO>`#HLWeXii5hb$xKeFbc$ui14
zU?tfQiAzE}+0<iTAg*BKcAJm{_Bhm$hH8d1OW@gYhtDbfL_p`ZEw;}P={2WWsYOhF
z)H;Tp{lnl@3jyHe<n*)GTq@pVJ-7|&K!cghnw0c`s99%11k1Vz1vHQPF7<nOqWP+V
zh6_TPc^w=YF9tlgIIArLfUq|!FST80(+1c9k%TiiXuBgBFqL+^l$>N%1VsS|ywFkE
zL8&&Ji>&D`P<e7AVh{0)C+JF;!|D)1DH}Wb8D%b>@J3e#ETwm|w-6#BRh+s_m8%hM
zxCATttWL0@gr`CXd0+8LVO*(#Hp(!mnUF$UhMBz{NJm!k@RWcM^kl&;MT3!m^tpsE
zMWrySv+Ji?6ueON8s#5Lw0d2Vf^X1Qv=Aa7L>Ixy4#G+=i4{W$Fy;c)SwNG(Op$@2
zO}PZye%jy6$U#c-8&+TuywH6eH7D1SFZeb9IM~B7zf@t%)!8v58#|#i3QLqIW&^i~
ziAoX)nU*9`t>YBA9y5o*%KKF!$=u6kPvC{@tV9p4L-b3YhkHt)0<A|>kbs5`qMXT(
z$Rn%RV~kaXaU3SZVh@r1xv^3Xn^#IjB4m;!M{W*Pa;dxu<|x?%5UB3wN`0t)C({-A
z9J;4}YOWR_NzL*n;0;z1S%Jc?euG-UP9pa+g_Qe2<~~!Oqap&8C4m<X7wF^Nf-cRc
zEYXJzu>%XR0Y5+nDkJOhrKyX_W{hHa)FcF7x+)D6=4ni-0s$6|)pk5&{|KglfXWRn
zDFtZiijaI8RtVEsm+Ah*G!#DW98x!jM1FN2IwiZ+h(}@zGUX5HVp<nl37*R`Ct;C0
z7e^)ct#HgG)L6;JfIwuJ6nZLNAgpIE1k6)ik!q$a+V`Y_HHQR_SVn0jTv{jXo>r)H
zP;IFYPnLoE!>85OrQX7tEy@`Hm7QY@2W#UC;Rc%prH0b58Df{vOIhEOQdqDC(g>=Q
zk3*AF#7u^VzacMTETt&Anfc0mla0v!ka>{&;+P48#Hi-NuCk0PQcPT~nwu24h@8ry
zjV@Uy>vjmfAZN6(BK3F#&S3Vzu`r<^D}$Jsmt8V6T0tl51KdbM=u>N3)wD^``<#!c
z`Y`05QkCDmk^RtzNxjlKC>C&{8U>9v=hQZF>jV`-G^srMQ)HVZH%edVM_7uSCku)w
zW&1bkpfXd7L%<V>1=5e|epDRX5i(M9BuAYN!qr^D5+pP*746xnScFBKvg|(v82QmY
z8iqW*i)2sF>{5)W5qae!>FCzrx&#IevD$fs+9iyn8ea7i?rJ%ajeFq%n;Kd*LC3{S
zRGpX!Fd_v8lo?Bv(I9mS=9itWB>oF+n>Da|BzKu0p*6n?Ly@Gq0Hx|#fHf3?&gf{Z
z@Vg7Os6gC-lxUQIimaLPh|mfqMx#`1ZrrJ;e3nWd86-Z7UsW#~4-1cHd8}y2bqaXE
zbN1LU!6}wu^O|fmkU!&J878e;+6g76AOi#s@oPw@XUT2=z_WV=Q>!f&v$Jr}YO)kY
zV?}fj5M0$(mNiOuqI2L=sMHINDYdNG)H|z=0pVJPr*b)~w3MSVcGU=KS@DO`St$m<
ziy5rm8>H-GJ!X%2fP&g%i#`G-NqPxz0t^92$QPYSXxXrcDY6#@+T3ThxZuG_7CK!W
zj+jHDuom2=X{<ciO4XGzHL0=6a%?u64egjHMIlS$cm{Jz=O>_m8I~@nJ~n&uI~G8e
zMG4>ns{(4sx0+}Yf<(eV_Aa7VS}-m4*3K6$p?;*+B{H4lr6o8VR5>CM*ax+7i0O&E
zyBTD}IugCfyb@e(N`55p#VS?8QbE#FlyrX9%$GzY++;qd&P^%{LL+XlE#ipE1IY#S
zc9Oh;z@_*x|EJ1;)S0@D^iwK@SSlZ&UYh}+ubwHNXMIhrOCdf~sh6@KeJ@~On=<^;
zL39k|jWj*Dke<i4CHu*fAy;NB&TMwLYBGYe3@YqkwMQ7Eaqu>aRV2<VR}ekH72XE>
z(S=sANmr**KYK9A)92Sl)QzMsvgqAxWgOfgfQpl3rzpV}(aY{oR{v#h7Ci;&h#08~
zgk$95#)9UooRnXcMW^svGbq$0FluR%G_EdE3vgk7^kN|*zYv24>zVXcy3;8v6RZ+(
zS)sZX1y*d54xv&N)2C{XHVCum5#^1a5+c!G%$A}M)51s1Y%B%xi&#$bR8&Bb%p#oZ
zKWr`wZ$uoLdZ-XuW9qX}*hTS}OJt2)Rco=(c!gA^V%@xZwj4$ErHruHP&Wy`tP~`7
z>K=iN%PVD{NTN-qmWY?_z(GX;(&$Nirsz*@+CpdsARO1maWuoIx?Gj$f}X&z-Wy`#
zB1I!xqhlk%YKB*;1D%pFff^&7q!2>3-f{>ss}|B#YSk=&tc~Kgx-d#)$bR;ALDdBN
z?8hc|PTPd*Qm3jwiG@)))Q*_UuvGej^9A5l7OKl&8myUWs?dh{BCGk~LAp~G#lWs&
zje?(mo0KeMSx4pSQ&OfN4+TnnKK(j%tNderoe%I)Yh<+%y&0APiL+}J7Z+45bp*_4
zg*cNer|Zdw7+c#8k(Nk(P!)%h#BP4w2L`9Ys1M8T<dK@P$AvbPU6_5)Hi3iD!_P8~
zviWw72`G>Qa6yIT(Uw@Bg0g^(>~k7Ruv<#3ljsaGux}s@u9LqD4df}+aD(L8Q<c3a
zrJ|n7Pzgm?vRO|CP}V_EHB&K6F(?b5RWqPTsy;|VRV8aG;gtTX4h=jJ!lcuaIuhHI
zoxlyXREdyaz_90ly42xj@qY^QNWj?w&oUd!&K#7|RN8?JI%UKKZ#K`7h72k-;zk*~
z@C+2As+1aY1*n2*aRI9*P_y(C%1>h_!HcFKwvebi$t6rrOrQLTdP!JGZ0jw}hyo{f
zn8ib8f}jhZ#hI!Ep$Umn7A+E4f(v~G_*?F7dsUFe<l}M_ILp#9MWbR9w&X`Cqfz;l
zT9c{BhS~QZEBNvtR*xnsaD7T1aJM9Fg+|+~lG^ETW~c5o-;AcrznQA&%@RSAn&ZfW
zz|6Lc5FE09mg%93Qf`n$uUTT*6%ZsYX0KG<Tpk?bw7)XkEK;zzw8A4;xq~Mt#c+SZ
zlCjOE8e)><umu4C5mCz|N{_{R+sef($}g_2(iakHE-hEebqeFkD|C5wT&9b1E}|Rw
zrqVZqr5GT_VRCaKp#T7_OUNE%15>M1l$uu6pcJ4E2AK(*0juyMz(uwYipyw-QUZH6
z+fdl<61A5wzMw8vkFh<20HN_OG!xy*mnNxcer3gT_JB-o&OEVJk+u@r%zN=#)<y)=
ziF@)=U>ne+_qjkM%yKj?mn4jE(q5B8;Q$Ee@L*M`b0*|1y$oIDTtU_EJkhY&u@ab2
zrRd5^dQc8wOOKfdLGrbMRwBD?oTQ2bdk7cR;NRdB5Qz6cFZnb6j|b%s(L@!kQot#Y
zrfN%b3H&Yr?y!Z(t=Zj>PQt-h-oqxvRiPe}<Irg1DJ?U4DUi}Tq=f8r(`Q5wic}qe
z8QGph#s)#*PXdL<+P$nP6F}SrFpx3HwqHt!<hKFVT41T%S<zEEIn`0vkO?cMcvf4U
z&~L2U2D`JpXShf<z6uIs3FLPAX!@e+x}(Bo{WZ2{R1tIt2%eT7kQ0en2bU79r8Ee)
z{F>(`EMuDG_{d3?$OuLpo|sEYQ1P63XEgY6JX4J#H$j`kNF+)m;i=-nyeg#a7zAPp
z*&szyh?WxV0dD2AfEaWV(#w`Qh9yg^%@3lQcyIqDL|^vTgQU_jnGcju7|5=hHtS|k
zP)cPa3AV5+?UQ|5OF##M^RS<!X9%k?@T^y}r&H(*InxpdZj*YOq!^fCbpbh9)t_2E
zFooTz@0D0c3dxQiDyLi`8<=xwK?BqalN{Uuf#3*Jtg`!n3KbN<DlQ_R8$n5Fy$_QF
zYej`liGZHqA-GO#k4VnjDwYJ@iCE-(j?lC;j?!^iprhtagoPF3!SN7K1h|%qwvmXC
zp*YrDQh}1%amp<TT_Dtf=|$2)>IG11!6_+Em#}UXdNs3EbwN~kp!y<ZPymQk<bs89
zNV-~nKmb(B!bqvJmhT|;<m&VVJ4S6}7-;C0I!xfX{B|@WjNqNx-DqS+kY4YqiV!U$
zO|dxv*lK>4uuMQ4#jxn_0<`p4mJkpxMLj#u;Y2e2sGnifd>LbvxvpYsA>oJQT$f0+
z28-k)vz|36XLe>^OY3j4g2?~?OW6l67&oggL%hgt*`TJjM^!z~P3T+O#py|zXmlg>
z0^kZAgCHf(mYs0&qejA-sAss;)#LIJ%(TKPcy&?k1?`xgy3N+A{y+O-$PRN;$QB%t
za#d3n#v^&~7ixdxILmj&J|yUvJE9?Ikxf&Aq=v@=8%T!tAQak2#fpAzUWQtzBzz>n
zf(EBMC1w(KI7f?;iBWFKT_rA)pE)a1B*hsmO6jm5XwIQOHULv<NUqy__}8-!S6^?>
zuP$#s{L_DY=&rtey}CKSwYcW?`r9B{4&6m_-Q<8LKKh@{*Tbj7m-E}d-XHw`U0(ct
z_tnk+yz0MQ4FCP|cDTN}JLCNF;{0;>KUd$byTQ%J`+cb+Km5~Fv%cN__59i@pPxS6
z{{Gb=XCJPwt`495^y%h0GyJB`KWfO$?e%$gd$`_hbNzYn*P2MYJJ*K(=6{^u_~2ju
zMSaP?p8d;uc4kI<ZO_>AnW6+A-v71o$+|wNV-D|TOP~8>KE3;-{_@EzpUhls?rQU?
z*W7DyIPU0-{Wb26oga>wreRv;zhm>fS-Dz$f}CinYfcwlt})fd>Do&RrtUk-Q@HQU
zaWluw?(RLFad(%TpF7#(=1gMa3>&!nEB7Yb*MIZP)GO^9kKG)O-+z;5zWZi7^XbZK
z?KNH@*LO~RvmKAUJ7a8t<2UK&`>QPWSJ<8r4D-!4BQsuk<FlF9(yPv|`{mPp&mG<G
z(2`uI+UeNiv-0`)WNBgATrI3C);am!YvEP*^Y7X#ck?});U>Mb$EetF$IEd>1&-La
z*xBC2&c=83ln?tU_w}u-jjg$RqC98L&Xez3lE0?)EHk~t7NNHBGw<eJIbK278A;R2
zdGl(?qW(McjAi<MFx<O|m(g7qwS{vRuDGb4o>xCCV&UVFW$P=Jw#hgCd&V=}zw;NX
z+m`*W>Q0mWf6qiXuR3c{Jy9*;InSWDTw%eE7wmZ9>I-(faP1{KUb^Cv9WUAO($P!D
zEgiS?eP+bU_bcD8e82Mj%J-|XfqAZy>(_kN4|VOjPJObBW$y1+?{aqaDa#Uwea1nY
z$t8IiH!Z@h?mn%vmub7~v~TqFGS^*eNKI1+s=mxaqtp4X23oh_o%F>SfznIIYd*=?
zOUG-zf>bX<w8}9CsLri3JoH=6$kFe+N6va%s}A=${W%V2<UXf8`SBUK&+C2l_>A1=
z<=%bjjNIq>@p$fx+~?^LeCdqb=ld~#?F{#MWF;q@QI@#OTv^5@nTj5**~==09hSVA
zoMn=i`}HB4@cAaTocT71KQMMq%dz#>GAC>^Ep)W!zdOD@+MLx**O_MP+{C|(di=ZY
zxL(}faco0<lH+~v>PIcwfA8+A{pY;**jPud*JD%mpKuz>^_h9+etFb-8c#8{KaE|d
zy*htAIjgqiq1-%|TIFhMPqVEXP0u#E!6R#|Cb_$NZR&QDGd_@G-_Fmri?gi`UFnXq
z?dFVk*S7SU7mp>T;BsC((}YJWUztaW+i;`t;JB1SH@bnps-HLep4-GtX+~W<$8PFB
z8B~|5fI7Bqylsy5@cGIprLE%!`73YhQ~#C~RJeC&Jw!gt!{qqGDAX`lfHx`?G;{6h
zkiE&|(e~H%%+B@H_20yR(ctpLx>08y9y$F|PmvGGl_zXgw_vbmBwi=iJ6$*ab@$ob
zH>;!LY#wuFy}K9xYrp_sFK*qKLFi|SSG<I9<EAvn%W<Ao&fLp!Mo%r>8R5lC3k;tf
zgS{4B+F<ykw!Jo9jspqgAiNw05-2A0avVrtOBOH3O*58tW<3vmF@IO!wu0-7#^ohC
z2!6Pi7vEI@#<!02UH)4~);q?kQqwD4r^KQDTcLKH<7qy^HuKYia(-Sl5KPPJ`ZK)7
z%Qr@Y_Tj}ajijxMy-cdH_sxH6U|fxikau2ss6xHiR-fy|RmHtkU4QOeAVVh5%k_Z_
zazNTs-&7DSn1PMt$h&XqT|o_>mnF&_dzZT_<<owD8B0VzpOo2CHx8fqw_wHiZ5gVh
zi1T?$BdCJIS)`D|)r_uuem(=9?W^V$bES!Tm(O$0$A1}_8pW|at~~e2JnbPm+?`V+
z!3qe-USbI=u$`D!J$+rb?lsHbR`<DMuB9C#Rk-Vgv@z%U=5W;P&`<SELBGSD75wg7
zR4qV4<RZMP2U+UFR@a!MEhBx&yY=BpGEn~VY%IY-q5YGoy-uHvZMysR?m9V^%~8E`
zd{HH%Ro8XS{&+I9BkuYkPj`RU!?k&C6!-3&y6P<ViLs`0(va%<qh@l}gueTO>VUdZ
zJ;(7g<WvApHE7*KHMvvG`WlbiqaM_kInYGeH{K<xL)?iB;Bbz^5s1213@fMJ(ZuoD
zGbXIri=`f4Ha&c3gD^GT=J=V%n<(eY2zVLIcr(^YCh&68YPUH#GbhLP`_~AtBniB+
zajZbW%)XH|RsqJ}bz;q_j8%<D9=k?S%kRhMzWv&^A5S$(+ExB2XO`U@tmy9eyJK_B
z@k!J3hvUX>&OP%<wIDq+p5>FWp?$lo<?~7S!Gp$*rYGg(p>@EbCh(!V??=!@Sx&~T
z#w(Y(JIE!r2k$WULTErfsl#-{XsmVqc<8>t41YBGjDMPSXPSAQ;}7p1xo*2R!>7%!
zOs{$ff^pUK!_k}??P_nL2U|)*M(N^ieAAEBtM?-_UT=Kzy9SM8P)AnZ*ZuM=nbqmm
z`!3C0MoO2y8?V0qjIwl1JHH+-iJB$QM03&pYQ5I(pQ7wAF*ARA((+I&wXBc@*T3wv
zTEUvfzk!B29^A^m5kP93OXH|3i#K(PXe8rTMx<_*X<2uRTvE-6hEn&9h>{yb@z~S%
zM9q8>gi<!E2P!B~M7ZKQ*t6$e;qT>}l<Aq#b(Sv6l}iB0mE-hkTuREwm7^z=Cm%(H
z`ou)dl}lo%D@SKY<4bI)H&H-x3mz2ttT)<|7M2)M_lg>kek=K+?iFofydXc3ZlQ&M
zH+7b=99tMr<CDlC<Fj)vqY%KeEOL5Ohl=E+hw+Wl%(JqDc(PGJz@0~-0g)cH2S8v^
zoykp(Kn6!IS{?DB-p~}z3f)9bSms`FnadhDL$It~jRscD5XnYZ1bB^abX2jLXbMHp
zBP{ISI5>BYyfA(OX6@g&R~eEvkDsvjRhbRVVO2&VLX<)f^<l&}Fi-&>ngbe?Zh;9)
ze~>IgDSQ$Ep+?d@M`#pXqYm}&c-=iOQl*4_<Qy?zT_+vbkrf*FNWKa;sZkG4saxil
zGT9uHTShD>#1^%nTzBYv@wO-pqk~3#Dwc;w7Z?mR-c;v$@&Z&Lu!W$)Nk?_gO-mHi
z(qbbTI{q6z;ntckl8UgP{2eNkf5V6JZ%9%8J&=jeqx>C?lz&5%@~`XVU-#QHI@7VZ
zL_BD5iQv?t69KCQ<$_oX*#)*1b>N9cVioCa)MbPy>TWKbxt}%%7S})o8<$lDAeW~Q
zXUVKN#y!eG1ap>yFu^&UeB~ZBNfO-4LBvs%gNP3)2f?Jtu?|KtXtH_Z%H<#sjZt$B
zCMX#%ldc>Dw93op;9Rh*lYgNr`=|)rUQ2e(5w?X>mXj!Ex!0Use-HZHV4UCSs4}ng
z!RQ~V6I?fh1{kk*IX-s{*#hC~oqniyAwY-Yd{$?KI33>kwj4%?)&8^e*#5ZOHung<
z8sCLj9gaJ+AjIqNZJx2tNO$kw-G7^28Na<h?*1Nk-=_EX_dT>F#0@Q}w%pw}!(PWB
zmcGq+g~W}=g~m}9>oaH6xuJfCckVlW2BaU}r8jbq(7(gEIb*y^?lHd8zVThO`|_bO
zZ{F4PHs?mQG~|#<>UyDvoLRlozR{7E#+lKww8m%UYcfa5mm-MX<%x>ml{YPlw||#2
z(w3rt<Ga{?xz-|)qi@Z;+#lyD_wTf2|IYK)yAVWqS=U1gy{j=Y*AJhiEoEULq2+BO
zl2Uckf~dEnzYT>P9d3x^=y5|Q_wU@doUf5Oyc3J|I&f@q1WcJ=<$;ky?`l59Cd=g(
zgesp~w6Y|r&_#4uTY~oVNWIhM(eK7$N5`8i%jkKNcNtx8MsW1Kv7yoVhV+i!H|-nU
zZ|rLHzriW{cR8-^8-Ox8<z#$DuN;Unew)nE=%ABl+P`z((N`z`G-hxD70XSB0*;zJ
zqUv4QMkqizYjvI8<-Wnq2zQ=0b79Q9#12XU3hh9rb6nb2jyp7D|5={AoOiJ7NUK9i
z5bvCk>_hqQkdwX69>QB5TurBU71j9p(S(?R?oU&KK1(JG*^*Mo<-(K8ofj`Ee_kwP
z^l!RlOq7J0sbHxFgoEeN>`~%fZU)bKSI{S^kP-KVYn5LQr5l-k$ik=xC=>8*`mZqV
z@Q<%o*S8REWiD_21iBF(sxSWpx{UTupc|FwPoVoJ&=qEi3I7Rn4`5Y~?BS>YJp#_8
zhQ`nS1iIiY&+#YF1y&1^3nhO7-9H}a7R)S3eN6hmxnue#I9EMQ0Ak_X0*#d%8i6EO
zII4bd?ueEP=Z@7k!MWw`3g?c1C^)y6{X?89;Zq<q_bo2>0O*b=I5>CTJhv?gpm6S}
z5(ejvs$OvJzEN=Qs2B$4j!Ge%y9d=dp>TF!?x+d`=8knjfw`j-DwsP9%)J@DG?%yM
z-Cxg}&zDy>-rfA~;rhQSsZ&cgR>)u!aDLU!g>ew#=os8tTpAV;wi2!pUJ@P>&JsQx
z1{C%X{!_YM&P%XxUYJ#Sw}e{P4hzD6#(FfZB(+44E+v*qQu=G8SI)Bp*Q9#`L&Y5R
zV_r1VyXq|(>v08F^wdbH?lD$#(N0tK6~z?iFP&6-Qw6rKZPV2mvl?mthEXNq;@G>|
zE5}D{kBm+TR9WQ}X*fNs?dkJSj*y(N*9b*XDWaN0BFgjWlYRY^_s%QDLjSnVi?vb_
z9*b)`HrfH5@P(Qw*Uf#jgR&F#a;$vvJe+VrII5yWVqW>)Ggi%$=c~^hNBfI9so2S9
z`V50p9*zq*-!UhaE;-M0r&eRE*mz^Ph8t1*?yEK;{E_?!U5uKollCxLQ=DZm6n28H
z=w%(Q?{&RiXHZq_a9ZVt6<6Av=hY`keYlr$1*HWk7Z}R}qM)Vx;7~R&mKf+qx2<x7
z*bOZ#Dp-{$P##ida41tq>A_gWkmJ0M9kc1ES5>OunW9xGEAWa|pHhR|JJ-o)DMv^t
z!lC>i$CBX9F{KAyT!gVxfZ)YOjb9~1Gxk+vkg;T^Rfdo`sGY=Rt1g_!p7lYLC4~pk
zKfKsn#MdZL(Vn6mL~M+jpkKxk1U4QW$$hKv;I0@!zf^&N{`8pw126qcBN|KSTq8<K
z^r7e!(S)J~B|K&hnQt+IGp47Z{D+Tx!>HK5Te<t0t}tQEF{W)+nT(#(<D7YhJPz++
zlAmQJoABnpq=^}E7IW95I!{{+vr#bsXX!Z?bC1Zm0k~C*kXv~lVK}<6L9Mi5Bvyl6
zl?b_Ug%ll}rnqF~O||!7wLlz!W8?fhltAIQwA*<V8+@*Pk##tBuMDUTi<8mmciCc3
z{4iteDLigviam1$CKFdq&-wY>^XK}>I>)Hf6X^<F75ya2NixdGOqWh#aHEazJ;?$|
zvm}`#jUz`Sha>vP(nu3Y5LIgE!^QvK-qkjzjceiW{0dF>L-!V8ngU6?na-?i2+%?x
zyrfBb?_}MefD^E(ZIWg?{qOfVvJ7^NlXO4z-f6qrLDtdH(Tk7Hk$fK6p$tN6X1h~4
zsfR(dpv0eimmPN^zZw%G3<%}pR{DYZ5Phd=yfpwgQ}{PK@|Y{{=u2{DhfKN?=3O!R
z(z`HmuC7?AG<8B|mnZn>JNk?~!IOR7{=A^7Wzd9#^ML3_ijP8=I0AAIK!TuLV3{C>
z8^D=>9I5OZ24LDTO%a`lFYf`_f%rX&ghL!TqGl1RK+%f;yr@cs!wf`I6iTI1o=k;e
zv6w5@pMSCv4n|oKpQbS+qP-{fjkUy}e%Kp);LH+7R-<z<5TgcXBj0ud`;xxiw>&rW
zz4=`FoPB3kzPDg6jPe75Ld=mqxCh(1y<84g(<z2XPMUUbC}qG|9as9T<{{Dz*Z~U~
zLC%oXwf!4OkMTRsIrRLFyp{7@0u)V`h#vIu5x>l2v|XGhCuAN$%z+Fb3}+oVwJ+~8
zMLOP;vw>WAp-dEvq7HI12J*`aZRTuf-zFM9l$R^t3GW4ZF+{yfL`_H#>BoKFyLBeg
z-;~C5Je+%XElfVozi(g!?m_M>R+#n}6VsmCI2?~=e=?(PhjudE@O=;CwkbLCZls%e
z@PJ>Uy_!MdiIyofN78a8h`W;HNj&HyCS-w;N<11M+}T;8&o;A5g>AezSkJ0&4~AOL
zjP#h%m?m4MM7O+2>Y-}?Ftpu??N3r-G+fL!Zz&@-3Hd-BuF@h$G~)nvtdv@qk2c;B
zM6%ps{yo+fY8&2=MmU2~y0qOyP1IY7URZ_BJSfYU5dBeHzqj@Fu-_49jrzrCAdZH@
z8nt^z7p?Yi)Ek^#^u?$(<g6=Bw`O-5N6k?yDP&aDESheqj-N=x-YlRc6LM1XGjfI-
zl~JNLrnoF5qG{5@6=XO}?VxmpS)VHD1dVnd$4GAz^>gNW{=%L+e<!7ir`Bc~MXgf*
zg6Gp}-B{SmJQYfLTD>D87qC+Z&4XnEq!L6|0=tUth(Wj_g7^?53v^6`1sVq8l!2!P
zd_;sSBW4W|ScqIi7&b1kLjW71Sn1LOT>kY8^{(oFM8&IoQuDj4xC<3uC?#N!Dp3p*
zLZTAuVjKcBKx`Cp)*(>{srs~I7-js2NGZMQVI74p=h_R3xcY>j=#Hi1PLbLX_`}bH
zIO7dro$$aEA~5N9XmVQ!n|^-gV<E;7L05<_{W{`RkX99G&E&6<c&!o@lP@eG78X&t
z7JpS2;#HjzyLG-oVx<zdb?zYHsKj-hzXF3-ioveQzktCP#lW}t9uj*hv2XD=NW4*r
zw-&D=QB{eW#a|=wS|utE%6O>9Q}rzC=`tw^QuW-R%#A8Ducs?baeD))-<Z59tg^{f
z*WBaDy~!brb%6h`E#4ENN6qi>V<C>|*MNT%;v@Y!<zGPmMR7of=Wy5zj|XZ`_0kgE
zjKo4ET$2}(D5?Y`xkKVkCBB+m3L&YkE55?xm3n+@KIm}dKnhU#B#UU$&sMsCZYwh0
zn(G;J9ycH=nyMisY%1qch)b$rk`QhqW@=(hA=y+(HZ%DR5;rO_H`BsxN;{x&6wURz
z0LBMhq<VKK#Beh@W@2<w-I=N>m6K{nDv_#rBTzhg=TWCYme1Qo(S)M089)41Qfmp~
zSv7COa&IHnuTo6BOcJlhB<8Fe8WVr5$DA==*TfcPo8}7f@rEm*R1>M-6DE1_moodM
z%+~5KejQHI(<}9k{ZeLHW2aP#epUZ}l^Ik{%5=!CuDU;BZT0tBfB!G&!8{u_WxuO!
zkF*_|&DXXpP$6*bA%IH>Obke~*q@0YzyL%GBxzg%1sHb#pBM&#fdC>HaHD``1DFwE
zumIN!AdPef3_#;?11aGI<=V1aWXRaFTWFL`%d4<zu{lPDEpq@h;D<~*QVG8x?LX=0
ze^~y-^2?WnB74b3GszbASNPEj26xT7lM^<V?lhdy<_{b#_E*A<F|<GQ7h3{-0G|83
zL0rmfH!Q+9kn9rfeE5X7#okfJBxDh64tGn{>)U?3+ro66Y-xwH03u;;YGL2A&yuYI
zNPFe^3|msmxqWX?a{`I2D*zYBfZaLsIUJ)9w5qWL$>7TXr5+Xg8J^@HEI<|R^wWRf
zl2czY^rg9S<`ZVqCK}WGYjG!{yJ$aS!V;Yc@zBe*%N*AU9eW-(RPmxFV1wgs=3LI0
z6R_(Qdd6mfYcGQtTBHXj!OqBa=dx2M>(*_j(XRwy_+Tp(I4HpX1soFHH-R%2g1{kU
zCAxkH*U(&E8V0T`s{mgFs9XS10U!*(@Nfu0;P=4Jz$G@oK>_r4rSb!>#CA6?N8YF1
zJw2PEjnHQ}eA?$r*Y~*Z*A$Vt_d$pcFvy!HYl9rtwleaR=cn~;V{RU(KTXkXl6TWm
zmMYBiwbx_aS}_Z#WMv^@y@E@kjm74*iGq!K#OL6kDUQ>ewCiHQ0nKoN$1t;aTZlGf
zjSX0^KaIJ|Yx5u3qCaO(H$_AD4LYwE4ToM5)zGX*g?h6oni*ofn2traY{foL<M8Jm
z!m0J-7-rYeXv(WCDC|`m*Fn61W-_#z0Lm@&16|Py<XvE$V+$Ynfdr`oY)9PH1EepU
zT<+V3LATQZ>lg%plfs&T-5}g=01!c7qT$R3T7+<wD%)1hY~_h1Gn+{Y0VkBKNdM4M
zd29RZ;&QffZz|`5mUVJ6M8n=OAKTQ9FMof5_g&?d;%qeh#lN8CvlQb|wOc)HS015g
z9-5-sJkb=TERTApcieAPyN~fW+V7jaBTZ5KCp?CGC(T}ee3oC!K=jTA?_byQDbA~A
zXLK?$HN}(jWsy5!kQ2`sfbQYa3LwA(^AATrz#;|?B#_2{?n&3B07#ZDo{@$DFmgbX
z;qEiQOySxbz?s1~0}%mR;m8%JV*n5ZcHfqT<-w$&+ViIj<vy4*v32#W5bw{@USKpy
znziwsFb87;<#sShv>~=3Xuq#D#~%j0T!QztJ+VKwK4^kchJ#f<tR5e|7r7jId*|mT
z?ZcKPDE>Hy@$vD;^U<D_TSd1qYV{7g&0K=hal2aSG|n|a-sFgvgojgO^E@`fff9iG
zZ-IsmEJz$1;uc0Aa|4A9_6N{=aZzIp*PQI_8U~Qe022!^UtACbymEkh0Y{BstN}Mj
zD5t<^1lVFNUzH^4&P<C$USxFdzEW0qRjHC4*q_P{1V+|D@AEY<@r{YR!pQ)RuatHC
zdvrR1qmrGA3#qZYb~yWXYtL8m4_JdM`JI#t{+2eH>A1gN8-8pb=V+!lJJtw=VxhPx
zJZd*8R{wB6r*NG8>=&J6gLJwj1`tZyk-gfA&PIl@N%~If)mXgiAfNa^pN<B`YB|BF
zXToLCY@w4QHJxCWM++Z<{>CCc!+u|LkGliHKBL%1?8gt1wy}S_#D??J9h{Ikmw3Z3
zuhX{4m`95lS}y;_)&OyI&M_Wz-fi9wWu^bvCj^mRj#)r~rtOPFhE@uIM+I0gz!-7F
zL?Dj14u!xT;d%fxUtLcGlusZ^!!rk{Ij*k3Cl$~VKvyR~UAm5sz@7=!7s$K-NUUu;
zWy(mET`ZE4MQY(~)))T<kCQ!PN^zold~R@fge-TYRc_wE6-xT-Z?htuHV2}0x;KiK
giwwcAYt@eT&g1nYyQV!*_VI@fKS_((_k+TJ0YZ3a$N&HU

literal 0
HcmV?d00001

diff --git a/app/scripts/migrations/120.3.test.ts b/app/scripts/migrations/120.3.test.ts
new file mode 100644
index 000000000000..11bef64a3422
--- /dev/null
+++ b/app/scripts/migrations/120.3.test.ts
@@ -0,0 +1,253 @@
+import { cloneDeep } from 'lodash';
+import { migrate, version } from './120.3';
+
+const sentryCaptureExceptionMock = jest.fn();
+
+global.sentry = {
+  captureException: sentryCaptureExceptionMock,
+};
+
+const oldVersion = 120.2;
+
+describe('migration #120.3', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('returns state unchanged if TransactionController state is missing', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('reports error and returns state unchanged if TransactionController state is invalid', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: 'invalid',
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+      `Migration ${version}: Invalid TransactionController state of type 'string'`,
+    );
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('returns state unchanged if transactions are missing', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {},
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('reports error and returns state unchanged if transactions property is invalid', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {
+          transactions: 'invalid',
+        },
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+      `Migration ${version}: Invalid TransactionController transactions state of type 'string'`,
+    );
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('reports error and returns state unchanged if there is an invalid transaction', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {
+          transactions: [
+            {}, // empty object is valid for the purposes of this migration
+            'invalid',
+            {},
+          ],
+        },
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+      `Migration ${version}: Invalid transaction of type 'string'`,
+    );
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('reports error and returns state unchanged if there is a transaction with an invalid history property', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {
+          transactions: [
+            {}, // empty object is valid for the purposes of this migration
+            {
+              history: 'invalid',
+            },
+            {},
+          ],
+        },
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+      `Migration ${version}: Invalid transaction history of type 'string'`,
+    );
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('returns state unchanged if there are no transactions', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {
+          transactions: [],
+        },
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('returns state unchanged if there are no transactions with history', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {
+          transactions: [{}, {}, {}],
+        },
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('returns state unchanged if there are no transactions with history exceeding max size', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {
+          transactions: [
+            {
+              history: [...Array(99).keys()],
+            },
+            {
+              history: [...Array(100).keys()],
+            },
+            {
+              history: [],
+            },
+          ],
+        },
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+  });
+
+  it('trims histories exceeding max size', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {
+        PreferencesController: {},
+        TransactionController: {
+          transactions: [
+            {
+              history: [...Array(99).keys()],
+            },
+            {
+              history: [...Array(100).keys()],
+            },
+            {
+              history: [...Array(101).keys()],
+            },
+            {
+              history: [...Array(1000).keys()],
+            },
+          ],
+        },
+      },
+    };
+    const oldStorageDataClone = cloneDeep(oldStorage.data);
+
+    const newStorage = await migrate(oldStorage);
+
+    expect(newStorage.data).toStrictEqual({
+      ...oldStorageDataClone,
+      TransactionController: {
+        transactions: [
+          {
+            history: [...Array(99).keys()],
+          },
+          {
+            history: [...Array(100).keys()],
+          },
+          {
+            history: [...Array(100).keys()],
+          },
+          {
+            history: [...Array(100).keys()],
+          },
+        ],
+      },
+    });
+  });
+});
diff --git a/app/scripts/migrations/120.3.ts b/app/scripts/migrations/120.3.ts
new file mode 100644
index 000000000000..139e6f5221c2
--- /dev/null
+++ b/app/scripts/migrations/120.3.ts
@@ -0,0 +1,114 @@
+import { RuntimeObject, hasProperty, isObject } from '@metamask/utils';
+import { cloneDeep } from 'lodash';
+import log from 'loglevel';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 120.3;
+
+const MAX_TRANSACTION_HISTORY_LENGTH = 100;
+
+/**
+ * This migration trims the size of any large transaction histories. This will
+ * result in some loss of information, but the impact is minor. The lost data
+ * is only used in the "Activity log" on the transaction details page.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly
+ * what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by
+ * controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+function transformState(state: Record<string, unknown>): void {
+  if (!hasProperty(state, 'TransactionController')) {
+    log.warn(`Migration ${version}: Missing TransactionController state`);
+    return;
+  } else if (!isObject(state.TransactionController)) {
+    global.sentry?.captureException(
+      `Migration ${version}: Invalid TransactionController state of type '${typeof state.TransactionController}'`,
+    );
+    return;
+  }
+
+  const transactionControllerState = state.TransactionController;
+
+  if (!hasProperty(transactionControllerState, 'transactions')) {
+    log.warn(
+      `Migration ${version}: Missing TransactionController transactions`,
+    );
+    return;
+  } else if (!Array.isArray(transactionControllerState.transactions)) {
+    global.sentry?.captureException(
+      `Migration ${version}: Invalid TransactionController transactions state of type '${typeof transactionControllerState.transactions}'`,
+    );
+    return;
+  }
+
+  const { transactions } = transactionControllerState;
+  const validTransactions = transactions.filter(isObject);
+  if (transactions.length !== validTransactions.length) {
+    const invalidTransaction = transactions.find(
+      (transaction) => !isObject(transaction),
+    );
+    global.sentry?.captureException(
+      `Migration ${version}: Invalid transaction of type '${typeof invalidTransaction}'`,
+    );
+    return;
+  }
+
+  const validHistoryTransactions = validTransactions.filter(
+    hasValidTransactionHistory,
+  );
+  if (validHistoryTransactions.length !== validTransactions.length) {
+    const invalidTransaction = validTransactions.find(
+      (transaction) => !hasValidTransactionHistory(transaction),
+    );
+    global.sentry?.captureException(
+      `Migration ${version}: Invalid transaction history of type '${typeof invalidTransaction?.history}'`,
+    );
+    return;
+  }
+
+  for (const transaction of validHistoryTransactions) {
+    if (
+      transaction.history &&
+      transaction.history.length > MAX_TRANSACTION_HISTORY_LENGTH
+    ) {
+      transaction.history = transaction.history.slice(
+        0,
+        MAX_TRANSACTION_HISTORY_LENGTH,
+      );
+    }
+  }
+}
+
+/**
+ * Check whether the given object has a valid `history` property, or no `history`
+ * property. We just check that it's an array, we don't validate the contents.
+ *
+ * @param transaction - The object to validate.
+ * @returns True if the given object was valid, false otherwise.
+ */
+function hasValidTransactionHistory(
+  transaction: RuntimeObject,
+): transaction is RuntimeObject & {
+  history: undefined | unknown[];
+} {
+  return (
+    !hasProperty(transaction, 'history') || Array.isArray(transaction.history)
+  );
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index acf731d08d34..2a33921c8433 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -133,6 +133,7 @@ const migrations = [
   require('./120'),
   require('./120.1'),
   require('./120.2'),
+  require('./120.3'),
 ];
 
 export default migrations;
diff --git a/package.json b/package.json
index d4762864e9b8..689a20e0e003 100644
--- a/package.json
+++ b/package.json
@@ -224,7 +224,7 @@
     "@trezor/schema-utils@npm:1.0.2": "patch:@trezor/schema-utils@npm%3A1.0.2#~/.yarn/patches/@trezor-schema-utils-npm-1.0.2-7dd48689b2.patch",
     "lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch",
     "@metamask/snaps-sdk": "^5.0.0",
-    "@metamask/transaction-controller": "^32.0.0",
+    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A32.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch",
     "@babel/runtime@npm:^7.7.6": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@babel/runtime@npm:^7.9.2": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
     "@babel/runtime@npm:^7.12.5": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
@@ -350,7 +350,7 @@
     "@metamask/snaps-rpc-methods": "^9.1.3",
     "@metamask/snaps-sdk": "^5.0.0",
     "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
-    "@metamask/transaction-controller": "^32.0.0",
+    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A32.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch",
     "@metamask/user-operation-controller": "^10.0.0",
     "@metamask/utils": "^8.2.1",
     "@ngraveio/bc-ur": "^1.1.12",
diff --git a/yarn.lock b/yarn.lock
index 524fc37f06aa..8eb6ff293d65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6434,7 +6434,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:^32.0.0":
+"@metamask/transaction-controller@npm:32.0.0":
   version: 32.0.0
   resolution: "@metamask/transaction-controller@npm:32.0.0"
   dependencies:
@@ -6469,6 +6469,41 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A32.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch":
+  version: 32.0.0
+  resolution: "@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A32.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch::version=32.0.0&hash=27b27a"
+  dependencies:
+    "@ethereumjs/common": "npm:^3.2.0"
+    "@ethereumjs/tx": "npm:^4.2.0"
+    "@ethereumjs/util": "npm:^8.1.0"
+    "@ethersproject/abi": "npm:^5.7.0"
+    "@ethersproject/contracts": "npm:^5.7.0"
+    "@ethersproject/providers": "npm:^5.7.0"
+    "@metamask/approval-controller": "npm:^7.0.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/gas-fee-controller": "npm:^17.0.0"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/network-controller": "npm:^19.0.0"
+    "@metamask/nonce-tracker": "npm:^5.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/utils": "npm:^8.3.0"
+    async-mutex: "npm:^0.5.0"
+    bn.js: "npm:^5.2.1"
+    eth-method-registry: "npm:^4.0.0"
+    fast-json-patch: "npm:^3.1.1"
+    lodash: "npm:^4.17.21"
+    uuid: "npm:^8.3.2"
+  peerDependencies:
+    "@babel/runtime": ^7.23.9
+    "@metamask/approval-controller": ^7.0.0
+    "@metamask/gas-fee-controller": ^17.0.0
+    "@metamask/network-controller": ^19.0.0
+  checksum: 10/f8e1907ed697406fc1af7dca3627e5d28f213a3b4875258ec58abdaa0ae48c4714ad79face61519ab1f3475e6aa57e8c80c9622e2eb18f65b1cd5b123962e5ea
+  languageName: node
+  linkType: hard
+
 "@metamask/user-operation-controller@npm:^10.0.0":
   version: 10.0.0
   resolution: "@metamask/user-operation-controller@npm:10.0.0"
@@ -24959,7 +24994,7 @@ __metadata:
     "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
-    "@metamask/transaction-controller": "npm:^32.0.0"
+    "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A32.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch"
     "@metamask/user-operation-controller": "npm:^10.0.0"
     "@metamask/utils": "npm:^8.2.1"
     "@ngraveio/bc-ur": "npm:^1.1.12"

From 9b02d166d716634c739e559bc89b1068dbae69e3 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 5 Aug 2024 16:38:57 -0230
Subject: [PATCH 163/236] Update changelog for v12.0.1 (#26348)

Update changelog for v12.0.1

---------

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf9723844cb6..23854ceb6f1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.1]
+### Removed
+- Disabled the "Restore Backup" feature ([#26325](https://github.com/MetaMask/metamask-extension/pull/26325))
+  - This was linked to reports of state corruption. It has been disabled at least until we can ensure it is safe to use.
+
+### Fixed
+- Fixed corrupted state for some users, which could prevent further data updates from persisting between sessions ([#26325](https://github.com/MetaMask/metamask-extension/pull/26325), [#26280](https://github.com/MetaMask/metamask-extension/pull/26280), [#26265](https://github.com/MetaMask/metamask-extension/pull/26265), [#26282](https://github.com/MetaMask/metamask-extension/pull/26282), [#26298](https://github.com/MetaMask/metamask-extension/pull/26298), [#26302](https://github.com/MetaMask/metamask-extension/pull/26302), [#26308](https://github.com/MetaMask/metamask-extension/pull/26308), [#26310](https://github.com/MetaMask/metamask-extension/pull/26310))
+- Prevent crashes / error screens when taking some token actions if the "Show balance and token price checker" setting is off ([#26264](https://github.com/MetaMask/metamask-extension/pull/26264))
+- Ensure error messages are correctly shown to the user inline on the send screen, if an error occurs when attempting to create the transaction ([#26253](https://github.com/MetaMask/metamask-extension/pull/26253))
+- Fix error that could prevent the send screen from loading ([#26295](https://github.com/MetaMask/metamask-extension/pull/26295))
+- Fix crash that could occur when selected network is missing from network configuration ([#26327](https://github.com/MetaMask/metamask-extension/pull/26327))
+- Prevent pending transactions from causing excessive disk space usage ([#26236](https://github.com/MetaMask/metamask-extension/pull/26236))
+- Fix excessive disk space usage for some users that have had stuck pending transactions in the past ([#26291](https://github.com/MetaMask/metamask-extension/pull/26291))
 
 ## [12.0.0]
 ### Added

From 27f5cbc5b182ab15d79c0847fb784112d4432f27 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Fri, 9 Aug 2024 16:43:48 +0000
Subject: [PATCH 164/236] Version v12.0.2

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23854ceb6f1f..f6af5f7009cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.0.2]
+
 ## [12.0.1]
 ### Removed
 - Disabled the "Restore Backup" feature ([#26325](https://github.com/MetaMask/metamask-extension/pull/26325))
@@ -4902,7 +4904,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...HEAD
+[12.0.2]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...v12.0.2
 [12.0.1]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...v12.0.1
 [12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.16...v12.0.0
 [11.16.16]: https://github.com/MetaMask/metamask-extension/compare/v11.16.15...v11.16.16
diff --git a/package.json b/package.json
index 689a20e0e003..533c404d9d7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "private": true,
   "repository": {
     "type": "git",

From 84b00078e914fb86f1dcd6f9b748b5b66b4af145 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 13 Aug 2024 18:05:55 -0230
Subject: [PATCH 165/236] Cherry pick cad49eb to v12.0.2 (#26399)

Cherry pick https://github.com/MetaMask/metamask-extension/pull/26381 to
v12.0.2

Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 533c404d9d7b..7909c1baac57 100644
--- a/package.json
+++ b/package.json
@@ -374,7 +374,6 @@
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
     "classnames": "^2.2.6",
-    "contentful": "^10.8.7",
     "copy-to-clipboard": "^3.3.3",
     "currency-formatter": "^1.4.2",
     "debounce-stream": "^2.0.0",
@@ -532,6 +531,7 @@
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "concurrently": "^8.2.2",
+    "contentful": "^10.8.7",
     "copy-webpack-plugin": "^12.0.2",
     "cross-spawn": "^7.0.3",
     "css-loader": "^6.10.0",

From ea456f13ca0de12b90b0276d8993a3056545da05 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 13 Aug 2024 11:22:57 -0230
Subject: [PATCH 166/236] fix: Add migration 120.4 to delete obsolete currency
 controller state (#26383)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are seeing the following sorts of errors in production, as reported
by sentry, in v12.0.2:
`No metadata found for 'conversionDate'`
`No metadata found for 'usdConversionRate'`
`No metadata found for 'nativeCurrency'`
`No metadata found for 'conversionRate'`

Example issue:
https://metamask.sentry.io/issues/5682684113/events/b8006eebb65749f883e907242e52215b/?project=273505&query=is%3Aunresolved+issue.priority%3A%5Bhigh%2C+medium%5D+No+metadata+release%3A12.0.1&referrer=previous-event&statsPeriod=14d&stream_index=1

The `CurrencyRateController` stopped using six such properties with
https://github.com/MetaMask/core/pull/1805, which was brought into the
extension with #21549, however, there was not a state migration to
delete those properties at the time

This PR adds migrations to delete those obsolete properties

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

Fixes: #26356

To observe the error using steps that mimic users in production
1. Install v11.6.0 and onboard
2. Create a local dev build from the `master` branch
3. Update the v11.6.0 install to the local dev build
4. See the errors in the service worker console

If you repeat those steps, but in step two build from this branch
instead of the `master` branch, the errors will not occur

For a faster manual test of this PR, create a local development build of
this branch and then run this script in the service worker console:
```
window.chrome.storage.local.get(({ data, meta }) => chrome.storage.local.set({ data: { ...data, CurrencyController: { ...data.CurrencyController, conversionDate: 'Jan 1', conversionRate: '2', nativeCurrency: 'test' } }, meta: {...meta, version: 120 } }, () => { chrome.runtime.reload() }))
```
There should be no errors like `No metadata found for 'conversionRate'`
(but if you do the same on develop or master, those errors should be
present)

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

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

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

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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/migrations/120.4.test.ts | 98 ++++++++++++++++++++++++++++
 app/scripts/migrations/120.4.ts      | 72 ++++++++++++++++++++
 app/scripts/migrations/index.js      |  1 +
 3 files changed, 171 insertions(+)
 create mode 100644 app/scripts/migrations/120.4.test.ts
 create mode 100644 app/scripts/migrations/120.4.ts

diff --git a/app/scripts/migrations/120.4.test.ts b/app/scripts/migrations/120.4.test.ts
new file mode 100644
index 000000000000..fd62cdacec62
--- /dev/null
+++ b/app/scripts/migrations/120.4.test.ts
@@ -0,0 +1,98 @@
+import { cloneDeep } from 'lodash';
+import { migrate, version } from './120.4';
+
+const sentryCaptureExceptionMock = jest.fn();
+
+global.sentry = {
+  captureException: sentryCaptureExceptionMock,
+};
+
+const oldVersion = 120.3;
+
+describe('migration #120.4', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(cloneDeep(oldStorage));
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  describe('CurrencyController', () => {
+    it('does nothing if CurrencyController state is not set', async () => {
+      const oldState = {
+        OtherController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('captures an error and leaves state unchanged if CurrencyController state is corrupted', async () => {
+      const oldState = {
+        CurrencyController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid CurrencyController state of type 'string'`,
+        ),
+      );
+    });
+
+    it('deletes obsolete properties from the CurrencyController state', async () => {
+      const oldState = {
+        CurrencyController: {
+          conversionDate: 'test',
+          conversionRate: 'test',
+          nativeCurrency: 'test',
+          pendingCurrentCurrency: 'test',
+          pendingNativeCurrency: 'test',
+          usdConversionRate: 'test',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({ CurrencyController: {} });
+    });
+
+    it('does not delete non-obsolete properties from the CurrencyController state', async () => {
+      const oldState = {
+        CurrencyController: {
+          currencyRates: { test: 123 },
+          conversionRate: 'test',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({
+        CurrencyController: { currencyRates: { test: 123 } },
+      });
+    });
+  });
+});
diff --git a/app/scripts/migrations/120.4.ts b/app/scripts/migrations/120.4.ts
new file mode 100644
index 000000000000..fec529c53dcd
--- /dev/null
+++ b/app/scripts/migrations/120.4.ts
@@ -0,0 +1,72 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import { cloneDeep } from 'lodash';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 120.4;
+
+/**
+ * This migration removes properties from the CurrencyController state that
+ * are no longer used. There presence in state causes "No metadata found" errors
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly
+ * what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by
+ * controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+/**
+ * Remove obsolete CurrencyController state
+ *
+ * The six properties deleted here were no longer used as of
+ * assets-controllers v18.0.0
+ *
+ * See https://github.com/MetaMask/core/pull/1805 for the removal of these
+ * properties from the controller.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function removeObsoleteCurrencyControllerState(
+  state: Record<string, unknown>,
+): void {
+  if (!hasProperty(state, 'CurrencyController')) {
+    return;
+  } else if (!isObject(state.CurrencyController)) {
+    global.sentry?.captureException?.(
+      new Error(
+        `Migration ${version}: Invalid CurrencyController state of type '${typeof state.CurrencyController}'`,
+      ),
+    );
+    return;
+  }
+
+  delete state.CurrencyController.conversionDate;
+  delete state.CurrencyController.conversionRate;
+  delete state.CurrencyController.nativeCurrency;
+  delete state.CurrencyController.pendingCurrentCurrency;
+  delete state.CurrencyController.pendingNativeCurrency;
+  delete state.CurrencyController.usdConversionRate;
+}
+
+/**
+ * Remove obsolete controller state.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function transformState(state: Record<string, unknown>): void {
+  removeObsoleteCurrencyControllerState(state);
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 2a33921c8433..a397129c8636 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -134,6 +134,7 @@ const migrations = [
   require('./120.1'),
   require('./120.2'),
   require('./120.3'),
+  require('./120.4'),
 ];
 
 export default migrations;

From a3eb58533989f5f7b1df12a7525352a0886f23a2 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 13 Aug 2024 18:00:04 -0230
Subject: [PATCH 167/236] =?UTF-8?q?fix:=20Delete=20obsolete=20properties?=
 =?UTF-8?q?=20from=20phishingController=20and=20networkControl=E2=80=A6=20?=
 =?UTF-8?q?(#26396)?=
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**

Expands on https://github.com/MetaMask/metamask-extension/pull/26383 to
delete more obsolete state from the Network and Phishing controllers, to
eliminate other sentry errors.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26396?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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
- [ ] 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: Mark Stacey <markjstacey@gmail.com>
---
 app/scripts/migrations/120.4.test.ts | 133 +++++++++++++++++++++++++++
 app/scripts/migrations/120.4.ts      |  47 ++++++++++
 2 files changed, 180 insertions(+)

diff --git a/app/scripts/migrations/120.4.test.ts b/app/scripts/migrations/120.4.test.ts
index fd62cdacec62..d37098a325b7 100644
--- a/app/scripts/migrations/120.4.test.ts
+++ b/app/scripts/migrations/120.4.test.ts
@@ -95,4 +95,137 @@ describe('migration #120.4', () => {
       });
     });
   });
+
+  describe('PhishingController', () => {
+    it('does nothing if PhishingController state is not set', async () => {
+      const oldState = {
+        OtherController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('captures an error and leaves state unchanged if PhishingController state is corrupted', async () => {
+      const oldState = {
+        PhishingController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid PhishingController state of type 'string'`,
+        ),
+      );
+    });
+
+    it('deletes obsolete properties from the PhishingController state', async () => {
+      const oldState = {
+        PhishingController: {
+          phishing: 'test',
+          lastFetched: 'test',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({ PhishingController: {} });
+    });
+
+    it('does not delete non-obsolete properties from the PhishingController state', async () => {
+      const oldState = {
+        PhishingController: {
+          phishing: 'test',
+          phishingLists: 'test',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({
+        PhishingController: { phishingLists: 'test' },
+      });
+    });
+  });
+
+  describe('NetworkController', () => {
+    it('does nothing if NetworkController state is not set', async () => {
+      const oldState = {
+        OtherController: {},
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+    });
+
+    it('captures an error and leaves state unchanged if NetworkController state is corrupted', async () => {
+      const oldState = {
+        NetworkController: 'invalid',
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual(oldState);
+      expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
+        new Error(
+          `Migration ${version}: Invalid NetworkController state of type 'string'`,
+        ),
+      );
+    });
+
+    it('deletes obsolete properties from the NetworkController state', async () => {
+      const oldState = {
+        NetworkController: {
+          network: 'test',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({ NetworkController: {} });
+    });
+
+    it('does not delete non-obsolete properties from the NetworkController state', async () => {
+      const oldState = {
+        NetworkController: {
+          network: 'test',
+          selectedNetworkClientId: 'test',
+        },
+      };
+
+      const transformedState = await migrate({
+        meta: { version: oldVersion },
+        data: cloneDeep(oldState),
+      });
+
+      expect(transformedState.data).toEqual({
+        NetworkController: { selectedNetworkClientId: 'test' },
+      });
+    });
+  });
 });
diff --git a/app/scripts/migrations/120.4.ts b/app/scripts/migrations/120.4.ts
index fec529c53dcd..fc4162b61d7b 100644
--- a/app/scripts/migrations/120.4.ts
+++ b/app/scripts/migrations/120.4.ts
@@ -62,6 +62,51 @@ function removeObsoleteCurrencyControllerState(
   delete state.CurrencyController.usdConversionRate;
 }
 
+/**
+ * Remove obsolete PhishingController state
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function removeObsoletePhishingControllerState(
+  state: Record<string, unknown>,
+): void {
+  if (!hasProperty(state, 'PhishingController')) {
+    return;
+  } else if (!isObject(state.PhishingController)) {
+    global.sentry?.captureException?.(
+      new Error(
+        `Migration ${version}: Invalid PhishingController state of type '${typeof state.PhishingController}'`,
+      ),
+    );
+    return;
+  }
+
+  delete state.PhishingController.phishing;
+  delete state.PhishingController.lastFetched;
+}
+
+/**
+ * Remove obsolete NetworkController state
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function removeObsoleteNetworkControllerState(
+  state: Record<string, unknown>,
+): void {
+  if (!hasProperty(state, 'NetworkController')) {
+    return;
+  } else if (!isObject(state.NetworkController)) {
+    global.sentry?.captureException?.(
+      new Error(
+        `Migration ${version}: Invalid NetworkController state of type '${typeof state.NetworkController}'`,
+      ),
+    );
+    return;
+  }
+
+  delete state.NetworkController.network;
+}
+
 /**
  * Remove obsolete controller state.
  *
@@ -69,4 +114,6 @@ function removeObsoleteCurrencyControllerState(
  */
 function transformState(state: Record<string, unknown>): void {
   removeObsoleteCurrencyControllerState(state);
+  removeObsoletePhishingControllerState(state);
+  removeObsoleteNetworkControllerState(state);
 }

From ecfd64dcb2e125a977050f238de616651b94de98 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 13 Aug 2024 18:57:58 -0230
Subject: [PATCH 168/236] fix: Fix invalid state causing migration 88 to fail
 (#26397) (#26401)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a cherry-pick of #26397. Original description:

## **Description**

We have found evidence that migration 88 is failing for some users due
to a `null` key in the `TokensController.allTokens` state. The migration
has been updated to delete any invalid `null`-keys prior to migrating
it, preventing the error.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26397?quickstart=1)

## **Related issues**

Fixes #25938

## **Manual testing steps**

The unit tests demonstrate the affected scenario fairly well. We
addressed the "null key" case for a variety of different parts of state,
but specifically the one we are seeing in prod is the `allTokens` state
having a `null` key.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/migrations/088.test.ts | 482 +++++++++++++++--------------
 app/scripts/migrations/088.ts      |  36 ++-
 2 files changed, 278 insertions(+), 240 deletions(-)

diff --git a/app/scripts/migrations/088.test.ts b/app/scripts/migrations/088.test.ts
index 51f9ebcd2ed1..45538047d470 100644
--- a/app/scripts/migrations/088.test.ts
+++ b/app/scripts/migrations/088.test.ts
@@ -9,6 +9,8 @@ global.sentry = {
   captureException: sentryCaptureExceptionMock,
 };
 
+const invalidKeys = ['null', 'undefined'];
+
 describe('migration #88', () => {
   afterEach(() => {
     jest.resetAllMocks();
@@ -207,28 +209,55 @@ describe('migration #88', () => {
     });
   });
 
-  it('deletes undefined-keyed properties from state of NftController.allNftContracts', async () => {
-    const oldStorage = {
-      meta: { version: 87 },
-      data: {
+  for (const invalidKey of invalidKeys) {
+    it(`deletes ${invalidKey}-keyed properties from state of NftController.allNftContracts`, async () => {
+      const oldStorage = {
+        meta: { version: 87 },
+        data: {
+          NftController: {
+            allNftContracts: {
+              '0x111': {
+                '16': [
+                  {
+                    name: 'Contract 1',
+                    address: '0xaaa',
+                  },
+                ],
+                [invalidKey]: [
+                  {
+                    name: 'Contract 2',
+                    address: '0xbbb',
+                  },
+                ],
+              },
+              '0x222': {
+                '64': [
+                  {
+                    name: 'Contract 3',
+                    address: '0xccc',
+                  },
+                ],
+              },
+            },
+          },
+        },
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual({
         NftController: {
           allNftContracts: {
             '0x111': {
-              '16': [
+              '0x10': [
                 {
                   name: 'Contract 1',
                   address: '0xaaa',
                 },
               ],
-              undefined: [
-                {
-                  name: 'Contract 2',
-                  address: '0xbbb',
-                },
-              ],
             },
             '0x222': {
-              '64': [
+              '0x40': [
                 {
                   name: 'Contract 3',
                   address: '0xccc',
@@ -237,34 +266,9 @@ describe('migration #88', () => {
             },
           },
         },
-      },
-    };
-
-    const newStorage = await migrate(oldStorage);
-
-    expect(newStorage.data).toStrictEqual({
-      NftController: {
-        allNftContracts: {
-          '0x111': {
-            '0x10': [
-              {
-                name: 'Contract 1',
-                address: '0xaaa',
-              },
-            ],
-          },
-          '0x222': {
-            '0x40': [
-              {
-                name: 'Contract 3',
-                address: '0xccc',
-              },
-            ],
-          },
-        },
-      },
+      });
     });
-  });
+  }
 
   it('does not convert chain IDs in NftController.allNftContracts which are already hex strings', async () => {
     const oldStorage = {
@@ -525,14 +529,59 @@ describe('migration #88', () => {
     });
   });
 
-  it('deletes undefined-keyed properties from state of NftController.allNfts', async () => {
-    const oldStorage = {
-      meta: { version: 87 },
-      data: {
+  for (const invalidKey of invalidKeys) {
+    it(`deletes ${invalidKey}-keyed properties from state of NftController.allNfts`, async () => {
+      const oldStorage = {
+        meta: { version: 87 },
+        data: {
+          NftController: {
+            allNfts: {
+              '0x111': {
+                '16': [
+                  {
+                    name: 'NFT 1',
+                    description: 'Description for NFT 1',
+                    image: 'nft1.jpg',
+                    standard: 'ERC721',
+                    tokenId: '1',
+                    address: '0xaaa',
+                  },
+                ],
+                [invalidKey]: [
+                  {
+                    name: 'NFT 2',
+                    description: 'Description for NFT 2',
+                    image: 'nft2.jpg',
+                    standard: 'ERC721',
+                    tokenId: '2',
+                    address: '0xbbb',
+                  },
+                ],
+              },
+              '0x222': {
+                '64': [
+                  {
+                    name: 'NFT 3',
+                    description: 'Description for NFT 3',
+                    image: 'nft3.jpg',
+                    standard: 'ERC721',
+                    tokenId: '3',
+                    address: '0xccc',
+                  },
+                ],
+              },
+            },
+          },
+        },
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual({
         NftController: {
           allNfts: {
             '0x111': {
-              '16': [
+              '0x10': [
                 {
                   name: 'NFT 1',
                   description: 'Description for NFT 1',
@@ -542,19 +591,9 @@ describe('migration #88', () => {
                   address: '0xaaa',
                 },
               ],
-              undefined: [
-                {
-                  name: 'NFT 2',
-                  description: 'Description for NFT 2',
-                  image: 'nft2.jpg',
-                  standard: 'ERC721',
-                  tokenId: '2',
-                  address: '0xbbb',
-                },
-              ],
             },
             '0x222': {
-              '64': [
+              '0x40': [
                 {
                   name: 'NFT 3',
                   description: 'Description for NFT 3',
@@ -567,42 +606,9 @@ describe('migration #88', () => {
             },
           },
         },
-      },
-    };
-
-    const newStorage = await migrate(oldStorage);
-
-    expect(newStorage.data).toStrictEqual({
-      NftController: {
-        allNfts: {
-          '0x111': {
-            '0x10': [
-              {
-                name: 'NFT 1',
-                description: 'Description for NFT 1',
-                image: 'nft1.jpg',
-                standard: 'ERC721',
-                tokenId: '1',
-                address: '0xaaa',
-              },
-            ],
-          },
-          '0x222': {
-            '0x40': [
-              {
-                name: 'NFT 3',
-                description: 'Description for NFT 3',
-                image: 'nft3.jpg',
-                standard: 'ERC721',
-                tokenId: '3',
-                address: '0xccc',
-              },
-            ],
-          },
-        },
-      },
+      });
     });
-  });
+  }
 
   it('does not convert chain IDs in NftController.allNfts which are already hex strings', async () => {
     const oldStorage = {
@@ -946,13 +952,52 @@ describe('migration #88', () => {
     });
   });
 
-  it('deletes undefined-keyed properties from state of TokenListController.tokensChainsCache', async () => {
-    const oldStorage = {
-      meta: { version: 87 },
-      data: {
+  for (const invalidKey of invalidKeys) {
+    it(`deletes ${invalidKey}-keyed properties from state of TokenListController.tokensChainsCache`, async () => {
+      const oldStorage = {
+        meta: { version: 87 },
+        data: {
+          TokenListController: {
+            tokensChainsCache: {
+              '16': {
+                timestamp: 111111,
+                data: {
+                  '0x111': {
+                    address: '0x111',
+                    symbol: 'TEST1',
+                    decimals: 1,
+                    occurrences: 1,
+                    name: 'Token 1',
+                    iconUrl: 'https://url/to/token1.png',
+                    aggregators: [],
+                  },
+                },
+              },
+              [invalidKey]: {
+                timestamp: 222222,
+                data: {
+                  '0x222': {
+                    address: '0x222',
+                    symbol: 'TEST2',
+                    decimals: 1,
+                    occurrences: 1,
+                    name: 'Token 2',
+                    iconUrl: 'https://url/to/token2.png',
+                    aggregators: [],
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual({
         TokenListController: {
           tokensChainsCache: {
-            '16': {
+            '0x10': {
               timestamp: 111111,
               data: {
                 '0x111': {
@@ -966,48 +1011,11 @@ describe('migration #88', () => {
                 },
               },
             },
-            undefined: {
-              timestamp: 222222,
-              data: {
-                '0x222': {
-                  address: '0x222',
-                  symbol: 'TEST2',
-                  decimals: 1,
-                  occurrences: 1,
-                  name: 'Token 2',
-                  iconUrl: 'https://url/to/token2.png',
-                  aggregators: [],
-                },
-              },
-            },
           },
         },
-      },
-    };
-
-    const newStorage = await migrate(oldStorage);
-
-    expect(newStorage.data).toStrictEqual({
-      TokenListController: {
-        tokensChainsCache: {
-          '0x10': {
-            timestamp: 111111,
-            data: {
-              '0x111': {
-                address: '0x111',
-                symbol: 'TEST1',
-                decimals: 1,
-                occurrences: 1,
-                name: 'Token 1',
-                iconUrl: 'https://url/to/token1.png',
-                aggregators: [],
-              },
-            },
-          },
-        },
-      },
+      });
     });
-  });
+  }
 
   it('does not convert chain IDs in TokenListController.tokensChainsCache which are already hex strings', async () => {
     const oldStorage = {
@@ -1241,13 +1249,51 @@ describe('migration #88', () => {
     });
   });
 
-  it('deletes undefined keyed properties from TokensController.allTokens', async () => {
-    const oldStorage = {
-      meta: { version: 87 },
-      data: {
+  for (const invalidKey of invalidKeys) {
+    it(`deletes ${invalidKey} keyed properties from TokensController.allTokens`, async () => {
+      const oldStorage = {
+        meta: { version: 87 },
+        data: {
+          TokensController: {
+            allTokens: {
+              '16': {
+                '0x111': [
+                  {
+                    address: '0xaaa',
+                    decimals: 1,
+                    symbol: 'TEST1',
+                  },
+                ],
+              },
+              '32': {
+                '0x222': [
+                  {
+                    address: '0xbbb',
+                    decimals: 1,
+                    symbol: 'TEST2',
+                  },
+                ],
+              },
+              [invalidKey]: {
+                '0x333': [
+                  {
+                    address: '0xbbb',
+                    decimals: 1,
+                    symbol: 'TEST2',
+                  },
+                ],
+              },
+            },
+          },
+        },
+      };
+
+      const newStorage = await migrate(oldStorage);
+
+      expect(newStorage.data).toStrictEqual({
         TokensController: {
           allTokens: {
-            '16': {
+            '0x10': {
               '0x111': [
                 {
                   address: '0xaaa',
@@ -1256,7 +1302,7 @@ describe('migration #88', () => {
                 },
               ],
             },
-            '32': {
+            '0x20': {
               '0x222': [
                 {
                   address: '0xbbb',
@@ -1265,47 +1311,11 @@ describe('migration #88', () => {
                 },
               ],
             },
-            undefined: {
-              '0x333': [
-                {
-                  address: '0xbbb',
-                  decimals: 1,
-                  symbol: 'TEST2',
-                },
-              ],
-            },
           },
         },
-      },
-    };
-
-    const newStorage = await migrate(oldStorage);
-
-    expect(newStorage.data).toStrictEqual({
-      TokensController: {
-        allTokens: {
-          '0x10': {
-            '0x111': [
-              {
-                address: '0xaaa',
-                decimals: 1,
-                symbol: 'TEST1',
-              },
-            ],
-          },
-          '0x20': {
-            '0x222': [
-              {
-                address: '0xbbb',
-                decimals: 1,
-                symbol: 'TEST2',
-              },
-            ],
-          },
-        },
-      },
+      });
     });
-  });
+  }
 
   it('does not convert chain IDs in TokensController.allTokens which are already hex strings', async () => {
     const oldStorage = {
@@ -1456,51 +1466,53 @@ describe('migration #88', () => {
     });
   });
 
-  it('deletes undefined-keyed properties from TokensController.allIgnoredTokens', async () => {
-    const oldStorage = {
-      meta: { version: 87 },
-      data: {
-        TokensController: {
-          allIgnoredTokens: {
-            '16': {
-              '0x1': {
-                '0x111': ['0xaaa'],
+  for (const invalidKey of invalidKeys) {
+    it(`deletes ${invalidKey}-keyed properties from TokensController.allIgnoredTokens`, async () => {
+      const oldStorage = {
+        meta: { version: 87 },
+        data: {
+          TokensController: {
+            allIgnoredTokens: {
+              '16': {
+                '0x1': {
+                  '0x111': ['0xaaa'],
+                },
               },
-            },
-            '32': {
-              '0x2': {
-                '0x222': ['0xbbb'],
+              '32': {
+                '0x2': {
+                  '0x222': ['0xbbb'],
+                },
               },
-            },
-            undefined: {
-              '0x2': {
-                '0x222': ['0xbbb'],
+              [invalidKey]: {
+                '0x2': {
+                  '0x222': ['0xbbb'],
+                },
               },
             },
           },
         },
-      },
-    };
+      };
 
-    const newStorage = await migrate(oldStorage);
+      const newStorage = await migrate(oldStorage);
 
-    expect(newStorage.data).toStrictEqual({
-      TokensController: {
-        allIgnoredTokens: {
-          '0x10': {
-            '0x1': {
-              '0x111': ['0xaaa'],
+      expect(newStorage.data).toStrictEqual({
+        TokensController: {
+          allIgnoredTokens: {
+            '0x10': {
+              '0x1': {
+                '0x111': ['0xaaa'],
+              },
             },
-          },
-          '0x20': {
-            '0x2': {
-              '0x222': ['0xbbb'],
+            '0x20': {
+              '0x2': {
+                '0x222': ['0xbbb'],
+              },
             },
           },
         },
-      },
+      });
     });
-  });
+  }
 
   it('does not convert chain IDs in TokensController.allIgnoredTokens which are already hex strings', async () => {
     const oldStorage = {
@@ -1635,41 +1647,43 @@ describe('migration #88', () => {
     });
   });
 
-  it('deletes undefined-keyed properties from  TokensController.allDetectedTokens', async () => {
-    const oldStorage = {
-      meta: { version: 87 },
-      data: {
-        TokensController: {
-          allDetectedTokens: {
-            '16': {
-              '0x1': {
-                '0x111': ['0xaaa'],
+  for (const invalidKey of invalidKeys) {
+    it(`deletes ${invalidKey}-keyed properties from  TokensController.allDetectedTokens`, async () => {
+      const oldStorage = {
+        meta: { version: 87 },
+        data: {
+          TokensController: {
+            allDetectedTokens: {
+              '16': {
+                '0x1': {
+                  '0x111': ['0xaaa'],
+                },
               },
-            },
-            undefined: {
-              '0x2': {
-                '0x222': ['0xbbb'],
+              [invalidKey]: {
+                '0x2': {
+                  '0x222': ['0xbbb'],
+                },
               },
             },
           },
         },
-      },
-    };
+      };
 
-    const newStorage = await migrate(oldStorage);
+      const newStorage = await migrate(oldStorage);
 
-    expect(newStorage.data).toStrictEqual({
-      TokensController: {
-        allDetectedTokens: {
-          '0x10': {
-            '0x1': {
-              '0x111': ['0xaaa'],
+      expect(newStorage.data).toStrictEqual({
+        TokensController: {
+          allDetectedTokens: {
+            '0x10': {
+              '0x1': {
+                '0x111': ['0xaaa'],
+              },
             },
           },
         },
-      },
+      });
     });
-  });
+  }
 
   it('does not convert chain IDs in TokensController.allDetectedTokens which are already hex strings', async () => {
     const oldStorage = {
diff --git a/app/scripts/migrations/088.ts b/app/scripts/migrations/088.ts
index 6fda62183d2e..274b93624a85 100644
--- a/app/scripts/migrations/088.ts
+++ b/app/scripts/migrations/088.ts
@@ -59,7 +59,11 @@ function migrateData(state: Record<string, unknown>): void {
 
           if (isObject(nftContractsByChainId)) {
             for (const chainId of Object.keys(nftContractsByChainId)) {
-              if (chainId === 'undefined' || chainId === undefined) {
+              if (
+                chainId === 'undefined' ||
+                chainId === undefined ||
+                chainId === 'null'
+              ) {
                 delete nftContractsByChainId[chainId];
               }
             }
@@ -96,7 +100,11 @@ function migrateData(state: Record<string, unknown>): void {
 
           if (isObject(nftsByChainId)) {
             for (const chainId of Object.keys(nftsByChainId)) {
-              if (chainId === 'undefined' || chainId === undefined) {
+              if (
+                chainId === 'undefined' ||
+                chainId === undefined ||
+                chainId === 'null'
+              ) {
                 delete nftsByChainId[chainId];
               }
             }
@@ -142,7 +150,11 @@ function migrateData(state: Record<string, unknown>): void {
       for (const chainId of Object.keys(
         tokenListControllerState.tokensChainsCache,
       )) {
-        if (chainId === 'undefined' || chainId === undefined) {
+        if (
+          chainId === 'undefined' ||
+          chainId === undefined ||
+          chainId === 'null'
+        ) {
           delete tokenListControllerState.tokensChainsCache[chainId];
         }
       }
@@ -183,7 +195,11 @@ function migrateData(state: Record<string, unknown>): void {
       const { allTokens } = tokensControllerState;
 
       for (const chainId of Object.keys(allTokens)) {
-        if (chainId === 'undefined' || chainId === undefined) {
+        if (
+          chainId === 'undefined' ||
+          chainId === undefined ||
+          chainId === 'null'
+        ) {
           delete allTokens[chainId];
         }
       }
@@ -212,7 +228,11 @@ function migrateData(state: Record<string, unknown>): void {
       const { allIgnoredTokens } = tokensControllerState;
 
       for (const chainId of Object.keys(allIgnoredTokens)) {
-        if (chainId === 'undefined' || chainId === undefined) {
+        if (
+          chainId === 'undefined' ||
+          chainId === undefined ||
+          chainId === 'null'
+        ) {
           delete allIgnoredTokens[chainId];
         }
       }
@@ -241,7 +261,11 @@ function migrateData(state: Record<string, unknown>): void {
       const { allDetectedTokens } = tokensControllerState;
 
       for (const chainId of Object.keys(allDetectedTokens)) {
-        if (chainId === 'undefined' || chainId === undefined) {
+        if (
+          chainId === 'undefined' ||
+          chainId === undefined ||
+          chainId === 'null'
+        ) {
           delete allDetectedTokens[chainId];
         }
       }

From 45421050d5eaf79701de894193807b09a7c158d6 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 13 Aug 2024 19:48:01 -0230
Subject: [PATCH 169/236] Update changelog for v12.0.2 (#26400)

Updates the changelog for v12.0.2

---------

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6af5f7009cc..5b23005a2d60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.2]
+### Fixed
+- Prevented data persistence errors related to networks, and phishing protection ([#26383](https://github.com/MetaMask/metamask-extension/pull/26383), [#26396](https://github.com/MetaMask/metamask-extension/pull/26396))
+- Fix token state migration errors ([#26397](https://github.com/MetaMask/metamask-extension/pull/26397))
 
 ## [12.0.1]
 ### Removed

From 3277dad53d6129ce1205fe3b0127a06c0dd924f1 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:28:54 +0000
Subject: [PATCH 170/236] Update LavaMoat policies

---
 lavamoat/browserify/beta/policy.json  | 37 ++++++++++++++++++++++++++-
 lavamoat/browserify/flask/policy.json | 37 ++++++++++++++++++++++++++-
 lavamoat/browserify/main/policy.json  | 37 ++++++++++++++++++++++++++-
 lavamoat/browserify/mmi/policy.json   | 37 ++++++++++++++++++++++++++-
 4 files changed, 144 insertions(+), 4 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index d17b42a08fc8..dcfb74ed4fd4 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -797,10 +797,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
+        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -813,6 +813,41 @@
         "immer": true
       }
     },
+    "@metamask/accounts-controller>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index d17b42a08fc8..dcfb74ed4fd4 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -797,10 +797,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
+        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -813,6 +813,41 @@
         "immer": true
       }
     },
+    "@metamask/accounts-controller>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index d17b42a08fc8..dcfb74ed4fd4 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -797,10 +797,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
+        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -813,6 +813,41 @@
         "immer": true
       }
     },
+    "@metamask/accounts-controller>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index b1576a7d4f79..e4391384a16d 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -889,10 +889,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
+        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -905,6 +905,41 @@
         "immer": true
       }
     },
+    "@metamask/accounts-controller>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,

From af2ac6a3c269adc7507da5f7feedaedb1c084e0a Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Wed, 14 Aug 2024 12:43:19 +0000
Subject: [PATCH 171/236] Version v12.0.3

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b23005a2d60..1a0406d0eadd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.0.3]
+
 ## [12.0.2]
 ### Fixed
 - Prevented data persistence errors related to networks, and phishing protection ([#26383](https://github.com/MetaMask/metamask-extension/pull/26383), [#26396](https://github.com/MetaMask/metamask-extension/pull/26396))
@@ -4907,7 +4909,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.3...HEAD
+[12.0.3]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...v12.0.3
 [12.0.2]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...v12.0.2
 [12.0.1]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...v12.0.1
 [12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.16...v12.0.0
diff --git a/package.json b/package.json
index 7909c1baac57..c9be13fc90f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.0.2",
+  "version": "12.0.3",
   "private": true,
   "repository": {
     "type": "git",

From c29a72cb02e0eaac0202ff3d1b881076f00ee55e Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Fri, 26 Jul 2024 13:31:27 +0200
Subject: [PATCH 172/236] refactor: fix event names used to track notifications
 (#25521)
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.
-->

This PR modifies the names of some tracked events to monitor the use of
notifications, ensuring they adhere to the conventions used.

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

Fixes:

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

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

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

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

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [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: Prithpal Sooriya <prithpal.sooriya@consensys.net>
Co-authored-by: Prithpal Sooriya <prithpal.sooriya@gmail.com>
---
 app/scripts/metamask-controller.js            |  8 +++--
 shared/constants/metametrics.ts               | 34 +++++++------------
 test/e2e/tests/metrics/wallet-created.spec.js |  2 ++
 .../turn-on-metamask-notifications.tsx        | 12 ++++---
 .../multichain/global-menu/global-menu.js     | 15 +++-----
 .../notification-detail-button.tsx            | 12 +++++--
 ...fications-settings-allow-notifications.tsx | 15 ++++++--
 .../notifications-settings-per-account.tsx    |  8 ++---
 .../notifications-settings-types.tsx          | 11 +++---
 .../notification-components/snap/snap.tsx     | 18 +++++-----
 .../notifications/notifications-list-item.tsx | 13 ++++---
 .../creation-successful.js                    | 17 +++-------
 .../privacy-settings/privacy-settings.js      | 22 ------------
 .../profile-sync-toggle.tsx                   | 25 +-------------
 14 files changed, 88 insertions(+), 124 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c31f471cede0..6ab4b9b85879 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1484,9 +1484,10 @@ export default class MetamaskController extends EventEmitter {
       'PushPlatformNotificationsController:onNewNotifications',
       (notification) => {
         this.metaMetricsController.trackEvent({
-          event: MetaMetricsEventName.PushNotificationReceived,
           category: MetaMetricsEventCategory.PushNotifications,
+          event: MetaMetricsEventName.NotificationReceived,
           properties: {
+            notification_channel: 'push',
             notification_type: notification.type,
             chain_id: notification?.chain_id,
           },
@@ -1497,11 +1498,14 @@ export default class MetamaskController extends EventEmitter {
       'PushPlatformNotificationsController:pushNotificationClicked',
       (notification) => {
         this.metaMetricsController.trackEvent({
-          event: MetaMetricsEventName.PushNotificationClicked,
           category: MetaMetricsEventCategory.PushNotifications,
+          event: MetaMetricsEventName.NotificationClicked,
           properties: {
+            notification_id: notification.id,
             notification_type: notification.type,
             chain_id: notification?.chain_id,
+            notification_is_read: notification.isRead,
+            click_type: 'push_notification',
           },
         });
       },
diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index b7110c67c3e6..20b0d3676d64 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -524,23 +524,18 @@ export enum MetaMetricsEventName {
   DecryptionApproved = 'Decryption Approved',
   DecryptionRejected = 'Decryption Rejected',
   DecryptionRequested = 'Decryption Requested',
-  DisablingAccountNotifications = 'Disabling Account Notifications',
-  EnablingAccountNotifications = 'Enabling Account Notifications',
-  DisablingNotifications = 'Disabling Notifications',
-  DismissEnablingNotificationsFlow = 'Dismiss Enabling Notifications Flow',
+  DisablingNotifications = 'Notifications Disabled',
   EmptyBuyBannerDisplayed = 'Empty Buy Banner Displayed',
   EmptyBuyBannerClicked = 'Empty Buy Banner Clicked',
   EmptyReceiveBannerDisplayed = 'Empty Receive Banner Displayed',
   EmptyReceiveBannerClicked = 'Empty Receive Banner Clicked',
   EmptyNftsBannerDisplayed = 'Empty NFTs Banner Displayed',
   EmptyNftsBannerClicked = 'Empty NFTs Banner Clicked',
-  EnablingNotifications = 'Enabling Notifications',
+  EnablingNotifications = 'Notifications Enabled',
   EncryptionPublicKeyApproved = 'Encryption Approved',
   EncryptionPublicKeyRejected = 'Encryption Rejected',
   EncryptionPublicKeyRequested = 'Encryption Requested',
   ExternalLinkClicked = 'External Link Clicked',
-  FeatureAnnouncementEnabled = 'Feature Announcement Enabled',
-  FeatureAnnouncementDisabled = 'Feature Announcement Disabled',
   KeyExportSelected = 'Key Export Selected',
   KeyExportRequested = 'Key Export Requested',
   KeyExportFailed = 'Key Export Failed',
@@ -553,7 +548,7 @@ export enum MetaMetricsEventName {
   KeyGasFeeEstimationBuySwapTokens = 'Key Show Gas Fee Estimation, Buy Crypto and Swap Tokens',
   KeyAutoDetectTokens = 'Key Autodetect tokens',
   KeyBatchAccountBalanceRequests = 'Key Batch account balance requests',
-  MarkAllNotificationsRead = 'Mark All Notifications Read',
+  MarkAllNotificationsRead = 'Notifications Marked All as Read',
   MetricsOptIn = 'Metrics Opt In',
   MetricsOptOut = 'Metrics Opt Out',
   NavAccountMenuOpened = 'Account Menu Opened',
@@ -568,9 +563,6 @@ export enum MetaMetricsEventName {
   NavSendButtonClicked = 'Send Button Clicked',
   NavSwapButtonClicked = 'Swap Button Clicked',
   NftAdded = 'NFT Added',
-  NotificationPageOpened = 'Notification Page Opened',
-  NotificationItemClicked = 'Notification Item Clicked',
-  NotificationDetailClicked = 'Notification Detail Clicked',
   OnboardingWalletCreationStarted = 'Wallet Setup Selected',
   OnboardingWalletImportStarted = 'Wallet Import Started',
   OnboardingWalletCreationAttempted = 'Wallet Password Created',
@@ -582,12 +574,8 @@ export enum MetaMetricsEventName {
   OnboardingWalletSecurityPhraseWrittenDown = 'SRP Backup Confirm Display',
   OnboardingWalletSecurityPhraseConfirmed = 'SRP Backup Confirmed',
   OnboardingWalletCreationComplete = 'Wallet Created',
-  OnboardingWalletCreationCompleteWithAuthenticating = 'Wallet Created with Authenticating',
   OnboardingWalletSetupComplete = 'Application Opened',
   OnboardingWalletAdvancedSettings = 'Settings Updated',
-  OnboardingWalletAdvancedSettingsWithAuthenticating = 'Settings Updated with Authenticating',
-  OnboardingWalletAdvancedSettingsWithoutAuthenticating = 'Settings Updated without Authenticating',
-  OnboardingWalletAdvancedSettingsTurnOffProfileSyncing = 'Turn Off Profile Syncing',
   OnboardingWalletImportAttempted = 'Wallet Import Attempted',
   OnboardingWalletVideoPlay = 'SRP Intro Video Played',
   OnboardingTwitterClick = 'External Link Clicked',
@@ -628,7 +616,6 @@ export enum MetaMetricsEventName {
   SrpCopiedToClipboard = 'Copies SRP to clipboard',
   SrpToConfirmBackup = 'SRP Backup Confirm Displayed',
   StakingEntryPointClicked = 'Stake Button Clicked',
-  StartEnablingNotificationsFlow = 'Start Enabling Notifications Flow',
   SupportLinkClicked = 'Support Link Clicked',
   TermsOfUseShown = 'Terms of Use Shown',
   TermsOfUseAccepted = 'Terms of Use Accepted',
@@ -722,13 +709,16 @@ export enum MetaMetricsEventName {
   TokenAutoDetectionEnableModal = 'Token Autodetection Enabled from modal',
   TokenAutoDetectionDisableModal = 'Token Autodetection Disabled from modal',
   ///: END:ONLY_INCLUDE_IF
-  TurnOffProfileSyncing = 'Turn Off Profile Syncing',
-  TurnOnProfileSyncing = 'Turn On Profile Syncing',
-  TurnOnMetaMetrics = 'Turn On MetaMetrics',
-  TurnOffMetaMetrics = 'Turn Off MetaMetrics',
+  TurnOnMetaMetrics = 'MetaMetrics Turned On',
+  TurnOffMetaMetrics = 'MetaMetrics Turned Off',
   // Notifications
-  PushNotificationReceived = 'Push Notification Received',
-  PushNotificationClicked = 'Push Notification Clicked',
+  NotificationReceived = 'Notification Received',
+  NotificationsSettingsUpdated = 'Notifications Settings Updated',
+  NotificationClicked = 'Notification Clicked',
+  NotificationsEnablingFlowHandled = 'Notifications Enabling Flow Handled',
+
+  NftAutoDetectionEnableModal = 'Nft Autodetection Enabled from modal',
+  NftAutoDetectionDisableModal = 'Nft Autodetection Disabled from modal',
   // Send
   sendAssetSelected = 'Send Asset Selected',
   sendFlowExited = 'Send Flow Exited',
diff --git a/test/e2e/tests/metrics/wallet-created.spec.js b/test/e2e/tests/metrics/wallet-created.spec.js
index cff720062818..bc07cfdeea75 100644
--- a/test/e2e/tests/metrics/wallet-created.spec.js
+++ b/test/e2e/tests/metrics/wallet-created.spec.js
@@ -87,6 +87,8 @@ describe('Wallet Created Events @no-mmi', function () {
           locale: 'en',
           chain_id: '0x539',
           environment_type: 'fullscreen',
+          is_profile_syncing_enabled: null,
+          is_signed_in: false,
         });
       },
     );
diff --git a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
index 2cb2437cc665..46510d0584fb 100644
--- a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
+++ b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
@@ -62,9 +62,11 @@ export default function TurnOnMetamaskNotifications() {
     await createNotifications();
     trackEvent({
       category: MetaMetricsEventCategory.EnableNotifications,
-      event: MetaMetricsEventName.EnablingNotifications,
+      event: MetaMetricsEventName.NotificationsEnablingFlowHandled,
       properties: {
-        isProfileSyncingEnabled,
+        is_profile_syncing_enabled: isProfileSyncingEnabled,
+        is_notifications_enabled: isNotificationEnabled,
+        action_type: 'enabled',
       },
     });
   };
@@ -73,9 +75,11 @@ export default function TurnOnMetamaskNotifications() {
     hideModal();
     trackEvent({
       category: MetaMetricsEventCategory.EnableNotifications,
-      event: MetaMetricsEventName.DismissEnablingNotificationsFlow,
+      event: MetaMetricsEventName.NotificationsEnablingFlowHandled,
       properties: {
-        isProfileSyncingEnabled,
+        is_profile_syncing_enabled: isProfileSyncingEnabled,
+        is_notifications_enabled: isNotificationEnabled,
+        action_type: 'dismissed',
       },
     });
   };
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index 3841151dd7aa..92c9bb897c99 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -153,10 +153,11 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
     if (shouldShowEnableModal) {
       trackEvent({
         category: MetaMetricsEventCategory.EnableNotifications,
-        event: MetaMetricsEventName.StartEnablingNotificationsFlow,
+        event: MetaMetricsEventName.NotificationsEnablingFlowHandled,
         properties: {
-          isProfileSyncingEnabled,
-          isMetamaskNotificationsEnabled,
+          is_profile_syncing_enabled: isProfileSyncingEnabled,
+          is_notifications_enabled: isMetamaskNotificationsEnabled,
+          action_type: 'started',
         },
       });
       dispatch(showConfirmTurnOnMetamaskNotifications());
@@ -165,14 +166,6 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
     }
 
     // Otherwise we can navigate to the notifications page
-    trackEvent({
-      category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationPageOpened,
-      properties: {
-        isProfileSyncingEnabled,
-        isMetamaskNotificationsEnabled,
-      },
-    });
     history.push(NOTIFICATIONS_ROUTE);
     closeMenu();
   };
diff --git a/ui/components/multichain/notification-detail-button/notification-detail-button.tsx b/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
index 190b5cc4fa51..ea8f1d0559ec 100644
--- a/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
+++ b/ui/components/multichain/notification-detail-button/notification-detail-button.tsx
@@ -5,6 +5,7 @@ import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,
 } from '../../../../shared/constants/metametrics';
+import { TRIGGER_TYPES } from '../../../../app/scripts/controllers/metamask-notifications/constants/notification-schema';
 import {
   Button,
   ButtonVariant,
@@ -37,10 +38,15 @@ export const NotificationDetailButton = ({
   const onClick = () => {
     trackEvent({
       category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationDetailClicked,
+      event: MetaMetricsEventName.NotificationClicked,
       properties: {
-        notificationId: notification.id,
-        notificationType: notification.type,
+        notification_id: notification.id,
+        notification_type: notification.type,
+        ...(notification.type !== TRIGGER_TYPES.FEATURES_ANNOUNCEMENT && {
+          chain_id: notification?.chain_id,
+        }),
+        notification_is_read: notification.isRead,
+        click_type: 'detail',
       },
     });
   };
diff --git a/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx b/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx
index 4214eccc656b..ffe7c6e99d33 100644
--- a/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx
+++ b/ui/pages/notifications-settings/notifications-settings-allow-notifications.tsx
@@ -85,15 +85,24 @@ export function NotificationsSettingsAllowNotifications({
       await disableNotifications();
       trackEvent({
         category: MetaMetricsEventCategory.NotificationSettings,
-        event: MetaMetricsEventName.DisablingNotifications,
+        event: MetaMetricsEventName.NotificationsSettingsUpdated,
+        properties: {
+          setting_type: 'notifications',
+          is_profile_syncing_enabled: isProfileSyncingEnabled,
+          old_value: true,
+          new_value: false,
+        },
       });
     } else {
       await enableNotifications();
       trackEvent({
         category: MetaMetricsEventCategory.NotificationSettings,
-        event: MetaMetricsEventName.EnablingNotifications,
+        event: MetaMetricsEventName.NotificationsSettingsUpdated,
         properties: {
-          isProfileSyncingEnabled,
+          setting_type: 'notifications',
+          is_profile_syncing_enabled: isProfileSyncingEnabled,
+          old_value: false,
+          new_value: true,
         },
       });
     }
diff --git a/ui/pages/notifications-settings/notifications-settings-per-account.tsx b/ui/pages/notifications-settings/notifications-settings-per-account.tsx
index 6ebfcdad5f0f..e73d6807feff 100644
--- a/ui/pages/notifications-settings/notifications-settings-per-account.tsx
+++ b/ui/pages/notifications-settings/notifications-settings-per-account.tsx
@@ -72,11 +72,11 @@ export const NotificationsSettingsPerAccount = ({
   const handleToggleAccountNotifications = useCallback(async () => {
     trackEvent({
       category: MetaMetricsEventCategory.NotificationSettings,
-      event: isEnabled
-        ? MetaMetricsEventName.DisablingAccountNotifications
-        : MetaMetricsEventName.EnablingAccountNotifications,
+      event: MetaMetricsEventName.NotificationsSettingsUpdated,
       properties: {
-        address,
+        setting_type: 'account_notifications',
+        old_value: isEnabled,
+        new_value: !isEnabled,
       },
     });
     await toggleAccount(!isEnabled);
diff --git a/ui/pages/notifications-settings/notifications-settings-types.tsx b/ui/pages/notifications-settings/notifications-settings-types.tsx
index 8225bd14ec24..b00390e1cc46 100644
--- a/ui/pages/notifications-settings/notifications-settings-types.tsx
+++ b/ui/pages/notifications-settings/notifications-settings-types.tsx
@@ -55,10 +55,13 @@ export function NotificationsSettingsTypes({
     try {
       onChangeFeatureAnnouncements(!featureAnnouncementsEnabled);
       trackEvent({
-        category: MetaMetricsEventCategory.NotificationInteraction,
-        event: featureAnnouncementsEnabled
-          ? MetaMetricsEventName.FeatureAnnouncementDisabled
-          : MetaMetricsEventName.FeatureAnnouncementEnabled,
+        category: MetaMetricsEventCategory.NotificationSettings,
+        event: MetaMetricsEventName.NotificationsSettingsUpdated,
+        properties: {
+          setting_type: 'feature_announcements',
+          old_value: featureAnnouncementsEnabled,
+          new_value: !featureAnnouncementsEnabled,
+        },
       });
       listNotifications();
     } catch (error) {
diff --git a/ui/pages/notifications/notification-components/snap/snap.tsx b/ui/pages/notifications/notification-components/snap/snap.tsx
index bdd7b4576694..beb9151af10d 100644
--- a/ui/pages/notifications/notification-components/snap/snap.tsx
+++ b/ui/pages/notifications/notification-components/snap/snap.tsx
@@ -29,11 +29,12 @@ export const SnapComponent = ({ snapNotification }: SnapComponentProps) => {
     dispatch(markNotificationsAsRead([snapNotification.id]));
     trackEvent({
       category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationDetailClicked,
+      event: MetaMetricsEventName.NotificationClicked,
       properties: {
-        notificationId: snapNotification.id,
-        notificationType: snapNotification.type,
-        notificationIsRead: snapNotification.isRead,
+        notification_id: snapNotification.id,
+        notification_type: snapNotification.type,
+        notification_is_read: snapNotification.isRead,
+        click_type: 'item',
       },
     });
   };
@@ -42,11 +43,12 @@ export const SnapComponent = ({ snapNotification }: SnapComponentProps) => {
     dispatch(markNotificationsAsRead([snapNotification.id]));
     trackEvent({
       category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationItemClicked,
+      event: MetaMetricsEventName.NotificationClicked,
       properties: {
-        notificationId: snapNotification.id,
-        notificationType: snapNotification.type,
-        notificationIsRead: snapNotification.isRead,
+        notification_id: snapNotification.id,
+        notification_type: snapNotification.type,
+        notification_is_read: snapNotification.isRead,
+        click_type: 'item',
       },
     });
     history.push(getSnapRoute(snapNotification.data.origin));
diff --git a/ui/pages/notifications/notifications-list-item.tsx b/ui/pages/notifications/notifications-list-item.tsx
index fd8e628d9869..b3ffba845ebf 100644
--- a/ui/pages/notifications/notifications-list-item.tsx
+++ b/ui/pages/notifications/notifications-list-item.tsx
@@ -14,6 +14,7 @@ import {
 } from '../../helpers/constants/design-system';
 import { NOTIFICATIONS_ROUTE } from '../../helpers/constants/routes';
 import { useMarkNotificationAsRead } from '../../hooks/metamask-notifications/useNotifications';
+import { TRIGGER_TYPES } from '../../../app/scripts/controllers/metamask-notifications/constants/notification-schema';
 import {
   NotificationComponents,
   hasNotificationComponents,
@@ -32,11 +33,15 @@ export function NotificationsListItem({
   const handleNotificationClick = useCallback(() => {
     trackEvent({
       category: MetaMetricsEventCategory.NotificationInteraction,
-      event: MetaMetricsEventName.NotificationItemClicked,
+      event: MetaMetricsEventName.NotificationClicked,
       properties: {
-        notificationId: notification.id,
-        notificationType: notification.type,
-        notificationIsRead: notification.isRead,
+        notification_id: notification.id,
+        notification_type: notification.type,
+        notification_is_read: notification.isRead,
+        ...(notification.type !== TRIGGER_TYPES.FEATURES_ANNOUNCEMENT && {
+          chain_id: notification?.chain_id,
+        }),
+        click_type: 'item',
       },
     });
     markNotificationAsRead([
diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.js b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
index c645b93078dc..515637e79ccd 100644
--- a/ui/pages/onboarding-flow/creation-successful/creation-successful.js
+++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
@@ -25,7 +25,7 @@ import {
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { useCreateSession } from '../../../hooks/metamask-notifications/useCreateSession';
 import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing';
-import { selectParticipateInMetaMetrics } from '../../../selectors/metamask-notifications/authentication';
+import { selectIsSignedIn } from '../../../selectors/metamask-notifications/authentication';
 
 export default function CreationSuccessful() {
   const history = useHistory();
@@ -36,7 +36,7 @@ export default function CreationSuccessful() {
   const { createSession } = useCreateSession();
 
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const participateInMetaMetrics = useSelector(selectParticipateInMetaMetrics);
+  const isSignedIn = useSelector(selectIsSignedIn);
 
   return (
     <div className="creation-successful" data-testid="creation-successful">
@@ -116,19 +116,10 @@ export default function CreationSuccessful() {
               event: MetaMetricsEventName.OnboardingWalletCreationComplete,
               properties: {
                 method: firstTimeFlowType,
+                is_signed_in: isSignedIn,
+                is_profile_syncing_enabled: isProfileSyncingEnabled,
               },
             });
-            if (isProfileSyncingEnabled || participateInMetaMetrics) {
-              trackEvent({
-                category: MetaMetricsEventCategory.Onboarding,
-                event:
-                  MetaMetricsEventName.OnboardingWalletCreationCompleteWithAuthenticating,
-                properties: {
-                  isProfileSyncingEnabled,
-                  partedInMetaMetrics: participateInMetaMetrics,
-                },
-              });
-            }
             createSession();
             history.push(ONBOARDING_PIN_EXTENSION_ROUTE);
           }}
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index cd61e923e905..458d34540fa5 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -194,20 +194,6 @@ export default function PrivacySettings() {
       },
     });
 
-    const eventName =
-      profileSyncingProps.isProfileSyncingEnabled || participateInMetaMetrics
-        ? MetaMetricsEventName.OnboardingWalletAdvancedSettingsWithAuthenticating
-        : MetaMetricsEventName.OnboardingWalletAdvancedSettingsWithoutAuthenticating;
-
-    trackEvent({
-      category: MetaMetricsEventCategory.Onboarding,
-      event: eventName,
-      properties: {
-        isProfileSyncingEnabled: profileSyncingProps.isProfileSyncingEnabled,
-        participateInMetaMetrics,
-      },
-    });
-
     history.push(ONBOARDING_PIN_EXTENSION_ROUTE);
   };
 
@@ -218,14 +204,6 @@ export default function PrivacySettings() {
           name: 'CONFIRM_TURN_OFF_PROFILE_SYNCING',
           turnOffProfileSyncing: () => {
             profileSyncingProps.setIsProfileSyncingEnabled(false);
-            trackEvent({
-              category: MetaMetricsEventCategory.Onboarding,
-              event:
-                MetaMetricsEventName.OnboardingWalletAdvancedSettingsTurnOffProfileSyncing,
-              properties: {
-                participateInMetaMetrics,
-              },
-            });
           },
         }),
       );
diff --git a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
index a0661635797d..7d1d8d66a48a 100644
--- a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
+++ b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
@@ -1,7 +1,6 @@
-import React, { useContext, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   useEnableProfileSyncing,
   useDisableProfileSyncing,
@@ -11,12 +10,7 @@ import {
   selectIsProfileSyncingEnabled,
   selectIsProfileSyncingUpdateLoading,
 } from '../../../../selectors/metamask-notifications/profile-syncing';
-import { selectParticipateInMetaMetrics } from '../../../../selectors/metamask-notifications/authentication';
 import { showModal } from '../../../../store/actions';
-import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../../shared/constants/metametrics';
 import { Box, Text } from '../../../../components/component-library';
 import ToggleButton from '../../../../components/ui/toggle-button';
 import {
@@ -47,7 +41,6 @@ function ProfileSyncBasicFunctionalitySetting() {
 
 const ProfileSyncToggle = () => {
   const t = useI18nContext();
-  const trackEvent = useContext(MetaMetricsContext);
   const dispatch = useDispatch();
   const { enableProfileSyncing, error: enableProfileSyncingError } =
     useEnableProfileSyncing();
@@ -59,7 +52,6 @@ const ProfileSyncToggle = () => {
   const error = enableProfileSyncingError || disableProfileSyncingError;
 
   const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
-  const participateInMetaMetrics = useSelector(selectParticipateInMetaMetrics);
   const isProfileSyncingUpdateLoading = useSelector(
     selectIsProfileSyncingUpdateLoading,
   );
@@ -71,26 +63,11 @@ const ProfileSyncToggle = () => {
           name: 'CONFIRM_TURN_OFF_PROFILE_SYNCING',
           turnOffProfileSyncing: () => {
             disableProfileSyncing();
-            trackEvent({
-              category: MetaMetricsEventCategory.Settings,
-              event: MetaMetricsEventName.TurnOffProfileSyncing,
-              properties: {
-                participateInMetaMetrics,
-              },
-            });
           },
         }),
       );
     } else {
       await enableProfileSyncing();
-      trackEvent({
-        category: MetaMetricsEventCategory.Settings,
-        event: MetaMetricsEventName.TurnOnProfileSyncing,
-        properties: {
-          isProfileSyncingEnabled,
-          participateInMetaMetrics,
-        },
-      });
     }
   };
 

From 79f765037c9367b6276b602ef4b76a81ffa8cd97 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Wed, 14 Aug 2024 14:12:17 +0200
Subject: [PATCH 173/236] fix: notifications use better events (#26410)
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 PR updates and introduces some events necessary for the
notifications team to track user interaction with notifications.

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

## **Related issues**

Fixes:

## **Manual testing steps**

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 shared/constants/metametrics.ts               |  3 +-
 .../turn-on-metamask-notifications.tsx        |  8 +++---
 .../multichain/global-menu/global-menu.js     | 13 +++++++--
 .../privacy-settings/privacy-settings.js      | 22 +++++++++++++++
 .../profile-sync-toggle.tsx                   | 28 ++++++++++++++++++-
 5 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/shared/constants/metametrics.ts b/shared/constants/metametrics.ts
index 20b0d3676d64..2e6db1990b5c 100644
--- a/shared/constants/metametrics.ts
+++ b/shared/constants/metametrics.ts
@@ -715,7 +715,7 @@ export enum MetaMetricsEventName {
   NotificationReceived = 'Notification Received',
   NotificationsSettingsUpdated = 'Notifications Settings Updated',
   NotificationClicked = 'Notification Clicked',
-  NotificationsEnablingFlowHandled = 'Notifications Enabling Flow Handled',
+  NotificationMenuOpened = 'Notification Menu Opened',
 
   NftAutoDetectionEnableModal = 'Nft Autodetection Enabled from modal',
   NftAutoDetectionDisableModal = 'Nft Autodetection Disabled from modal',
@@ -759,7 +759,6 @@ export enum MetaMetricsEventCategory {
   Messages = 'Messages',
   Navigation = 'Navigation',
   Network = 'Network',
-  EnableNotifications = 'Enable Notifications',
   Onboarding = 'Onboarding',
   NotificationInteraction = 'Notification Interaction',
   NotificationSettings = 'Notification Settings',
diff --git a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
index 46510d0584fb..39d554759b29 100644
--- a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
+++ b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx
@@ -61,8 +61,8 @@ export default function TurnOnMetamaskNotifications() {
     setButtonState(true);
     await createNotifications();
     trackEvent({
-      category: MetaMetricsEventCategory.EnableNotifications,
-      event: MetaMetricsEventName.NotificationsEnablingFlowHandled,
+      category: MetaMetricsEventCategory.NotificationInteraction,
+      event: MetaMetricsEventName.NotificationMenuOpened,
       properties: {
         is_profile_syncing_enabled: isProfileSyncingEnabled,
         is_notifications_enabled: isNotificationEnabled,
@@ -74,8 +74,8 @@ export default function TurnOnMetamaskNotifications() {
   const handleHideModal = () => {
     hideModal();
     trackEvent({
-      category: MetaMetricsEventCategory.EnableNotifications,
-      event: MetaMetricsEventName.NotificationsEnablingFlowHandled,
+      category: MetaMetricsEventCategory.NotificationInteraction,
+      event: MetaMetricsEventName.NotificationMenuOpened,
       properties: {
         is_profile_syncing_enabled: isProfileSyncingEnabled,
         is_notifications_enabled: isNotificationEnabled,
diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index 92c9bb897c99..d46c9315ffa1 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -152,15 +152,24 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
 
     if (shouldShowEnableModal) {
       trackEvent({
-        category: MetaMetricsEventCategory.EnableNotifications,
-        event: MetaMetricsEventName.NotificationsEnablingFlowHandled,
+        category: MetaMetricsEventCategory.NotificationInteraction,
+        event: MetaMetricsEventName.NotificationMenuOpened,
         properties: {
           is_profile_syncing_enabled: isProfileSyncingEnabled,
           is_notifications_enabled: isMetamaskNotificationsEnabled,
           action_type: 'started',
         },
       });
+      trackEvent({
+        category: MetaMetricsEventCategory.NotificationInteraction,
+        event: MetaMetricsEventName.NotificationMenuOpened,
+        properties: {
+          is_profile_syncing_enabled: isProfileSyncingEnabled,
+          is_notifications_enabled: isMetamaskNotificationsEnabled,
+        },
+      });
       dispatch(showConfirmTurnOnMetamaskNotifications());
+
       closeMenu();
       return;
     }
diff --git a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
index 458d34540fa5..b9ae7a5436d8 100644
--- a/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
+++ b/ui/pages/onboarding-flow/privacy-settings/privacy-settings.js
@@ -188,9 +188,11 @@ export default function PrivacySettings() {
       category: MetaMetricsEventCategory.Onboarding,
       event: MetaMetricsEventName.OnboardingWalletAdvancedSettings,
       properties: {
+        is_profile_syncing_enabled: profileSyncingProps.isProfileSyncingEnabled,
         show_incoming_tx: incomingTransactionsPreferences,
         use_phising_detection: usePhishingDetection,
         turnon_token_detection: turnOnTokenDetection,
+        settings_group: 'advanced',
       },
     });
 
@@ -204,11 +206,31 @@ export default function PrivacySettings() {
           name: 'CONFIRM_TURN_OFF_PROFILE_SYNCING',
           turnOffProfileSyncing: () => {
             profileSyncingProps.setIsProfileSyncingEnabled(false);
+            trackEvent({
+              category: MetaMetricsEventCategory.Onboarding,
+              event: MetaMetricsEventName.OnboardingWalletAdvancedSettings,
+              properties: {
+                settings_group: 'advanced',
+                settings_type: 'profile_syncing',
+                old_value: true,
+                new_value: false,
+              },
+            });
           },
         }),
       );
     } else {
       profileSyncingProps.setIsProfileSyncingEnabled(true);
+      trackEvent({
+        category: MetaMetricsEventCategory.Onboarding,
+        event: MetaMetricsEventName.OnboardingWalletAdvancedSettings,
+        properties: {
+          settings_group: 'advanced',
+          settings_type: 'profile_syncing',
+          old_value: false,
+          new_value: true,
+        },
+      });
     }
   };
 
diff --git a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
index 7d1d8d66a48a..11099a00909e 100644
--- a/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
+++ b/ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
@@ -1,11 +1,16 @@
-import React, { useEffect } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import {
   useEnableProfileSyncing,
   useDisableProfileSyncing,
   useSetIsProfileSyncingEnabled,
 } from '../../../../hooks/metamask-notifications/useProfileSyncing';
+import {
+  MetaMetricsEventCategory,
+  MetaMetricsEventName,
+} from '../../../../../shared/constants/metametrics';
 import {
   selectIsProfileSyncingEnabled,
   selectIsProfileSyncingUpdateLoading,
@@ -40,6 +45,7 @@ function ProfileSyncBasicFunctionalitySetting() {
 }
 
 const ProfileSyncToggle = () => {
+  const trackEvent = useContext(MetaMetricsContext);
   const t = useI18nContext();
   const dispatch = useDispatch();
   const { enableProfileSyncing, error: enableProfileSyncingError } =
@@ -63,11 +69,31 @@ const ProfileSyncToggle = () => {
           name: 'CONFIRM_TURN_OFF_PROFILE_SYNCING',
           turnOffProfileSyncing: () => {
             disableProfileSyncing();
+            trackEvent({
+              category: MetaMetricsEventCategory.Settings,
+              event: MetaMetricsEventName.SettingsUpdated,
+              properties: {
+                settings_group: 'security',
+                settings_type: 'profile_syncing',
+                old_value: true,
+                new_value: false,
+              },
+            });
           },
         }),
       );
     } else {
       await enableProfileSyncing();
+      trackEvent({
+        category: MetaMetricsEventCategory.Settings,
+        event: MetaMetricsEventName.SettingsUpdated,
+        properties: {
+          settings_group: 'security',
+          settings_type: 'profile_syncing',
+          old_value: false,
+          new_value: true,
+        },
+      });
     }
   };
 

From 89e82addc95355b53e04bd1eca0adf6fe5a20963 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Wed, 14 Aug 2024 12:14:53 -0500
Subject: [PATCH 174/236] fix (cherry-pick): Fix page width for fullscreen mode
 send page (#25771)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
Cherry pick PR for the fix #25601

The width of the new Send page regressed after v12 via this PR:
https://github.com/MetaMask/metamask-extension/pull/23697/

This commit fixes said issue.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25701?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.<!--
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/25771?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Hassan Malik <41640681+hmalik88@users.noreply.github.com>
---
 ui/components/multichain/pages/send/index.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/components/multichain/pages/send/index.scss b/ui/components/multichain/pages/send/index.scss
index e5bc53e100a6..9551ce8e5813 100644
--- a/ui/components/multichain/pages/send/index.scss
+++ b/ui/components/multichain/pages/send/index.scss
@@ -1,7 +1,11 @@
 @use "design-system";
 
 .multichain-send-page {
-  width: 100%;
+  width: 408px;
+
+  @media (max-width: 371px) {
+    width: 100%;
+  }
 
   &__account-picker {
     height: 62px;

From 3711c8f2a826e90aaa9920f91f1b29071a8d0d0a Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Wed, 10 Jul 2024 19:28:32 +0530
Subject: [PATCH 175/236] fix: blockaid report url in redesigned pages (#25702)

---
 .../hooks/alerts/useBlockaidAlerts.ts         | 58 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts b/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts
index ae87e60d64f6..264627671c0a 100644
--- a/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts
+++ b/ui/pages/confirmations/hooks/alerts/useBlockaidAlerts.ts
@@ -1,12 +1,20 @@
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
+import BlockaidPackage from '@blockaid/ppom_release/package.json';
 
 import {
   TransactionMeta,
   TransactionType,
 } from '@metamask/transaction-controller';
-import { BlockaidResultType } from '../../../../../shared/constants/security-provider';
+import {
+  BlockaidResultType,
+  FALSE_POSITIVE_REPORT_BASE_URL,
+  SECURITY_PROVIDER_UTM_SOURCE,
+} from '../../../../../shared/constants/security-provider';
+import ZENDESK_URLS from '../../../../helpers/constants/zendesk-url';
+import { NETWORK_TO_NAME_MAP } from '../../../../../shared/constants/network';
 import { Alert } from '../../../../ducks/confirm-alerts/confirm-alerts';
+import { getCurrentChainId } from '../../../../selectors';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { SecurityAlertResponse } from '../../types/confirm';
 import {
@@ -19,6 +27,9 @@ import {
 } from '../../selectors';
 import { normalizeProviderAlert } from './utils';
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
+const zlib = require('zlib');
+
 const SUPPORTED_TRANSACTION_TYPES = [
   ...SIGNATURE_TRANSACTION_TYPES,
   ...REDESIGN_TRANSACTION_TYPES,
@@ -44,6 +55,8 @@ const useBlockaidAlerts = (): Alert[] => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ) as Record<string, any>;
 
+  const selectorChainId = useSelector(getCurrentChainId);
+
   const securityAlertId = currentConfirmation?.securityAlertResponse
     ?.securityAlertId as string;
 
@@ -73,6 +86,36 @@ const useBlockaidAlerts = (): Alert[] => {
     securityAlertResponse?.result_type as BlockaidResultType,
   );
 
+  let stringifiedJSONData: string | undefined;
+
+  if (securityAlertResponse && currentConfirmation) {
+    const {
+      block,
+      features,
+      reason,
+      result_type: resultType,
+    } = securityAlertResponse as SecurityAlertResponse;
+    const { chainId, msgParams, origin, type, txParams } = currentConfirmation;
+
+    const isFailedResultType = resultType === BlockaidResultType.Errored;
+
+    const reportData = {
+      blockNumber: block,
+      blockaidVersion: BlockaidPackage.version,
+      chain: (NETWORK_TO_NAME_MAP as Record<string, string>)[
+        chainId ?? selectorChainId
+      ],
+      classification: isFailedResultType ? 'error' : reason,
+      domain: origin ?? msgParams?.origin ?? origin,
+      jsonRpcMethod: type,
+      jsonRpcParams: JSON.stringify(txParams ?? msgParams),
+      resultType: isFailedResultType ? BlockaidResultType.Errored : resultType,
+      reproduce: JSON.stringify(features),
+    };
+
+    stringifiedJSONData = JSON.stringify(reportData);
+  }
+
   return useMemo<Alert[]>(() => {
     if (
       !isTransactionTypeSupported ||
@@ -82,11 +125,22 @@ const useBlockaidAlerts = (): Alert[] => {
       return [];
     }
 
-    return [normalizeProviderAlert(securityAlertResponse, t)];
+    let reportUrl = ZENDESK_URLS.SUPPORT_URL;
+    if (stringifiedJSONData) {
+      const encodedData =
+        zlib?.gzipSync?.(stringifiedJSONData) ?? stringifiedJSONData;
+
+      reportUrl = `${FALSE_POSITIVE_REPORT_BASE_URL}?data=${encodeURIComponent(
+        encodedData.toString('base64'),
+      )}&utm_source=${SECURITY_PROVIDER_UTM_SOURCE}`;
+    }
+
+    return [normalizeProviderAlert(securityAlertResponse, t, reportUrl)];
   }, [
     isTransactionTypeSupported,
     isResultTypeIgnored,
     securityAlertResponse,
+    stringifiedJSONData,
     t,
   ]);
 };

From 2106727b13e1018ef58a1e7a55656561a364e579 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Wed, 14 Aug 2024 20:07:45 +0000
Subject: [PATCH 176/236] Version v12.0.4

---
 CHANGELOG.md | 11 ++++++++++-
 package.json |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a0406d0eadd..86c1b56782e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.0.4]
+### Uncategorized
+- Version v12.0.3 RC ([#26416](https://github.com/MetaMask/metamask-extension/pull/26416))
+- fix: V12.0.3/cherry pick notifications events ([#26419](https://github.com/MetaMask/metamask-extension/pull/26419))
+- fix: notifications use better events ([#26410](https://github.com/MetaMask/metamask-extension/pull/26410))
+- refactor: fix event names used to track notifications ([#25521](https://github.com/MetaMask/metamask-extension/pull/25521))
+- Version v12.0.3
+
 ## [12.0.3]
 
 ## [12.0.2]
@@ -4909,7 +4917,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.3...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...HEAD
+[12.0.4]: https://github.com/MetaMask/metamask-extension/compare/v12.0.3...v12.0.4
 [12.0.3]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...v12.0.3
 [12.0.2]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...v12.0.2
 [12.0.1]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...v12.0.1
diff --git a/package.json b/package.json
index c9be13fc90f4..f5c5deac9c74 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "private": true,
   "repository": {
     "type": "git",

From f6d4d170ea7696d35a3bf48f42558caeaa0d236d Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Wed, 14 Aug 2024 13:37:11 -0230
Subject: [PATCH 177/236] temp

---
 test/e2e/tests/request-queuing/ui.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js
index d49429f5e22c..6cfc9c8dfefe 100644
--- a/test/e2e/tests/request-queuing/ui.spec.js
+++ b/test/e2e/tests/request-queuing/ui.spec.js
@@ -165,7 +165,8 @@ async function validateBalanceAndActivity(
   }
 }
 
-describe('Request-queue UI changes', function () {
+// eslint-disable-next-line mocha/no-skipped-tests
+describe.skip('Request-queue UI changes', function () {
   it('should show network specific to domain @no-mmi', async function () {
     const port = 8546;
     const chainId = 1338; // 0x53a

From 2b5c0f52d83ecb7a9b288ee25be9ccc9c948c9b2 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Mon, 12 Aug 2024 06:45:12 -0230
Subject: [PATCH 178/236] fix merge errors

---
 app/_locales/en/messages.json                              | 3 ---
 builds.yml                                                 | 2 --
 test/e2e/tests/multichain/asset-picker-send.spec.ts        | 2 +-
 ui/pages/confirmations/confirmation/templates/index.js     | 7 +++++++
 .../transactions/useSigningOrSubmittingAlerts.test.ts      | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 64cf77174f5f..ef1ca93ac34d 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -2692,9 +2692,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"
-  },
   "marketCap": {
     "message": "Market cap"
   },
diff --git a/builds.yml b/builds.yml
index df6b27bc8d18..aa93f756db49 100644
--- a/builds.yml
+++ b/builds.yml
@@ -37,9 +37,7 @@ buildTypes:
   beta:
     features:
       - build-beta
-      - snaps
       - keyring-snaps
-      - blockaid
     env:
       - INFURA_BETA_PROJECT_ID
       - SEGMENT_BETA_WRITE_KEY
diff --git a/test/e2e/tests/multichain/asset-picker-send.spec.ts b/test/e2e/tests/multichain/asset-picker-send.spec.ts
index 9740cd1c9878..8358e8242f69 100644
--- a/test/e2e/tests/multichain/asset-picker-send.spec.ts
+++ b/test/e2e/tests/multichain/asset-picker-send.spec.ts
@@ -11,7 +11,7 @@ import {
 import { Driver } from '../../webdriver/driver';
 import { RECIPIENT_ADDRESS_MOCK } from '../simulation-details/types';
 
-describe('AssetPickerSendFlow', function () {
+describe('AssetPickerSendFlow @no-mmi', function () {
   const chainId = CHAIN_IDS.MAINNET;
 
   const fixtures = {
diff --git a/ui/pages/confirmations/confirmation/templates/index.js b/ui/pages/confirmations/confirmation/templates/index.js
index e5069d3d3e15..c1c7eb9ddd48 100644
--- a/ui/pages/confirmations/confirmation/templates/index.js
+++ b/ui/pages/confirmations/confirmation/templates/index.js
@@ -27,6 +27,13 @@ import snapAlert from './snaps/snap-alert/snap-alert';
 import snapConfirmation from './snaps/snap-confirmation/snap-confirmation';
 import snapPrompt from './snaps/snap-prompt/snap-prompt';
 
+/**
+ * Approval templates that will be prioritized ahead of transaction and signature confirmations.
+ */
+export const PRIORITY_APPROVAL_TEMPLATE_TYPES = [
+  SMART_TRANSACTION_CONFIRMATION_TYPES.showSmartTransactionStatusPage,
+];
+
 const APPROVAL_TEMPLATES = {
   [ApprovalType.AddEthereumChain]: addEthereumChain,
   [ApprovalType.SwitchEthereumChain]: switchEthereumChain,
diff --git a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
index 5504aed9039f..d52e66f77aa8 100644
--- a/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
+++ b/ui/pages/confirmations/hooks/alerts/transactions/useSigningOrSubmittingAlerts.test.ts
@@ -77,7 +77,7 @@ describe('useSigningOrSubmittingAlerts', () => {
     ).toEqual([]);
   });
 
-  it('returns no alerts if transaction on different chain', () => {
+  it('returns alerts if transaction on different chain', () => {
     expect(
       runHook({
         currentConfirmation: CONFIRMATION_MOCK,
@@ -89,7 +89,7 @@ describe('useSigningOrSubmittingAlerts', () => {
           },
         ],
       }),
-    ).toEqual([]);
+    ).toEqual([EXPECTED_ALERT]);
   });
 
   it('returns no alerts if transaction has alternate status', () => {

From 95f9248cd5c092d6225c046868b8441edce0e8b8 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Wed, 14 Aug 2024 21:56:49 +0000
Subject: [PATCH 179/236] Update Attributions

---
 attribution.txt | 469 ------------------------------------------------
 1 file changed, 469 deletions(-)

diff --git a/attribution.txt b/attribution.txt
index 00985b585d23..820ffd0021e7 100644
--- a/attribution.txt
+++ b/attribution.txt
@@ -535,33 +535,6 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 
 
-******************************
-
-asynckit
-0.4.0 <https://github.com/alexindigo/asynckit>
-The MIT License (MIT)
-
-Copyright (c) 2016 Alex Indigo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ******************************
 
 async-mutex
@@ -697,19 +670,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-axios
-1.6.8 <https://github.com/axios/axios>
-# Copyright (c) 2014-present Matt Zabriskie & Collaborators
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 ******************************
 
 b4a
@@ -4504,31 +4464,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 
-******************************
-
-combined-stream
-1.0.8 <https://github.com/felixge/node-combined-stream>
-Copyright (c) 2011 Debuggable Limited <felix@debuggable.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
 ******************************
 
 commander
@@ -4673,60 +4608,6 @@ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-******************************
-
-contentful
-10.8.7 <https://github.com/contentful/contentful.js>
-The MIT License (MIT)
-
-Copyright (c) 2016 Contentful
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-******************************
-
-contentful-resolve-response
-1.8.1 <https://github.com/contentful/contentful-resolve-response>
-MIT License
-
-Copyright (c) 2018 Contentful
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ******************************
 
 @contentful/rich-text-html-renderer
@@ -4781,33 +4662,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-contentful-sdk-core
-8.1.2 <https://github.com/contentful/contentful-sdk-core>
-The MIT License (MIT)
-
-Copyright (c) 2016 Contentful
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ******************************
 
 convert-source-map
@@ -5457,31 +5311,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-delayed-stream
-1.0.0 <https://github.com/felixge/node-delayed-stream>
-Copyright (c) 2011 Debuggable Limited <felix@debuggable.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
 ******************************
 
 delimit-stream
@@ -11367,33 +11196,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-fast-copy
-2.1.7 <https://github.com/planttheidea/fast-copy>
-MIT License
-
-Copyright (c) 2018 Tony Quetano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 ******************************
 
 fast-deep-equal
@@ -12035,30 +11837,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-******************************
-
-follow-redirects
-1.15.6 <https://github.com/follow-redirects/follow-redirects>
-Copyright 2014–present Olivier Lalonde <olalonde@gmail.com>, James Talmage <james@talmage.io>, Ruben Verborgh
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 ******************************
 
 for-each
@@ -12108,31 +11886,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-******************************
-
-form-data
-4.0.0 <https://github.com/form-data/form-data>
-Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-
 ******************************
 
 @fortawesome/fontawesome-free
@@ -17245,87 +16998,6 @@ licenses; we recommend you read them, as their terms may differ from the
 terms above.
 
 
-******************************
-
-lodash.isplainobject
-4.0.6 <https://github.com/lodash/lodash>
-Copyright jQuery Foundation and other contributors <https://jquery.org/>
-
-Based on Underscore.js, copyright Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/lodash/lodash
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-Copyright and related rights for sample code are waived via CC0. Sample
-code is defined as all source code displayed within the prose of the
-documentation.
-
-CC0: http://creativecommons.org/publicdomain/zero/1.0/
-
-====
-
-Files located in the node_modules and vendor directories are externally
-maintained libraries used by this software which have their own
-licenses; we recommend you read them, as their terms may differ from the
-terms above.
-
-
-******************************
-
-lodash.isstring
-4.0.1 <https://github.com/lodash/lodash>
-Copyright 2012-2016 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js, copyright 2009-2016 Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 ******************************
 
 loglevel
@@ -21189,64 +20861,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-mime-db
-1.52.0 <https://github.com/jshttp/mime-db>
-(The MIT License)
-
-Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
-Copyright (c) 2015-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-******************************
-
-mime-types
-2.1.35 <https://github.com/jshttp/mime-types>
-(The MIT License)
-
-Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
-Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 ******************************
 
 mini-create-react-context
@@ -23573,47 +23187,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-******************************
-
-proxy-from-env
-1.1.0 <https://github.com/Rob--W/proxy-from-env>
-The MIT License
-
-Copyright (C) 2016-2018 Rob Wu <rob@robwu.nl>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-******************************
-
-p-throttle
-4.1.1 <https://github.com/sindresorhus/p-throttle>
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 ******************************
 
 punycode
@@ -23724,41 +23297,6 @@ This product bundles QR Code Generator, which is available under a
 "MIT" license. For details, see src/third-party/qrcodegen.
 
 
-******************************
-
-qs
-6.11.2 <https://github.com/ljharb/qs>
-BSD 3-Clause License
-
-Copyright (c) 2014, Nathan LaFreniere and other [contributors](https://github.com/ljharb/qs/graphs/contributors)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 ******************************
 
 queue-tick
@@ -29137,13 +28675,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-******************************
-
-type-fest
-4.15.0 <https://github.com/sindresorhus/type-fest>
-license: (MIT OR CC0-1.0)
-authors: Sindre Sorhus <sindresorhus@gmail.com>
-
 ******************************
 
 typeforce

From dcb420e812cd764b60b27312e7218ddd00e61feb Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 14 Aug 2024 21:20:03 -0230
Subject: [PATCH 180/236] fix: Delete invalid `SelectedNetworkController` state
 (#26428) (#26432)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-pick of #26428 for v12.0.4. Original description:

## **Description**

The `SelectedNetworkController` state is cleared if any invalid
`networkConfigurationId`s are found in state. We are seeing reports of
this happening in production in v12.0.1.

The suspected cause is `NetworkController` state corruption. We resolved
a few cases of this in v12.0.1, but for users that were affected by
this, the invalid IDs may have propogated to the
`SelectedNetworkController` state already. That is what this migration
intends to fix.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26428?quickstart=1)

## **Related issues**

Fixes #26309

## **Manual testing steps**

We don't have clear reproduction steps for the bug itself. To
artificially reproduce the scenario by changing extension state, this
should work:

* Create a dev build from v12.0.2
* Install the dev build from the `dist/chrome` directory and proceed
through onboarding
* Visit the test dapp, refresh, and connect to it.
* Run this command in the background console:
``` chrome.storage.local.get( null, (state) => {

state.data.SelectedNetworkController.domains['https://metamask.github.io'] = '123';
      chrome.storage.local.set(state, () => chrome.runtime.reload());
    }
  );
  ```
  * The linked error should now appear in the console of the popup
* Disable the extension
* Switch to this branch and create a dev build
* Enable and reload the extension
  * The error should no longer appear.

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension 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/migrations/120.5.test.ts | 255 +++++++++++++++++++++++++++
 app/scripts/migrations/120.5.ts      | 126 +++++++++++++
 2 files changed, 381 insertions(+)
 create mode 100644 app/scripts/migrations/120.5.test.ts
 create mode 100644 app/scripts/migrations/120.5.ts

diff --git a/app/scripts/migrations/120.5.test.ts b/app/scripts/migrations/120.5.test.ts
new file mode 100644
index 000000000000..1b19e5e66e95
--- /dev/null
+++ b/app/scripts/migrations/120.5.test.ts
@@ -0,0 +1,255 @@
+import { cloneDeep } from 'lodash';
+import { migrate, version } from './120.5';
+
+const oldVersion = 120.4;
+
+describe('migration #120.5', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('updates the version metadata', async () => {
+    const oldStorage = {
+      meta: { version: oldVersion },
+      data: {},
+    };
+
+    const newStorage = await migrate(cloneDeep(oldStorage));
+
+    expect(newStorage.meta).toStrictEqual({ version });
+  });
+
+  it('does nothing if SelectedNetworkController state is not set', async () => {
+    const oldState = {
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('deletes the SelectedNetworkController state if it is corrupted', async () => {
+    const oldState = {
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+      SelectedNetworkController: 'invalid',
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+    });
+  });
+
+  it('deletes the SelectedNetworkController state if it is missing the domains state', async () => {
+    const oldState = {
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+      SelectedNetworkController: {
+        somethingElse: {},
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+    });
+  });
+
+  it('deletes the SelectedNetworkController state if the domains state is corrupted', async () => {
+    const oldState = {
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+      SelectedNetworkController: {
+        domains: 'invalid',
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+    });
+  });
+
+  it('deletes the SelectedNetworkController state if NetworkController state is missing', async () => {
+    const oldState = {
+      SelectedNetworkController: {
+        domains: {},
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({});
+  });
+
+  it('deletes the SelectedNetworkController state if NetworkController state is corrupted', async () => {
+    const oldState = {
+      NetworkController: 'invalid',
+      SelectedNetworkController: {
+        domains: {},
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: 'invalid',
+    });
+  });
+
+  it('deletes the SelectedNetworkController state if NetworkController has no networkConfigurations', async () => {
+    const oldState = {
+      NetworkController: {},
+      SelectedNetworkController: {
+        domains: {},
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: {},
+    });
+  });
+
+  it('deletes the SelectedNetworkController state if NetworkController networkConfigurations state is corrupted', async () => {
+    const oldState = {
+      NetworkController: { networkConfigurations: 'invalid' },
+      SelectedNetworkController: {
+        domains: {},
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: { networkConfigurations: 'invalid' },
+    });
+  });
+
+  it('does nothing if SelectedNetworkController domains state is empty', async () => {
+    const oldState = {
+      NetworkController: { networkConfigurations: {} },
+      SelectedNetworkController: {
+        domains: {},
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('does nothing if SelectedNetworkController domains state is valid', async () => {
+    const oldState = {
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+      SelectedNetworkController: {
+        domains: {
+          'example1.test': '123',
+          'example2.test': 'mainnet',
+          'example3.test': 'goerli',
+          'example4.test': 'sepolia',
+          'example5.test': 'linea-goerli',
+          'example6.test': 'linea-sepolia',
+          'example7.test': 'linea-mainnet',
+        },
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual(oldState);
+  });
+
+  it('deletes the SelectedNetworkController state if an invalid networkConfigurationId is found', async () => {
+    const oldState = {
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+      SelectedNetworkController: {
+        domains: {
+          'domain.test': '456',
+        },
+      },
+    };
+
+    const transformedState = await migrate({
+      meta: { version: oldVersion },
+      data: cloneDeep(oldState),
+    });
+
+    expect(transformedState.data).toEqual({
+      NetworkController: {
+        networkConfigurations: {
+          123: {},
+        },
+      },
+    });
+  });
+});
diff --git a/app/scripts/migrations/120.5.ts b/app/scripts/migrations/120.5.ts
new file mode 100644
index 000000000000..11d1fba86664
--- /dev/null
+++ b/app/scripts/migrations/120.5.ts
@@ -0,0 +1,126 @@
+import { hasProperty, isObject } from '@metamask/utils';
+import { cloneDeep } from 'lodash';
+
+type VersionedData = {
+  meta: { version: number };
+  data: Record<string, unknown>;
+};
+
+export const version = 120.5;
+
+/**
+ * This migration removes invalid network configuration IDs from the SelectedNetworkController.
+ *
+ * @param originalVersionedData - Versioned MetaMask extension state, exactly
+ * what we persist to dist.
+ * @param originalVersionedData.meta - State metadata.
+ * @param originalVersionedData.meta.version - The current state version.
+ * @param originalVersionedData.data - The persisted MetaMask state, keyed by
+ * controller.
+ * @returns Updated versioned MetaMask extension state.
+ */
+export async function migrate(
+  originalVersionedData: VersionedData,
+): Promise<VersionedData> {
+  const versionedData = cloneDeep(originalVersionedData);
+  versionedData.meta.version = version;
+  transformState(versionedData.data);
+  return versionedData;
+}
+
+/**
+ * A list of InfuraNetworkType values from extension v12.0.1
+ * This version of the extension uses `@metamask/network-controller@18.1.2`, which in turn uses
+ * the types from `@metamask/controller-utils@9.1.0`
+ *
+ * See https://github.com/MetaMask/core/blob/34542cf6e808f294fd83c7c5f70d1bc7418f8a9e/packages/controller-utils/src/types.ts#L4
+ *
+ * Hard-coded here rather than imported so that this migration continues to work correctly as these
+ * constants get updated in the future.
+ */
+const infuraNetworkTypes = [
+  'mainnet',
+  'goerli',
+  'sepolia',
+  'linea-goerli',
+  'linea-sepolia',
+  'linea-mainnet',
+];
+
+/**
+ * Remove invalid network configuration IDs from the SelectedNetworkController.
+ *
+ * @param state - The persisted MetaMask state, keyed by controller.
+ */
+function transformState(state: Record<string, unknown>): void {
+  if (!hasProperty(state, 'SelectedNetworkController')) {
+    return;
+  }
+  if (!isObject(state.SelectedNetworkController)) {
+    console.error(
+      `Migration ${version}: Invalid SelectedNetworkController state of type '${typeof state.SelectedNetworkController}'`,
+    );
+    delete state.SelectedNetworkController;
+    return;
+  } else if (!hasProperty(state.SelectedNetworkController, 'domains')) {
+    console.error(
+      `Migration ${version}: Missing SelectedNetworkController domains state`,
+    );
+    delete state.SelectedNetworkController;
+    return;
+  } else if (!isObject(state.SelectedNetworkController.domains)) {
+    console.error(
+      `Migration ${version}: Invalid SelectedNetworkController domains state of type '${typeof state
+        .SelectedNetworkController.domains}'`,
+    );
+    delete state.SelectedNetworkController;
+    return;
+  }
+
+  if (!hasProperty(state, 'NetworkController')) {
+    delete state.SelectedNetworkController;
+    return;
+  } else if (!isObject(state.NetworkController)) {
+    console.error(
+      new Error(
+        `Migration ${version}: Invalid NetworkController state of type '${typeof state.NetworkController}'`,
+      ),
+    );
+    delete state.SelectedNetworkController;
+    return;
+  } else if (!hasProperty(state.NetworkController, 'networkConfigurations')) {
+    delete state.SelectedNetworkController;
+    return;
+  } else if (!isObject(state.NetworkController.networkConfigurations)) {
+    console.error(
+      new Error(
+        `Migration ${version}: Invalid NetworkController networkConfigurations state of type '${typeof state.NetworkController}'`,
+      ),
+    );
+    delete state.SelectedNetworkController;
+    return;
+  }
+
+  const validNetworkConfigurationIds = [
+    ...infuraNetworkTypes,
+    ...Object.keys(state.NetworkController.networkConfigurations),
+  ];
+  const domainMappedNetworkConfigurationIds = Object.values(
+    state.SelectedNetworkController.domains,
+  );
+
+  for (const configurationId of domainMappedNetworkConfigurationIds) {
+    if (
+      typeof configurationId !== 'string' ||
+      !validNetworkConfigurationIds.includes(configurationId)
+    ) {
+      console.error(
+        new Error(
+          `Migration ${version}: Invalid networkConfigurationId found in SelectedNetworkController state: '${configurationId}'`,
+        ),
+      );
+      delete state.SelectedNetworkController;
+      return;
+    }
+  }
+}

From 9f9948f4ba18b34c6940b8814f4807dbd3b7bb42 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 15 Aug 2024 01:17:38 -0230
Subject: [PATCH 181/236] Update changelog for v12.0.4

---
 CHANGELOG.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86c1b56782e9..fe151fbcca5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.4]
-### Uncategorized
-- Version v12.0.3 RC ([#26416](https://github.com/MetaMask/metamask-extension/pull/26416))
-- fix: V12.0.3/cherry pick notifications events ([#26419](https://github.com/MetaMask/metamask-extension/pull/26419))
-- fix: notifications use better events ([#26410](https://github.com/MetaMask/metamask-extension/pull/26410))
-- refactor: fix event names used to track notifications ([#25521](https://github.com/MetaMask/metamask-extension/pull/25521))
-- Version v12.0.3
+### Fixed
+- Further prevented data persistence errors related to networks ([#26432](https://github.com/MetaMask/metamask-extension/pull/26432))
 
 ## [12.0.3]
 

From 188dece4d97b5b59466e99dc7d79115f7ab57108 Mon Sep 17 00:00:00 2001
From: Monte Lai <monte.lai@consensys.net>
Date: Thu, 15 Aug 2024 21:46:19 +0800
Subject: [PATCH 182/236] fix: Cherrypick f3383ac to Version v12.1 (#26285)
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 pr cherry picks f3383ac to RC 12.1

<!--
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/26285?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Charly Chevalier <charly.chevalier@consensys.net>
Co-authored-by: Daniel Rocha <daniel.rocha@consensys.net>
---
 .../tests/settings/account-token-list.spec.js | 12 +++++-
 .../account-list-item.test.js.snap            |  6 +--
 .../account-list-item/account-list-item.js    | 28 ++++++-------
 .../account-list-item.test.js                 | 20 +++++++--
 .../__snapshots__/connections.test.tsx.snap   |  6 +--
 .../send/__snapshots__/send.test.js.snap      |  8 ++--
 .../__snapshots__/your-accounts.test.tsx.snap | 36 ++++++++--------
 .../multichain/pages/send/send.test.js        |  4 ++
 .../remove-snap-account.test.js.snap          | 10 +++--
 .../templates/remove-snap-account.test.js     |  1 +
 .../advanced-tab.component.test.js.snap       |  2 +-
 .../advanced-tab/advanced-tab.component.js    |  1 +
 .../advanced-tab.component.test.js            | 13 ++++++
 ui/selectors/multichain.test.ts               | 41 ++++++++++++++++++-
 ui/selectors/multichain.ts                    | 36 +++++++++++++---
 15 files changed, 166 insertions(+), 58 deletions(-)

diff --git a/test/e2e/tests/settings/account-token-list.spec.js b/test/e2e/tests/settings/account-token-list.spec.js
index 86028d37bf0a..921cacae9e3a 100644
--- a/test/e2e/tests/settings/account-token-list.spec.js
+++ b/test/e2e/tests/settings/account-token-list.spec.js
@@ -57,6 +57,16 @@ describe('Settings', function () {
           tag: 'div',
         });
         await driver.clickElement({ text: 'Fiat', tag: 'label' });
+        // We now need to enable "Show fiat on testnet" if we are using testnets (and since our custom
+        // network during test is using a testnet chain ID, it will be considered as a test network)
+        await driver.clickElement({
+          text: 'Advanced',
+          tag: 'div',
+        });
+        await driver.clickElement('.show-fiat-on-testnets-toggle');
+        // Looks like when enabling the "Show fiat on testnet" it takes some time to re-update the
+        // overview screen, so just wait a bit here:
+        await driver.delay(1000);
 
         await driver.clickElement(
           '.settings-page__header__title-container__close-button',
@@ -68,7 +78,7 @@ describe('Settings', function () {
         const tokenListAmount = await driver.findElement(
           '.eth-overview__primary-container',
         );
-        assert.equal(await tokenListAmount.getText(), '25\nETH');
+        assert.equal(await tokenListAmount.getText(), '$42,500.00\nUSD');
         await driver.clickElement('[data-testid="account-menu-icon"]');
         const accountTokenValue = await driver.waitForSelector(
           '.multichain-account-list-item .multichain-account-list-item__asset',
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 ae53a1353084..c14fb8a0c42d 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
@@ -534,17 +534,17 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
             <div
               class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
               data-testid="first-currency-display"
-              title="$880.18 USD"
+              title="0.006 ETH"
             >
               <span
                 class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
               >
-                $880.18
+                0.006
               </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
+                ETH
               </span>
             </div>
           </div>
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 2b48bcb79baf..49d78fed8af4 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -51,12 +51,13 @@ import {
   getUseBlockie,
 } from '../../../selectors';
 import {
+  getMultichainIsTestnet,
   getMultichainNativeCurrency,
   getMultichainNativeCurrencyImage,
   getMultichainNetwork,
+  getMultichainShouldShowFiat,
 } from '../../../selectors/multichain';
 import { useMultichainAccountTotalFiatBalance } from '../../../hooks/useMultichainAccountTotalFiatBalance';
-import { TEST_NETWORKS } from '../../../../shared/constants/network';
 import { ConnectedStatus } from '../connected-status/connected-status';
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
 import { getCustodianIconForAddress } from '../../../selectors/institutional/selectors';
@@ -90,17 +91,19 @@ export const AccountListItem = ({
     useState();
 
   const useBlockie = useSelector(getUseBlockie);
-  const { network: currentNetwork, isEvmNetwork } = useMultichainSelector(
-    getMultichainNetwork,
-    account,
-  );
+  const { isEvmNetwork } = useMultichainSelector(getMultichainNetwork, account);
   const setAccountListItemMenuRef = (ref) => {
     setAccountListItemMenuElement(ref);
   };
+  const isTestnet = useMultichainSelector(getMultichainIsTestnet, account);
+  const isMainnet = !isTestnet;
+  const shouldShowFiat = useMultichainSelector(
+    getMultichainShouldShowFiat,
+    account,
+  );
   const showFiatInTestnets = useSelector(getShowFiatInTestnets);
   const showFiat =
-    !isEvmNetwork ||
-    (TEST_NETWORKS.includes(currentNetwork?.nickname) && !showFiatInTestnets);
+    shouldShowFiat && (isMainnet || (isTestnet && showFiatInTestnets));
   const accountTotalFiatBalances =
     useMultichainAccountTotalFiatBalance(account);
   const mappedOrderedTokenList = accountTotalFiatBalances.orderedTokenList.map(
@@ -108,12 +111,9 @@ export const AccountListItem = ({
       avatarValue: item.iconUrl,
     }),
   );
-  let balanceToTranslate = isEvmNetwork
-    ? accountTotalFiatBalances.totalWeiBalance
+  const balanceToTranslate = isEvmNetwork
+    ? account.balance
     : accountTotalFiatBalances.totalBalance;
-  if (showFiat && isEvmNetwork) {
-    balanceToTranslate = account.balance;
-  }
 
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   const custodianIcon = useSelector((state) =>
@@ -307,9 +307,7 @@ export const AccountListItem = ({
                 ethNumberOfDecimals={MAXIMUM_CURRENCY_DECIMALS}
                 value={balanceToTranslate}
                 type={PRIMARY}
-                showFiat={
-                  !showFiat || !TEST_NETWORKS.includes(currentNetwork?.nickname)
-                }
+                showFiat={showFiat}
                 data-testid="first-currency-display"
               />
             </Text>
diff --git a/ui/components/multichain/account-list-item/account-list-item.test.js b/ui/components/multichain/account-list-item/account-list-item.test.js
index b8ae5573bf5f..7bfbbd76d97c 100644
--- a/ui/components/multichain/account-list-item/account-list-item.test.js
+++ b/ui/components/multichain/account-list-item/account-list-item.test.js
@@ -210,6 +210,9 @@ describe('AccountListItem', () => {
                 chainId: CHAIN_IDS.SEPOLIA,
                 nickname: SEPOLIA_DISPLAY_NAME,
               },
+              preferences: {
+                showFiatInTestnets: false,
+              },
             },
           },
         );
@@ -263,7 +266,7 @@ describe('AccountListItem', () => {
           '[data-testid="avatar-group"]',
         );
 
-        const expectedBalance = '$0.00';
+        const expectedBalance = '$3.31';
 
         expect(firstCurrencyDisplay).toBeInTheDocument();
         expect(firstCurrencyDisplay.firstChild.textContent).toContain(
@@ -275,9 +278,18 @@ describe('AccountListItem', () => {
       });
 
       it('renders fiat for non-EVM account', () => {
-        const { container } = render({
-          account: mockNonEvmAccount,
-        });
+        const { container } = render(
+          {
+            account: mockNonEvmAccount,
+          },
+          {
+            metamask: {
+              preferences: {
+                showFiatInTestnets: true,
+              },
+            },
+          },
+        );
 
         const firstCurrencyDisplay = container.querySelector(
           '[data-testid="first-currency-display"]',
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 606b996229c9..afd02098086f 100644
--- a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
+++ b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
@@ -293,17 +293,17 @@ exports[`Connections Content should render correctly 1`] = `
                     <div
                       class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                       data-testid="first-currency-display"
-                      title="$880.18 USD"
+                      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"
                       >
-                        $880.18
+                        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"
                       >
-                        USD
+                        ETH
                       </span>
                     </div>
                   </div>
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 a3ee231d6ae2..4f7970ecf999 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -467,11 +467,13 @@ exports[`SendPage render and initialization should render correctly even when a
                             <div
                               class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                               data-testid="first-currency-display"
-                              title="null USD"
+                              title="$0.00 USD"
                             >
                               <span
                                 class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-                              />
+                              >
+                                $0.00
+                              </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"
                               >
@@ -500,7 +502,7 @@ exports[`SendPage render and initialization should render correctly even when a
                           <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"
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 901e7def9c2c..84f6308dff97 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
@@ -241,17 +241,17 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
               <div
                 class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                 data-testid="first-currency-display"
-                title="$880.18 USD"
+                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"
                 >
-                  $880.18
+                  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"
                 >
-                  USD
+                  ETH
                 </span>
               </div>
             </div>
@@ -538,17 +538,17 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
               <div
                 class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                 data-testid="first-currency-display"
-                title="$0.00 USD"
+                title="0 ETH"
               >
                 <span
                   class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
                 >
-                  $0.00
+                  0
                 </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
+                  ETH
                 </span>
               </div>
             </div>
@@ -835,17 +835,17 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
               <div
                 class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                 data-testid="first-currency-display"
-                title="$0.00 USD"
+                title="0 ETH"
               >
                 <span
                   class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
                 >
-                  $0.00
+                  0
                 </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
+                  ETH
                 </span>
               </div>
             </div>
@@ -1141,17 +1141,17 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
               <div
                 class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                 data-testid="first-currency-display"
-                title="$0.00 USD"
+                title="0 ETH"
               >
                 <span
                   class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
                 >
-                  $0.00
+                  0
                 </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
+                  ETH
                 </span>
               </div>
             </div>
@@ -1438,17 +1438,17 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
               <div
                 class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                 data-testid="first-currency-display"
-                title="$0.00 USD"
+                title="0 ETH"
               >
                 <span
                   class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
                 >
-                  $0.00
+                  0
                 </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
+                  ETH
                 </span>
               </div>
             </div>
@@ -1748,17 +1748,17 @@ exports[`SendPageYourAccounts render renders correctly 1`] = `
               <div
                 class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                 data-testid="first-currency-display"
-                title="$0.00 USD"
+                title="0 ETH"
               >
                 <span
                   class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
                 >
-                  $0.00
+                  0
                 </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
+                  ETH
                 </span>
               </div>
             </div>
diff --git a/ui/components/multichain/pages/send/send.test.js b/ui/components/multichain/pages/send/send.test.js
index 095525c54851..4b23ac89e2cb 100644
--- a/ui/components/multichain/pages/send/send.test.js
+++ b/ui/components/multichain/pages/send/send.test.js
@@ -181,6 +181,7 @@ const baseStore = {
     providerConfig: {
       chainId: CHAIN_IDS.GOERLI,
       nickname: GOERLI_DISPLAY_NAME,
+      ticker: 'ETH',
     },
     nativeCurrency: 'ETH',
     featureFlags: {
@@ -215,6 +216,8 @@ const baseStore = {
       },
     },
     completedOnboarding: true,
+    useCurrencyRateCheck: true,
+    ticker: 'ETH',
   },
   activeTab: {
     origin: 'https://uniswap.org/',
@@ -379,6 +382,7 @@ describe('SendPage', () => {
             chainId: CHAIN_IDS.GOERLI,
             nickname: GOERLI_DISPLAY_NAME,
             type: NETWORK_TYPES.GOERLI,
+            ticker: 'ETH',
           },
         },
       };
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
index e0305e1c6533..8f3bd9a984dc 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
@@ -339,15 +339,17 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
                           <div
                             class="mm-box currency-display-component mm-box--display-flex mm-box--flex-wrap-wrap mm-box--align-items-center"
                             data-testid="first-currency-display"
-                            title="null USD"
+                            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"
                             >
-                              USD
+                              ETH
                             </span>
                           </div>
                         </div>
@@ -372,7 +374,7 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
                         <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"
diff --git a/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js b/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js
index 5b108e79b29a..70bb8178cdad 100644
--- a/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js
+++ b/ui/pages/confirmations/confirmation/templates/remove-snap-account.test.js
@@ -17,6 +17,7 @@ const mockPublicAddress = '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc';
 const providerConfig = {
   chainId: '0x5',
   nickname: '',
+  ticker: 'ETH',
 };
 const mockApproval = {
   id: mockApprovalId,
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 52b0c314dd58..0e5d97d1770f 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
@@ -231,7 +231,7 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         class="settings-page__content-item-col"
       >
         <label
-          class="toggle-button toggle-button--off"
+          class="toggle-button toggle-button--off show-fiat-on-testnets-toggle"
           tabindex="0"
         >
           <div
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index d1a9e83710ec..9707115662fc 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -360,6 +360,7 @@ export default class AdvancedTab extends PureComponent {
             }
             offLabel={t('off')}
             onLabel={t('on')}
+            className="show-fiat-on-testnets-toggle"
           />
         </div>
       </Box>
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 ccb194fbd984..a75e1920e612 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -8,12 +8,15 @@ import AdvancedTab from '.';
 
 const mockSetAutoLockTimeLimit = jest.fn().mockReturnValue({ type: 'TYPE' });
 const mockSetShowTestNetworks = jest.fn();
+const mockSetShowFiatConversionOnTestnetsPreference = jest.fn();
 const mockSetStxOptIn = jest.fn();
 
 jest.mock('../../../store/actions.ts', () => {
   return {
     setAutoLockTimeLimit: (...args) => mockSetAutoLockTimeLimit(...args),
     setShowTestNetworks: () => mockSetShowTestNetworks,
+    setShowFiatConversionOnTestnetsPreference: () =>
+      mockSetShowFiatConversionOnTestnetsPreference,
     setSmartTransactionsOptInStatus: () => mockSetStxOptIn,
   };
 });
@@ -74,6 +77,16 @@ describe('AdvancedTab Component', () => {
     expect(mockSetAutoLockTimeLimit).toHaveBeenCalledWith(0);
   });
 
+  it('should toggle show fiat on test networks', () => {
+    const { queryAllByRole } = renderWithProvider(<AdvancedTab />, mockStore);
+
+    const testShowFiatOnTestnets = queryAllByRole('checkbox')[2];
+
+    fireEvent.click(testShowFiatOnTestnets);
+
+    expect(mockSetShowFiatConversionOnTestnetsPreference).toHaveBeenCalled();
+  });
+
   it('should toggle show test networks', () => {
     const { queryAllByRole } = renderWithProvider(<AdvancedTab />, mockStore);
 
diff --git a/ui/selectors/multichain.test.ts b/ui/selectors/multichain.test.ts
index fadbfe08a08a..cbdaf3f627e2 100644
--- a/ui/selectors/multichain.test.ts
+++ b/ui/selectors/multichain.test.ts
@@ -12,7 +12,7 @@ import {
   MOCK_ACCOUNT_BIP122_P2WPKH,
   MOCK_ACCOUNT_BIP122_P2WPKH_TESTNET,
 } from '../../test/data/mock-accounts';
-import { CHAIN_IDS } from '../../shared/constants/network';
+import { CHAIN_IDS, TEST_NETWORK_IDS } from '../../shared/constants/network';
 import { MultichainNativeAssets } from '../../shared/constants/multichain/assets';
 import { AccountsState } from './accounts';
 import {
@@ -28,6 +28,7 @@ import {
   getMultichainProviderConfig,
   getMultichainSelectedAccountCachedBalance,
   getMultichainShouldShowFiat,
+  getMultichainIsTestnet,
 } from './multichain';
 import {
   getCurrentCurrency,
@@ -330,6 +331,44 @@ describe('Multichain Selectors', () => {
     );
   });
 
+  describe('getMultichainIsTestnet', () => {
+    it('returns false if account is EVM (mainnet)', () => {
+      const state = getEvmState();
+
+      expect(getMultichainIsTestnet(state)).toBe(false);
+    });
+
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each(TEST_NETWORK_IDS)(
+      'returns true if account is EVM (testnet): %s',
+      (chainId: string) => {
+        const state = getEvmState();
+
+        state.metamask.providerConfig.chainId = chainId;
+        expect(getMultichainIsTestnet(state)).toBe(true);
+      },
+    );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each([
+      { isTestnet: false, account: MOCK_ACCOUNT_BIP122_P2WPKH },
+      { isTestnet: true, account: MOCK_ACCOUNT_BIP122_P2WPKH_TESTNET },
+    ])(
+      'returns $isTestnet if non-EVM account address "$account.address" is compatible with mainnet',
+      ({
+        isTestnet,
+        account,
+      }: {
+        isTestnet: boolean;
+        account: InternalAccount;
+      }) => {
+        const state = getNonEvmState(account);
+
+        expect(getMultichainIsTestnet(state)).toBe(isTestnet);
+      },
+    );
+  });
+
   describe('getMultichainSelectedAccountCachedBalance', () => {
     it('returns cached balance if account is EVM', () => {
       const state = getEvmState();
diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
index eba3987a21db..ba2af4e3b3ac 100644
--- a/ui/selectors/multichain.ts
+++ b/ui/selectors/multichain.ts
@@ -16,6 +16,7 @@ import {
 } from '../ducks/metamask/metamask';
 import { BalancesControllerState } from '../../app/scripts/lib/accounts/BalancesController';
 import { MultichainNativeAssets } from '../../shared/constants/multichain/assets';
+import { TEST_NETWORK_IDS } from '../../shared/constants/network';
 import { AccountsState } from './accounts';
 import {
   getAllNetworks,
@@ -27,6 +28,7 @@ import {
   getSelectedAccountCachedBalance,
   getSelectedInternalAccount,
   getShouldShowFiat,
+  getShowFiatInTestnets,
 } from '.';
 
 export type RatesState = {
@@ -102,7 +104,6 @@ export function getMultichainNetwork(
     // TODO: Adapt this for other non-EVM networks
     nickname: nonEvmNetwork.nickname,
     isEvmNetwork: false,
-    // FIXME: We should use CAIP-2 chain ID here, and not only the reference part
     chainId: nonEvmNetwork?.chainId,
     network: nonEvmNetwork,
   };
@@ -199,10 +200,13 @@ export function getMultichainShouldShowFiat(
   state: MultichainState,
   account?: InternalAccount,
 ) {
-  return getMultichainIsEvm(state, account)
+  const selectedAccount = account ?? getSelectedInternalAccount(state);
+  const isTestnet = getMultichainIsTestnet(state, selectedAccount);
+  const isMainnet = !isTestnet;
+
+  return getMultichainIsEvm(state, selectedAccount)
     ? getShouldShowFiat(state)
-    : // For now we force this for non-EVM
-      true;
+    : isMainnet || (isTestnet && getShowFiatInTestnets(state));
 }
 
 export function getMultichainDefaultToken(
@@ -228,13 +232,35 @@ export function getMultichainIsMainnet(
 ) {
   const selectedAccount = account ?? getSelectedInternalAccount(state);
   const providerConfig = getMultichainProviderConfig(state, selectedAccount);
-  return getMultichainIsEvm(state)
+  return getMultichainIsEvm(state, account)
     ? getIsMainnet(state)
     : // TODO: For now we only check for bitcoin, but we will need to
       // update this for other non-EVM networks later!
       providerConfig.chainId === MultichainNetworks.BITCOIN;
 }
 
+export function getMultichainIsTestnet(
+  state: MultichainState,
+  account?: InternalAccount,
+) {
+  // NOTE: Since there are 2 different implementations for `IsTestnet` and `IsMainnet` we follow
+  // the same pattern here too!
+  const selectedAccount = account ?? getSelectedInternalAccount(state);
+  const providerConfig = getMultichainProviderConfig(state, selectedAccount);
+  return getMultichainIsEvm(state, account)
+    ? // FIXME: There are multiple ways of checking for an EVM test network, but
+      // current implementation differ between each other. So we do not use
+      // `getIsTestnet` here and uses the actual `TEST_NETWORK_IDS` which seems
+      // more up-to-date
+      (TEST_NETWORK_IDS as string[]).includes(
+        (providerConfig as ProviderConfig).chainId,
+      )
+    : // TODO: For now we only check for bitcoin, but we will need to
+      // update this for other non-EVM networks later!
+      (providerConfig as MultichainProviderConfig).chainId ===
+        MultichainNetworks.BITCOIN_TESTNET;
+}
+
 export function getMultichainBalances(
   state: MultichainState,
 ): BalancesState['metamask']['balances'] {

From 985862b4d3011f2b157bb1e9b9013acd41d2e8e4 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:45:18 +0000
Subject: [PATCH 183/236] Version v12.0.5

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe151fbcca5a..e77fd03cc293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.0.5]
+
 ## [12.0.4]
 ### Fixed
 - Further prevented data persistence errors related to networks ([#26432](https://github.com/MetaMask/metamask-extension/pull/26432))
@@ -4913,7 +4915,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...HEAD
+[12.0.5]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...v12.0.5
 [12.0.4]: https://github.com/MetaMask/metamask-extension/compare/v12.0.3...v12.0.4
 [12.0.3]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...v12.0.3
 [12.0.2]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...v12.0.2
diff --git a/package.json b/package.json
index f5c5deac9c74..3e775e08942c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.0.4",
+  "version": "12.0.5",
   "private": true,
   "repository": {
     "type": "git",

From e29f2cff539c9fb0d47e4fd20dcf55f6bd68644b Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Thu, 15 Aug 2024 17:27:41 -0700
Subject: [PATCH 184/236] fix (patch): erc20 token prices on non-ETH networks
 (#26450)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fixes an issue with erc20 token prices on networks where ETH is not the
native currency.

When the price API does not support the native currency (e.g. MATIC),
prices are fetched in ETH and an additional conversion hop is performed.
But the extension was using the raw value without this additional hop.

This PR patches the relevant parts of
https://github.com/MetaMask/core/pull/4364.

Because that change is already in 12.1.0, this patch will no longer be
needed in that version.

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

## **Related issues**


## **Manual testing steps**

1. Load a wallet on polygon with erc20 tokens
2. Verify fiat prices are correct


## **Screenshots/Recordings**

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

### **Before**

<img width="355" alt="Screenshot 2024-08-15 at 11 19 43 AM"
src="https://github.com/user-attachments/assets/f366027e-789e-44e9-99b8-b7a99f24c250">


### **After**

<img width="355" alt="Screenshot 2024-08-15 at 11 15 00 AM"
src="https://github.com/user-attachments/assets/59113748-3118-4fbb-bd6e-30c12b64b7fe">


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 ...-assets-controllers-patch-a3b39b55a6.patch | 52 +++++++++++++++++++
 package.json                                  |  2 +-
 yarn.lock                                     | 46 +++++++++++++++-
 3 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 .yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch

diff --git a/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch b/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch
new file mode 100644
index 000000000000..acb3b9586db1
--- /dev/null
+++ b/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch
@@ -0,0 +1,52 @@
+diff --git a/dist/chunk-6W5EQ3JQ.js b/dist/chunk-6W5EQ3JQ.js
+index 81c2d0d1e6a0ad6db8b361423774b9a843fb46f6..fa8a115bb9b392a958265fa8df8b5549636952ff 100644
+--- a/dist/chunk-6W5EQ3JQ.js
++++ b/dist/chunk-6W5EQ3JQ.js
+@@ -416,7 +416,7 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
+       ...acc,
+       [tokenAddress]: {
+         ...token,
+-        value: token.value ? token.value * fallbackCurrencyToNativeCurrencyConversionRate : void 0
++        price: token.price ? token.price * fallbackCurrencyToNativeCurrencyConversionRate : void 0
+       }
+     };
+     return acc;
+diff --git a/dist/chunk-NEXY7SE2.js b/dist/chunk-NEXY7SE2.js
+index 8c506d9d26d81eac470bb4d7b84a4396a1651a83..d1ec2d220491aa353340da4f12a5b40ddaa30afc 100644
+--- a/dist/chunk-NEXY7SE2.js
++++ b/dist/chunk-NEXY7SE2.js
+@@ -182,7 +182,7 @@ async function fetchTokenContractExchangeRates({
+     (obj, [tokenAddress, tokenPrice]) => {
+       return {
+         ...obj,
+-        [_controllerutils.toChecksumHexAddress.call(void 0, tokenAddress)]: tokenPrice?.value
++        [_controllerutils.toChecksumHexAddress.call(void 0, tokenAddress)]: tokenPrice?.price
+       };
+     },
+     {}
+diff --git a/dist/chunk-Q5JRBGWO.mjs b/dist/chunk-Q5JRBGWO.mjs
+index 6c2a61a7703d0b8ecac3561935443994badd451c..1bbe069ba07b9ab6c213a27988c68c5be6321589 100644
+--- a/dist/chunk-Q5JRBGWO.mjs
++++ b/dist/chunk-Q5JRBGWO.mjs
+@@ -182,7 +182,7 @@ async function fetchTokenContractExchangeRates({
+     (obj, [tokenAddress, tokenPrice]) => {
+       return {
+         ...obj,
+-        [toChecksumHexAddress(tokenAddress)]: tokenPrice?.value
++        [toChecksumHexAddress(tokenAddress)]: tokenPrice?.price
+       };
+     },
+     {}
+diff --git a/dist/chunk-X4FFNQHE.mjs b/dist/chunk-X4FFNQHE.mjs
+index f0264520818f7f715df4bb8c08fdc8c95baee999..74dae86c2a30a143684ed076867259e8b3d878c0 100644
+--- a/dist/chunk-X4FFNQHE.mjs
++++ b/dist/chunk-X4FFNQHE.mjs
+@@ -416,7 +416,7 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
+       ...acc,
+       [tokenAddress]: {
+         ...token,
+-        value: token.value ? token.value * fallbackCurrencyToNativeCurrencyConversionRate : void 0
++        price: token.price ? token.price * fallbackCurrencyToNativeCurrencyConversionRate : void 0
+       }
+     };
+     return acc;
diff --git a/package.json b/package.json
index 3e775e08942c..2b2dc1a3196a 100644
--- a/package.json
+++ b/package.json
@@ -297,7 +297,7 @@
     "@metamask/address-book-controller": "^4.0.1",
     "@metamask/announcement-controller": "^6.1.0",
     "@metamask/approval-controller": "^6.0.1",
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A30.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%3A%3Aversion=30.0.0&hash=9269c8#~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch",
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@patch%253A@metamask/assets-controllers@npm%25253A30.0.0%2523~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%253A%253Aversion=30.0.0&hash=9269c8%23~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch%3A%3Aversion=30.0.0&hash=1ba1a6#~/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch",
     "@metamask/base-controller": "^4.1.0",
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.5.0",
diff --git a/yarn.lock b/yarn.lock
index 8eb6ff293d65..bc6289734248 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4773,7 +4773,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A30.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%3A%3Aversion=30.0.0&hash=9269c8#~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch":
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A30.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%3A%3Aversion=30.0.0&hash=9269c8#~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch::version=30.0.0&hash=1ba1a6":
   version: 30.0.0
   resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A30.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%3A%3Aversion=30.0.0&hash=9269c8#~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch::version=30.0.0&hash=1ba1a6"
   dependencies:
@@ -4815,6 +4815,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@patch%253A@metamask/assets-controllers@npm%25253A30.0.0%2523~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%253A%253Aversion=30.0.0&hash=9269c8%23~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch%3A%3Aversion=30.0.0&hash=1ba1a6#~/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch":
+  version: 30.0.0
+  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@patch%253A@metamask/assets-controllers@npm%25253A30.0.0%2523~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%253A%253Aversion=30.0.0&hash=9269c8%23~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch%3A%3Aversion=30.0.0&hash=1ba1a6#~/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch::version=30.0.0&hash=ff3b19"
+  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:^14.0.0"
+    "@metamask/approval-controller": "npm:^6.0.2"
+    "@metamask/base-controller": "npm:^5.0.2"
+    "@metamask/contract-metadata": "npm:^2.4.0"
+    "@metamask/controller-utils": "npm:^10.0.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/keyring-controller": "npm:^16.0.0"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/network-controller": "npm:^18.1.2"
+    "@metamask/polling-controller": "npm:^6.0.2"
+    "@metamask/preferences-controller": "npm:^11.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": ^14.0.0
+    "@metamask/approval-controller": ^6.0.0
+    "@metamask/keyring-controller": ^16.0.0
+    "@metamask/network-controller": ^18.1.2
+    "@metamask/preferences-controller": ^11.0.0
+  checksum: 10/8e3bc1e5dbb9f7e1ef20115f7a0b79da9ce38f7f0e2d4cfee97f4d36666ea7fece9682f43775fe349337392e6f500432c8309489ab093259134cddb1d7112729
+  languageName: node
+  linkType: hard
+
 "@metamask/auto-changelog@npm:^2.1.0":
   version: 2.6.1
   resolution: "@metamask/auto-changelog@npm:2.6.1"
@@ -24929,7 +24971,7 @@ __metadata:
     "@metamask/address-book-controller": "npm:^4.0.1"
     "@metamask/announcement-controller": "npm:^6.1.0"
     "@metamask/approval-controller": "npm:^6.0.1"
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A30.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%3A%3Aversion=30.0.0&hash=9269c8#~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch"
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@patch%253A@metamask/assets-controllers@npm%25253A30.0.0%2523~/.yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch%253A%253Aversion=30.0.0&hash=9269c8%23~/.yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch%3A%3Aversion=30.0.0&hash=1ba1a6#~/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^4.1.0"
     "@metamask/browser-passworder": "npm:^4.3.0"

From b066542b206190f7a1f6299f0aa47a491850ca8a Mon Sep 17 00:00:00 2001
From: jiexi <jiexiluan@gmail.com>
Date: Thu, 15 Aug 2024 19:20:45 -0700
Subject: [PATCH 185/236] V12.0.5 cherrypick 2dc3768 fix network form update
 configuration in place state corruption (#26457)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherrypick https://github.com/MetaMask/metamask-extension/pull/26453

No major merge conflicts except for having to recreate the
@metamask/network-controller patch against 19.0.0 to 18.1.2

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26457?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Dan Miller <danjm.com@gmail.com>
---
 ...ork-controller-npm-18.1.2-1bcb8d8610.patch | 4275 ++++++++++++++++-
 app/scripts/migrations/index.js               |    1 +
 .../deprecated-networks.js                    |   11 +-
 .../networks-form/networks-form.js            |    6 +-
 ui/store/actions.test.js                      |  111 +-
 ui/store/actions.ts                           |   63 +-
 yarn.lock                                     |    4 +-
 7 files changed, 4283 insertions(+), 188 deletions(-)

diff --git a/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch b/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch
index f4c01d448364..2a9c59626ae9 100644
--- a/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch
+++ b/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch
@@ -1,24 +1,4263 @@
+diff --git a/dist/NetworkController.js b/dist/NetworkController.js
+index 330adcdc94693e5ba4321527a16175ef428fcf77..a188ba3514c7f0830f21aff307b85eae684fd562 100644
+--- a/dist/NetworkController.js
++++ b/dist/NetworkController.js
+@@ -2,7 +2,7 @@
+ 
+ 
+ 
+-var _chunk4ZD3DTQ7js = require('./chunk-4ZD3DTQ7.js');
++var _chunkRSKJC2QZjs = require('./chunk-RSKJC2QZ.js');
+ require('./chunk-ZKNI7MD3.js');
+ require('./chunk-ZV34XXLT.js');
+ require('./chunk-LDNWNT2P.js');
+@@ -13,5 +13,5 @@ require('./chunk-Z4BLTVTB.js');
+ 
+ 
+ 
+-exports.NetworkController = _chunk4ZD3DTQ7js.NetworkController; exports.defaultState = _chunk4ZD3DTQ7js.defaultState; exports.knownKeysOf = _chunk4ZD3DTQ7js.knownKeysOf;
++exports.NetworkController = _chunkRSKJC2QZjs.NetworkController; exports.defaultState = _chunkRSKJC2QZjs.defaultState; exports.knownKeysOf = _chunkRSKJC2QZjs.knownKeysOf;
+ //# sourceMappingURL=NetworkController.js.map
+\ No newline at end of file
+diff --git a/dist/NetworkController.mjs b/dist/NetworkController.mjs
+index 77720eaca62be7b5912d406bf96a3cbba8ba601a..0556eb0fa1aa9daab3e3c5e4fb12ac6399eda1c1 100644
+--- a/dist/NetworkController.mjs
++++ b/dist/NetworkController.mjs
+@@ -2,7 +2,7 @@ import {
+   NetworkController,
+   defaultState,
+   knownKeysOf
+-} from "./chunk-UG2NYGJD.mjs";
++} from "./chunk-PQBSOEJ3.mjs";
+ import "./chunk-2QJYHWIP.mjs";
+ import "./chunk-G5HYTGGH.mjs";
+ import "./chunk-TPYFTFZ2.mjs";
 diff --git a/dist/chunk-4ZD3DTQ7.js b/dist/chunk-4ZD3DTQ7.js
-index e172d15715b3cb4f26c42e51f8c7ff7394075bfe..148c802bac1d79f784618d18fa61d9de3330cae7 100644
+deleted file mode 100644
+index e172d15715b3cb4f26c42e51f8c7ff7394075bfe..0000000000000000000000000000000000000000
 --- a/dist/chunk-4ZD3DTQ7.js
-+++ b/dist/chunk-4ZD3DTQ7.js
-@@ -341,7 +341,6 @@ var NetworkController = class extends _basecontroller.BaseController {
-   async initializeProvider() {
-     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
++++ /dev/null
+@@ -1,1017 +0,0 @@
+-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+-
+-var _chunkZKNI7MD3js = require('./chunk-ZKNI7MD3.js');
+-
+-
+-var _chunkZV34XXLTjs = require('./chunk-ZV34XXLT.js');
+-
+-
+-
+-var _chunkVGYLDDJBjs = require('./chunk-VGYLDDJB.js');
+-
+-
+-
+-
+-
+-var _chunkZ4BLTVTBjs = require('./chunk-Z4BLTVTB.js');
+-
+-// src/NetworkController.ts
+-var _basecontroller = require('@metamask/base-controller');
+-
+-
+-
+-
+-
+-
+-
+-
+-var _controllerutils = require('@metamask/controller-utils');
+-var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
+-var _rpcerrors = require('@metamask/rpc-errors');
+-var _swappableobjproxy = require('@metamask/swappable-obj-proxy');
+-
+-
+-
+-
+-var _utils = require('@metamask/utils');
+-var _assert = require('assert');
+-var _uuid = require('uuid');
+-var log = _chunkVGYLDDJBjs.createModuleLogger.call(void 0, _chunkVGYLDDJBjs.projectLogger, "NetworkController");
+-function knownKeysOf(object) {
+-  return Object.keys(object);
+-}
+-function assertOfType(value, validate, message) {
+-  _assert.strict.ok(validate(value), message);
+-}
+-function pick(object, keys) {
+-  const pickedObject = keys.reduce(
+-    (finalObject, key) => {
+-      return { ...finalObject, [key]: object[key] };
+-    },
+-    {}
+-  );
+-  assertOfType(
+-    pickedObject,
+-    () => keys.every((key) => key in pickedObject),
+-    "The reduce did not produce an object with all of the desired keys."
+-  );
+-  return pickedObject;
+-}
+-function isErrorWithCode(error) {
+-  return typeof error === "object" && error !== null && "code" in error;
+-}
+-function buildInfuraNetworkClientId(infuraNetworkOrProviderConfig) {
+-  if (typeof infuraNetworkOrProviderConfig === "string") {
+-    return infuraNetworkOrProviderConfig;
+-  }
+-  return infuraNetworkOrProviderConfig.type;
+-}
+-function buildCustomNetworkClientId(...args) {
+-  if (args.length === 1) {
+-    return args[0];
+-  }
+-  const [{ id, rpcUrl }, networkConfigurations] = args;
+-  if (id === void 0) {
+-    const matchingNetworkConfiguration = Object.values(
+-      networkConfigurations
+-    ).find((networkConfiguration) => {
+-      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();
+-    });
+-    if (matchingNetworkConfiguration) {
+-      return matchingNetworkConfiguration.id;
+-    }
+-    return rpcUrl.toLowerCase();
+-  }
+-  return id;
+-}
+-function isInfuraProviderConfig(providerConfig) {
+-  return _controllerutils.isInfuraNetworkType.call(void 0, providerConfig.type);
+-}
+-function isCustomProviderConfig(providerConfig) {
+-  return providerConfig.type === _controllerutils.NetworkType.rpc;
+-}
+-function validateCustomProviderConfig(providerConfig) {
+-  if (providerConfig.chainId === void 0) {
+-    throw new Error("chainId must be provided for custom RPC endpoints");
+-  }
+-  if (providerConfig.rpcUrl === void 0) {
+-    throw new Error("rpcUrl must be provided for custom RPC endpoints");
+-  }
+-}
+-var name = "NetworkController";
+-var defaultState = {
+-  selectedNetworkClientId: _controllerutils.NetworkType.mainnet,
+-  providerConfig: {
+-    type: _controllerutils.NetworkType.mainnet,
+-    chainId: _controllerutils.ChainId.mainnet,
+-    ticker: _controllerutils.NetworksTicker.mainnet
+-  },
+-  networksMetadata: {},
+-  networkConfigurations: {}
+-};
+-var _ethQuery, _infuraProjectId, _trackMetaMetricsEvent, _previousProviderConfig, _providerProxy, _blockTrackerProxy, _autoManagedNetworkClientRegistry, _refreshNetwork, refreshNetwork_fn, _getLatestBlock, getLatestBlock_fn, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn, _applyNetworkSelection, applyNetworkSelection_fn;
+-var NetworkController = class extends _basecontroller.BaseController {
+-  constructor({
+-    messenger,
+-    state,
+-    infuraProjectId,
+-    trackMetaMetricsEvent
+-  }) {
+-    super({
+-      name,
+-      metadata: {
+-        selectedNetworkClientId: {
+-          persist: true,
+-          anonymous: false
+-        },
+-        networksMetadata: {
+-          persist: true,
+-          anonymous: false
+-        },
+-        providerConfig: {
+-          persist: true,
+-          anonymous: false
+-        },
+-        networkConfigurations: {
+-          persist: true,
+-          anonymous: false
+-        }
+-      },
+-      messenger,
+-      state: { ...defaultState, ...state }
+-    });
+-    /**
+-     * Executes a series of steps to apply the changes to the provider config:
+-     *
+-     * 1. Notifies subscribers that the network is about to change.
+-     * 2. Looks up a known and preinitialized network client matching the provider
+-     * config and re-points the provider and block tracker proxy to it.
+-     * 3. Notifies subscribers that the network has changed.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _refreshNetwork);
+-    /**
+-     * Fetches the latest block for the network.
+-     *
+-     * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.
+-     * @returns A promise that either resolves to the block header or null if
+-     * there is no latest block, or rejects with an error.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getLatestBlock);
+-    /**
+-     * Retrieves and checks the latest block from the currently selected
+-     * network; if the block has a `baseFeePerGas` property, then we know
+-     * that the network supports EIP-1559; otherwise it doesn't.
+-     *
+-     * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility
+-     * @returns A promise that resolves to `true` if the network supports EIP-1559,
+-     * `false` otherwise, or `undefined` if unable to retrieve the last block.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _determineEIP1559Compatibility);
+-    /**
+-     * Before accessing or switching the network, the registry of network clients
+-     * needs to be populated. Otherwise, `#applyNetworkSelection` and
+-     * `getNetworkClientRegistry` will throw an error. This method checks to see if the
+-     * population step has happened yet, and if not, makes it happen.
+-     *
+-     * @returns The populated network client registry.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated);
+-    /**
+-     * Constructs the registry of network clients based on the set of built-in
+-     * networks as well as the custom networks in state.
+-     *
+-     * @returns The network clients keyed by ID.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _createAutoManagedNetworkClientRegistry);
+-    /**
+-     * Constructs the list of network clients for built-in networks (that is,
+-     * the subset of the networks we know Infura supports that consumers do not
+-     * need to explicitly add).
+-     *
+-     * @returns The network clients.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedInfuraNetworkClientConfigurations);
+-    /**
+-     * Constructs the list of network clients for custom networks (that is, those
+-     * which consumers have added via `networkConfigurations`).
+-     *
+-     * @returns The network clients.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedCustomNetworkClientConfigurations);
+-    /**
+-     * Converts the provider config object in state to a network client
+-     * configuration object.
+-     *
+-     * @returns The network client config.
+-     * @throws If the provider config is of type "rpc" and lacks either a
+-     * `chainId` or an `rpcUrl`.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig);
+-    /**
+-     * Uses the information in the provider config object to look up a known and
+-     * preinitialized network client. Once a network client is found, updates the
+-     * provider and block tracker proxy to point to those from the network client,
+-     * then finally creates an EthQuery that points to the provider proxy.
+-     *
+-     * @throws If no network client could be found matching the current provider
+-     * config.
+-     */
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _applyNetworkSelection);
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _ethQuery, void 0);
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _infuraProjectId, void 0);
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _trackMetaMetricsEvent, void 0);
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _previousProviderConfig, void 0);
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _providerProxy, void 0);
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _blockTrackerProxy, void 0);
+-    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _autoManagedNetworkClientRegistry, void 0);
+-    if (!infuraProjectId || typeof infuraProjectId !== "string") {
+-      throw new Error("Invalid Infura project ID");
+-    }
+-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _infuraProjectId, infuraProjectId);
+-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _trackMetaMetricsEvent, trackMetaMetricsEvent);
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getProviderConfig`,
+-      () => {
+-        return this.state.providerConfig;
+-      }
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getEthQuery`,
+-      () => {
+-        return _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery);
+-      }
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getNetworkClientById`,
+-      this.getNetworkClientById.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getEIP1559Compatibility`,
+-      this.getEIP1559Compatibility.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:setActiveNetwork`,
+-      this.setActiveNetwork.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:setProviderType`,
+-      this.setProviderType.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:findNetworkClientIdByChainId`,
+-      this.findNetworkClientIdByChainId.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getNetworkConfigurationByNetworkClientId`,
+-      this.getNetworkConfigurationByNetworkClientId.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getSelectedNetworkClient`,
+-      this.getSelectedNetworkClient.bind(this)
+-    );
+-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previousProviderConfig, this.state.providerConfig);
+-  }
+-  /**
+-   * Accesses the provider and block tracker for the currently selected network.
+-   * @returns The proxy and block tracker proxies.
+-   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.
+-   */
+-  getProviderAndBlockTracker() {
+-    return {
+-      provider: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy),
+-      blockTracker: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)
+-    };
+-  }
+-  /**
+-   * Accesses the provider and block tracker for the currently selected network.
+-   *
+-   * @returns an object with the provider and block tracker proxies for the currently selected network.
+-   */
+-  getSelectedNetworkClient() {
+-    if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy) && _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)) {
+-      return {
+-        provider: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy),
+-        blockTracker: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)
+-      };
+-    }
+-    return void 0;
+-  }
+-  /**
+-   * Returns all of the network clients that have been created so far, keyed by
+-   * their identifier in the network client registry. This collection represents
+-   * not only built-in networks but also any custom networks that consumers have
+-   * added.
+-   *
+-   * @returns The list of known network clients.
+-   */
+-  getNetworkClientRegistry() {
+-    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    return Object.assign(
+-      {},
+-      autoManagedNetworkClientRegistry["infura" /* Infura */],
+-      autoManagedNetworkClientRegistry["custom" /* Custom */]
+-    );
+-  }
+-  getNetworkClientById(networkClientId) {
+-    if (!networkClientId) {
+-      throw new Error("No network client ID was provided.");
+-    }
+-    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    if (_controllerutils.isInfuraNetworkType.call(void 0, networkClientId)) {
+-      const infuraNetworkClient = autoManagedNetworkClientRegistry["infura" /* Infura */][networkClientId];
+-      if (!infuraNetworkClient) {
+-        throw new Error(
+-          `No Infura network client was found with the ID "${networkClientId}".`
+-        );
+-      }
+-      return infuraNetworkClient;
+-    }
+-    const customNetworkClient = autoManagedNetworkClientRegistry["custom" /* Custom */][networkClientId];
+-    if (!customNetworkClient) {
+-      throw new Error(
+-        `No custom network client was found with the ID "${networkClientId}".`
+-      );
+-    }
+-    return customNetworkClient;
+-  }
+-  /**
+-   * Populates the network clients and establishes the initial network based on
+-   * the provider configuration in state.
+-   */
+-  async initializeProvider() {
+-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
 -    await this.lookupNetwork();
-   }
-   /**
-    * Refreshes the network meta with EIP-1559 support and the network status
+-  }
+-  /**
+-   * Refreshes the network meta with EIP-1559 support and the network status
+-   * based on the given network client ID.
+-   *
+-   * @param networkClientId - The ID of the network client to update.
+-   */
+-  async lookupNetworkByClientId(networkClientId) {
+-    const isInfura = _controllerutils.isInfuraNetworkType.call(void 0, networkClientId);
+-    let updatedNetworkStatus;
+-    let updatedIsEIP1559Compatible;
+-    try {
+-      updatedIsEIP1559Compatible = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, networkClientId);
+-      updatedNetworkStatus = "available" /* Available */;
+-    } catch (error) {
+-      if (isErrorWithCode(error)) {
+-        let responseBody;
+-        if (isInfura && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string") {
+-          try {
+-            responseBody = JSON.parse(error.message);
+-          } catch {
+-          }
+-        }
+-        if (_utils.isPlainObject.call(void 0, responseBody) && responseBody.error === _chunkZKNI7MD3js.INFURA_BLOCKED_KEY) {
+-          updatedNetworkStatus = "blocked" /* Blocked */;
+-        } else if (error.code === _rpcerrors.errorCodes.rpc.internal) {
+-          updatedNetworkStatus = "unknown" /* Unknown */;
+-        } else {
+-          updatedNetworkStatus = "unavailable" /* Unavailable */;
+-        }
+-      } else if (typeof Error !== "undefined" && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string" && error.message.includes(
+-        "No custom network client was found with the ID"
+-      )) {
+-        throw error;
+-      } else {
+-        log("NetworkController - could not determine network status", error);
+-        updatedNetworkStatus = "unknown" /* Unknown */;
+-      }
+-    }
+-    this.update((state) => {
+-      if (state.networksMetadata[networkClientId] === void 0) {
+-        state.networksMetadata[networkClientId] = {
+-          status: "unknown" /* Unknown */,
+-          EIPS: {}
+-        };
+-      }
+-      const meta = state.networksMetadata[networkClientId];
+-      meta.status = updatedNetworkStatus;
+-      if (updatedIsEIP1559Compatible === void 0) {
+-        delete meta.EIPS[1559];
+-      } else {
+-        meta.EIPS[1559] = updatedIsEIP1559Compatible;
+-      }
+-    });
+-  }
+-  /**
+-   * Performs side effects after switching to a network. If the network is
+-   * available, updates the network state with the network ID of the network and
+-   * stores whether the network supports EIP-1559; otherwise clears said
+-   * information about the network that may have been previously stored.
+-   *
+-   * @param networkClientId - (Optional) The ID of the network client to update.
+-   * If no ID is provided, uses the currently selected network.
+-   * @fires infuraIsBlocked if the network is Infura-supported and is blocking
+-   * requests.
+-   * @fires infuraIsUnblocked if the network is Infura-supported and is not
+-   * blocking requests, or if the network is not Infura-supported.
+-   */
+-  async lookupNetwork(networkClientId) {
+-    if (networkClientId) {
+-      await this.lookupNetworkByClientId(networkClientId);
+-      return;
+-    }
+-    if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery)) {
+-      return;
+-    }
+-    const isInfura = isInfuraProviderConfig(this.state.providerConfig);
+-    let networkChanged = false;
+-    const listener = () => {
+-      networkChanged = true;
+-      this.messagingSystem.unsubscribe(
+-        "NetworkController:networkDidChange",
+-        listener
+-      );
+-    };
+-    this.messagingSystem.subscribe(
+-      "NetworkController:networkDidChange",
+-      listener
+-    );
+-    let updatedNetworkStatus;
+-    let updatedIsEIP1559Compatible;
+-    try {
+-      const isEIP1559Compatible = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
+-      updatedNetworkStatus = "available" /* Available */;
+-      updatedIsEIP1559Compatible = isEIP1559Compatible;
+-    } catch (error) {
+-      if (isErrorWithCode(error)) {
+-        let responseBody;
+-        if (isInfura && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string") {
+-          try {
+-            responseBody = JSON.parse(error.message);
+-          } catch {
+-          }
+-        }
+-        if (_utils.isPlainObject.call(void 0, responseBody) && responseBody.error === _chunkZKNI7MD3js.INFURA_BLOCKED_KEY) {
+-          updatedNetworkStatus = "blocked" /* Blocked */;
+-        } else if (error.code === _rpcerrors.errorCodes.rpc.internal) {
+-          updatedNetworkStatus = "unknown" /* Unknown */;
+-        } else {
+-          updatedNetworkStatus = "unavailable" /* Unavailable */;
+-        }
+-      } else {
+-        log("NetworkController - could not determine network status", error);
+-        updatedNetworkStatus = "unknown" /* Unknown */;
+-      }
+-    }
+-    if (networkChanged) {
+-      return;
+-    }
+-    this.messagingSystem.unsubscribe(
+-      "NetworkController:networkDidChange",
+-      listener
+-    );
+-    this.update((state) => {
+-      const meta = state.networksMetadata[state.selectedNetworkClientId];
+-      meta.status = updatedNetworkStatus;
+-      if (updatedIsEIP1559Compatible === void 0) {
+-        delete meta.EIPS[1559];
+-      } else {
+-        meta.EIPS[1559] = updatedIsEIP1559Compatible;
+-      }
+-    });
+-    if (isInfura) {
+-      if (updatedNetworkStatus === "available" /* Available */) {
+-        this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
+-      } else if (updatedNetworkStatus === "blocked" /* Blocked */) {
+-        this.messagingSystem.publish("NetworkController:infuraIsBlocked");
+-      }
+-    } else {
+-      this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
+-    }
+-  }
+-  /**
+-   * Convenience method to update provider network type settings.
+-   *
+-   * @param type - Human readable network name.
+-   * @deprecated This has been replaced by `setActiveNetwork`, and will be
+-   * removed in a future release
+-   */
+-  async setProviderType(type) {
+-    _assert.strict.notStrictEqual(
+-      type,
+-      _controllerutils.NetworkType.rpc,
+-      `NetworkController - cannot call "setProviderType" with type "${_controllerutils.NetworkType.rpc}". Use "setActiveNetwork"`
+-    );
+-    _assert.strict.ok(
+-      _controllerutils.isInfuraNetworkType.call(void 0, type),
+-      `Unknown Infura provider type "${type}".`
+-    );
+-    await this.setActiveNetwork(type);
+-  }
+-  /**
+-   * Convenience method to update provider RPC settings.
+-   *
+-   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,
+-   * or the type of a built-in network.
+-   */
+-  async setActiveNetwork(networkConfigurationIdOrType) {
+-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previousProviderConfig, this.state.providerConfig);
+-    let targetNetwork;
+-    if (_controllerutils.isInfuraNetworkType.call(void 0, networkConfigurationIdOrType)) {
+-      const ticker = _controllerutils.NetworksTicker[networkConfigurationIdOrType];
+-      targetNetwork = {
+-        chainId: _controllerutils.ChainId[networkConfigurationIdOrType],
+-        id: void 0,
+-        rpcPrefs: _controllerutils.BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,
+-        rpcUrl: void 0,
+-        nickname: void 0,
+-        ticker,
+-        type: networkConfigurationIdOrType
+-      };
+-    } else {
+-      if (!Object.keys(this.state.networkConfigurations).includes(
+-        networkConfigurationIdOrType
+-      )) {
+-        throw new Error(
+-          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`
+-        );
+-      }
+-      targetNetwork = {
+-        ...this.state.networkConfigurations[networkConfigurationIdOrType],
+-        type: _controllerutils.NetworkType.rpc
+-      };
+-    }
+-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    this.update((state) => {
+-      state.providerConfig = targetNetwork;
+-    });
+-    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
+-  }
+-  /**
+-   * Determines whether the network supports EIP-1559 by checking whether the
+-   * latest block has a `baseFeePerGas` property, then updates state
+-   * appropriately.
+-   *
+-   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.
+-   * @returns A promise that resolves to true if the network supports EIP-1559
+-   * , false otherwise, or `undefined` if unable to determine the compatibility.
+-   */
+-  async getEIP1559Compatibility(networkClientId) {
+-    if (networkClientId) {
+-      return this.get1559CompatibilityWithNetworkClientId(networkClientId);
+-    }
+-    if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery)) {
+-      return false;
+-    }
+-    const { EIPS } = this.state.networksMetadata[this.state.selectedNetworkClientId];
+-    if (EIPS[1559] !== void 0) {
+-      return EIPS[1559];
+-    }
+-    const isEIP1559Compatible = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
+-    this.update((state) => {
+-      if (isEIP1559Compatible !== void 0) {
+-        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] = isEIP1559Compatible;
+-      }
+-    });
+-    return isEIP1559Compatible;
+-  }
+-  async get1559CompatibilityWithNetworkClientId(networkClientId) {
+-    let metadata = this.state.networksMetadata[networkClientId];
+-    if (metadata === void 0) {
+-      await this.lookupNetwork(networkClientId);
+-      metadata = this.state.networksMetadata[networkClientId];
+-    }
+-    const { EIPS } = metadata;
+-    return EIPS[1559];
+-  }
+-  /**
+-   * Re-initializes the provider and block tracker for the current network.
+-   */
+-  async resetConnection() {
+-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
+-  }
+-  /**
+-   * Returns a configuration object for the network identified by the given
+-   * network client ID. If given an Infura network type, constructs one based on
+-   * what we know about the network; otherwise attempts locates a network
+-   * configuration in state that corresponds to the network client ID.
+-   *
+-   * @param networkClientId - The network client ID.
+-   * @returns The configuration for the referenced network if one exists, or
+-   * undefined otherwise.
+-   */
+-  getNetworkConfigurationByNetworkClientId(networkClientId) {
+-    if (_controllerutils.isInfuraNetworkType.call(void 0, networkClientId)) {
+-      const rpcUrl = `https://${networkClientId}.infura.io/v3/${_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _infuraProjectId)}`;
+-      return {
+-        rpcUrl,
+-        ..._controllerutils.BUILT_IN_NETWORKS[networkClientId]
+-      };
+-    }
+-    return this.state.networkConfigurations[networkClientId];
+-  }
+-  /**
+-   * Adds a new custom network or updates the information for an existing
+-   * network.
+-   *
+-   * This may involve updating the `networkConfigurations` property in
+-   * state as well and/or adding a new network client to the network client
+-   * registry. The `rpcUrl` and `chainId` of the given object are used to
+-   * determine which action to take:
+-   *
+-   * - If the `rpcUrl` corresponds to an existing network configuration
+-   * (case-insensitively), then it is overwritten with the object. Furthermore,
+-   * if the `chainId` is different from the existing network configuration, then
+-   * the existing network client is replaced with a new one.
+-   * - If the `rpcUrl` does not correspond to an existing network configuration
+-   * (case-insensitively), then the object is used to add a new network
+-   * configuration along with a new network client.
+-   *
+-   * @param networkConfiguration - The network configuration to add or update.
+-   * @param options - Additional configuration options.
+-   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.
+-   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).
+-   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).
+-   * @returns The ID for the added or updated network configuration.
+-   */
+-  async upsertNetworkConfiguration(networkConfiguration, {
+-    referrer,
+-    source,
+-    setActive = false
+-  }) {
+-    const sanitizedNetworkConfiguration = pick(
+-      networkConfiguration,
+-      ["rpcUrl", "chainId", "ticker", "nickname", "rpcPrefs"]
+-    );
+-    const { rpcUrl, chainId, ticker } = sanitizedNetworkConfiguration;
+-    _utils.assertIsStrictHexString.call(void 0, chainId);
+-    if (!_controllerutils.isSafeChainId.call(void 0, chainId)) {
+-      throw new Error(
+-        `Invalid chain ID "${chainId}": numerical value greater than max safe value.`
+-      );
+-    }
+-    if (!rpcUrl) {
+-      throw new Error(
+-        "An rpcUrl is required to add or update network configuration"
+-      );
+-    }
+-    if (!referrer || !source) {
+-      throw new Error(
+-        "referrer and source are required arguments for adding or updating a network configuration"
+-      );
+-    }
+-    try {
+-      new URL(rpcUrl);
+-    } catch (e) {
+-      if (e.message.includes("Invalid URL")) {
+-        throw new Error("rpcUrl must be a valid URL");
+-      }
+-    }
+-    if (!ticker) {
+-      throw new Error(
+-        "A ticker is required to add or update networkConfiguration"
+-      );
+-    }
+-    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    const existingNetworkConfiguration = Object.values(
+-      this.state.networkConfigurations
+-    ).find(
+-      (networkConfig) => networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase()
+-    );
+-    const upsertedNetworkConfigurationId = existingNetworkConfiguration ? existingNetworkConfiguration.id : _uuid.v4.call(void 0, );
+-    const networkClientId = buildCustomNetworkClientId(
+-      upsertedNetworkConfigurationId
+-    );
+-    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
+-    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+-    const shouldDestroyExistingNetworkClient = existingAutoManagedNetworkClient && existingAutoManagedNetworkClient.configuration.chainId !== chainId;
+-    if (shouldDestroyExistingNetworkClient) {
+-      existingAutoManagedNetworkClient.destroy();
+-    }
+-    if (!existingAutoManagedNetworkClient || shouldDestroyExistingNetworkClient) {
+-      customNetworkClientRegistry[networkClientId] = _chunkZV34XXLTjs.createAutoManagedNetworkClient.call(void 0, {
+-        type: "custom" /* Custom */,
+-        chainId,
+-        rpcUrl,
+-        ticker
+-      });
+-    }
+-    this.update((state) => {
+-      state.networkConfigurations[upsertedNetworkConfigurationId] = {
+-        id: upsertedNetworkConfigurationId,
+-        ...sanitizedNetworkConfiguration
+-      };
+-    });
+-    if (!existingNetworkConfiguration) {
+-      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _trackMetaMetricsEvent).call(this, {
+-        event: "Custom Network Added",
+-        category: "Network",
+-        referrer: {
+-          url: referrer
+-        },
+-        properties: {
+-          chain_id: chainId,
+-          symbol: ticker,
+-          source
+-        }
+-      });
+-    }
+-    if (setActive) {
+-      await this.setActiveNetwork(upsertedNetworkConfigurationId);
+-    }
+-    return upsertedNetworkConfigurationId;
+-  }
+-  /**
+-   * Removes a custom network from state.
+-   *
+-   * This involves updating the `networkConfigurations` property in state as
+-   * well and removing the network client that corresponds to the network from
+-   * the client registry.
+-   *
+-   * @param networkConfigurationId - The ID of an existing network
+-   * configuration.
+-   */
+-  removeNetworkConfiguration(networkConfigurationId) {
+-    if (!this.state.networkConfigurations[networkConfigurationId]) {
+-      throw new Error(
+-        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`
+-      );
+-    }
+-    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);
+-    this.update((state) => {
+-      delete state.networkConfigurations[networkConfigurationId];
+-    });
+-    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
+-    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+-    existingAutoManagedNetworkClient.destroy();
+-    delete customNetworkClientRegistry[networkClientId];
+-  }
+-  /**
+-   * Switches to the previously selected network, assuming that there is one
+-   * (if not and `initializeProvider` has not been previously called, then this
+-   * method is equivalent to calling `resetConnection`).
+-   */
+-  async rollbackToPreviousProvider() {
+-    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    this.update((state) => {
+-      state.providerConfig = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _previousProviderConfig);
+-    });
+-    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
+-  }
+-  /**
+-   * Deactivates the controller, stopping any ongoing polling.
+-   *
+-   * In-progress requests will not be aborted.
+-   */
+-  async destroy() {
+-    await _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)?.destroy();
+-  }
+-  /**
+-   * Updates the controller using the given backup data.
+-   *
+-   * @param backup - The data that has been backed up.
+-   * @param backup.networkConfigurations - Network configurations in the backup.
+-   */
+-  loadBackup({
+-    networkConfigurations
+-  }) {
+-    this.update((state) => {
+-      state.networkConfigurations = {
+-        ...state.networkConfigurations,
+-        ...networkConfigurations
+-      };
+-    });
+-  }
+-  /**
+-   * Searches for a network configuration ID with the given ChainID and returns it.
+-   *
+-   * @param chainId - ChainId to search for
+-   * @returns networkClientId of the network configuration with the given chainId
+-   */
+-  findNetworkClientIdByChainId(chainId) {
+-    const networkClients = this.getNetworkClientRegistry();
+-    const networkClientEntry = Object.entries(networkClients).find(
+-      ([_, networkClient]) => networkClient.configuration.chainId === chainId
+-    );
+-    if (networkClientEntry === void 0) {
+-      throw new Error("Couldn't find networkClientId for chainId");
+-    }
+-    return networkClientEntry[0];
+-  }
+-};
+-_ethQuery = new WeakMap();
+-_infuraProjectId = new WeakMap();
+-_trackMetaMetricsEvent = new WeakMap();
+-_previousProviderConfig = new WeakMap();
+-_providerProxy = new WeakMap();
+-_blockTrackerProxy = new WeakMap();
+-_autoManagedNetworkClientRegistry = new WeakMap();
+-_refreshNetwork = new WeakSet();
+-refreshNetwork_fn = async function() {
+-  this.messagingSystem.publish(
+-    "NetworkController:networkWillChange",
+-    this.state
+-  );
+-  _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+-  this.messagingSystem.publish(
+-    "NetworkController:networkDidChange",
+-    this.state
+-  );
+-  await this.lookupNetwork();
+-};
+-_getLatestBlock = new WeakSet();
+-getLatestBlock_fn = function(networkClientId) {
+-  if (networkClientId === void 0) {
+-    networkClientId = this.state.selectedNetworkClientId;
+-  }
+-  const networkClient = this.getNetworkClientById(networkClientId);
+-  const ethQuery = new (0, _ethquery2.default)(networkClient.provider);
+-  return new Promise((resolve, reject) => {
+-    ethQuery.sendAsync(
+-      { method: "eth_getBlockByNumber", params: ["latest", false] },
+-      (error, block) => {
+-        if (error) {
+-          reject(error);
+-        } else {
+-          resolve(block);
+-        }
+-      }
+-    );
+-  });
+-};
+-_determineEIP1559Compatibility = new WeakSet();
+-determineEIP1559Compatibility_fn = async function(networkClientId) {
+-  const latestBlock = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getLatestBlock, getLatestBlock_fn).call(this, networkClientId);
+-  if (!latestBlock) {
+-    return void 0;
+-  }
+-  return latestBlock.baseFeePerGas !== void 0;
+-};
+-_ensureAutoManagedNetworkClientRegistryPopulated = new WeakSet();
+-ensureAutoManagedNetworkClientRegistryPopulated_fn = function() {
+-  const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry) ?? _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn).call(this);
+-  _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _autoManagedNetworkClientRegistry, autoManagedNetworkClientRegistry);
+-  return autoManagedNetworkClientRegistry;
+-};
+-_createAutoManagedNetworkClientRegistry = new WeakSet();
+-createAutoManagedNetworkClientRegistry_fn = function() {
+-  return [
+-    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn).call(this),
+-    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn).call(this),
+-    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn).call(this)
+-  ].reduce(
+-    (registry, [networkClientType, networkClientId, networkClientConfiguration]) => {
+-      const autoManagedNetworkClient = _chunkZV34XXLTjs.createAutoManagedNetworkClient.call(void 0, 
+-        networkClientConfiguration
+-      );
+-      if (networkClientId in registry[networkClientType]) {
+-        return registry;
+-      }
+-      return {
+-        ...registry,
+-        [networkClientType]: {
+-          ...registry[networkClientType],
+-          [networkClientId]: autoManagedNetworkClient
+-        }
+-      };
+-    },
+-    {
+-      ["infura" /* Infura */]: {},
+-      ["custom" /* Custom */]: {}
+-    }
+-  );
+-};
+-_buildIdentifiedInfuraNetworkClientConfigurations = new WeakSet();
+-buildIdentifiedInfuraNetworkClientConfigurations_fn = function() {
+-  return knownKeysOf(_controllerutils.InfuraNetworkType).map((network) => {
+-    const networkClientId = buildInfuraNetworkClientId(network);
+-    const networkClientConfiguration = {
+-      type: "infura" /* Infura */,
+-      network,
+-      infuraProjectId: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _infuraProjectId),
+-      chainId: _controllerutils.BUILT_IN_NETWORKS[network].chainId,
+-      ticker: _controllerutils.BUILT_IN_NETWORKS[network].ticker
+-    };
+-    return [
+-      "infura" /* Infura */,
+-      networkClientId,
+-      networkClientConfiguration
+-    ];
+-  });
+-};
+-_buildIdentifiedCustomNetworkClientConfigurations = new WeakSet();
+-buildIdentifiedCustomNetworkClientConfigurations_fn = function() {
+-  return Object.entries(this.state.networkConfigurations).map(
+-    ([networkConfigurationId, networkConfiguration]) => {
+-      if (networkConfiguration.chainId === void 0) {
+-        throw new Error("chainId must be provided for custom RPC endpoints");
+-      }
+-      if (networkConfiguration.rpcUrl === void 0) {
+-        throw new Error("rpcUrl must be provided for custom RPC endpoints");
+-      }
+-      const networkClientId = buildCustomNetworkClientId(
+-        networkConfigurationId
+-      );
+-      const networkClientConfiguration = {
+-        type: "custom" /* Custom */,
+-        chainId: networkConfiguration.chainId,
+-        rpcUrl: networkConfiguration.rpcUrl,
+-        ticker: networkConfiguration.ticker
+-      };
+-      return [
+-        "custom" /* Custom */,
+-        networkClientId,
+-        networkClientConfiguration
+-      ];
+-    }
+-  );
+-};
+-_buildIdentifiedNetworkClientConfigurationsFromProviderConfig = new WeakSet();
+-buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn = function() {
+-  const { providerConfig } = this.state;
+-  if (isCustomProviderConfig(providerConfig)) {
+-    validateCustomProviderConfig(providerConfig);
+-    const networkClientId = buildCustomNetworkClientId(
+-      providerConfig,
+-      this.state.networkConfigurations
+-    );
+-    const networkClientConfiguration = {
+-      chainId: providerConfig.chainId,
+-      rpcUrl: providerConfig.rpcUrl,
+-      type: "custom" /* Custom */,
+-      ticker: providerConfig.ticker
+-    };
+-    return [
+-      ["custom" /* Custom */, networkClientId, networkClientConfiguration]
+-    ];
+-  }
+-  if (isInfuraProviderConfig(providerConfig)) {
+-    return [];
+-  }
+-  throw new Error(`Unrecognized network type: '${providerConfig.type}'`);
+-};
+-_applyNetworkSelection = new WeakSet();
+-applyNetworkSelection_fn = function() {
+-  if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)) {
+-    throw new Error(
+-      "initializeProvider must be called first in order to switch the network"
+-    );
+-  }
+-  const { providerConfig } = this.state;
+-  let autoManagedNetworkClient;
+-  let networkClientId;
+-  if (isInfuraProviderConfig(providerConfig)) {
+-    const networkClientType = "infura" /* Infura */;
+-    networkClientId = buildInfuraNetworkClientId(providerConfig);
+-    const builtInNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)[networkClientType];
+-    autoManagedNetworkClient = builtInNetworkClientRegistry[networkClientId];
+-    if (!autoManagedNetworkClient) {
+-      throw new Error(
+-        `Could not find custom network matching ${networkClientId}`
+-      );
+-    }
+-  } else if (isCustomProviderConfig(providerConfig)) {
+-    validateCustomProviderConfig(providerConfig);
+-    const networkClientType = "custom" /* Custom */;
+-    networkClientId = buildCustomNetworkClientId(
+-      providerConfig,
+-      this.state.networkConfigurations
+-    );
+-    const customNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)[networkClientType];
+-    autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+-    if (!autoManagedNetworkClient) {
+-      throw new Error(
+-        `Could not find built-in network matching ${networkClientId}`
+-      );
+-    }
+-  } else {
+-    throw new Error("Could not determine type of provider config");
+-  }
+-  this.update((state) => {
+-    state.selectedNetworkClientId = networkClientId;
+-    if (state.networksMetadata[networkClientId] === void 0) {
+-      state.networksMetadata[networkClientId] = {
+-        status: "unknown" /* Unknown */,
+-        EIPS: {}
+-      };
+-    }
+-  });
+-  const { provider, blockTracker } = autoManagedNetworkClient;
+-  if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy)) {
+-    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy).setTarget(provider);
+-  } else {
+-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _providerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, provider));
+-  }
+-  if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)) {
+-    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy).setTarget(blockTracker);
+-  } else {
+-    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _blockTrackerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, blockTracker, {
+-      eventFilter: "skipInternal"
+-    }));
+-  }
+-  _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _ethQuery, new (0, _ethquery2.default)(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy)));
+-};
+-
+-
+-
+-
+-
+-exports.knownKeysOf = knownKeysOf; exports.defaultState = defaultState; exports.NetworkController = NetworkController;
+-//# sourceMappingURL=chunk-4ZD3DTQ7.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-4ZD3DTQ7.js.map b/dist/chunk-4ZD3DTQ7.js.map
+deleted file mode 100644
+index c56601b8af503b155d3d3a4ad68dd840099cea89..0000000000000000000000000000000000000000
+--- a/dist/chunk-4ZD3DTQ7.js.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/NetworkController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport {\n  BUILT_IN_NETWORKS,\n  NetworksTicker,\n  ChainId,\n  InfuraNetworkType,\n  NetworkType,\n  isSafeChainId,\n  isInfuraNetworkType,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport { errorCodes } from '@metamask/rpc-errors';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { SwappableProxy } from '@metamask/swappable-obj-proxy';\nimport type { Hex } from '@metamask/utils';\nimport {\n  assertIsStrictHexString,\n  hasProperty,\n  isPlainObject,\n} from '@metamask/utils';\nimport { strict as assert } from 'assert';\nimport { v4 as random } from 'uuid';\n\nimport { INFURA_BLOCKED_KEY, NetworkStatus } from './constants';\nimport type {\n  AutoManagedNetworkClient,\n  ProxyWithAccessibleTarget,\n} from './create-auto-managed-network-client';\nimport { createAutoManagedNetworkClient } from './create-auto-managed-network-client';\nimport { projectLogger, createModuleLogger } from './logger';\nimport { NetworkClientType } from './types';\nimport type {\n  BlockTracker,\n  Provider,\n  CustomNetworkClientConfiguration,\n  InfuraNetworkClientConfiguration,\n  NetworkClientConfiguration,\n} from './types';\n\nconst log = createModuleLogger(projectLogger, 'NetworkController');\n\n/**\n * @type ProviderConfig\n *\n * Configuration passed to web3-provider-engine\n * @property rpcUrl - RPC target URL.\n * @property type - Human-readable network name.\n * @property chainId - Network ID as per EIP-155.\n * @property ticker - Currency ticker.\n * @property nickname - Personalized network name.\n * @property id - Network Configuration Id.\n */\nexport type ProviderConfig = {\n  rpcUrl?: string;\n  type: NetworkType;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: { blockExplorerUrl?: string };\n  id?: NetworkConfigurationId;\n};\n\nexport type Block = {\n  baseFeePerGas?: string;\n};\n\n/**\n * Information about a network not held by any other part of state.\n */\nexport type NetworkMetadata = {\n  /**\n   * EIPs supported by the network.\n   */\n  EIPS: {\n    [eipNumber: number]: boolean;\n  };\n  /**\n   * Indicates the availability of the network\n   */\n  status: NetworkStatus;\n};\n\n/**\n * Custom RPC network information\n *\n * @property rpcUrl - RPC target URL.\n * @property chainId - Network ID as per EIP-155\n * @property nickname - Personalized network name.\n * @property ticker - Currency ticker.\n * @property rpcPrefs - Personalized preferences.\n */\nexport type NetworkConfiguration = {\n  rpcUrl: string;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: {\n    blockExplorerUrl: string;\n  };\n};\n\n/**\n * The collection of network configurations in state.\n */\ntype NetworkConfigurations = Record<\n  NetworkConfigurationId,\n  NetworkConfiguration & { id: NetworkConfigurationId }\n>;\n\n/**\n * `Object.keys()` is intentionally generic: it returns the keys of an object,\n * but it cannot make guarantees about the contents of that object, so the type\n * of the keys is merely `string[]`. While this is technically accurate, it is\n * also unnecessary if we have an object that we own and whose contents are\n * known exactly.\n *\n * TODO: Move to @metamask/utils.\n *\n * @param object - The object.\n * @returns The keys of an object, typed according to the type of the object\n * itself.\n */\nexport function knownKeysOf<K extends PropertyKey>(\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  object: Partial<Record<K, any>>,\n) {\n  return Object.keys(object) as K[];\n}\n\n/**\n * Asserts that the given value is of the given type if the given validation\n * function returns a truthy result.\n *\n * @param value - The value to validate.\n * @param validate - A function used to validate that the value is of the given\n * type. Takes the `value` as an argument and is expected to return true or\n * false.\n * @param message - The message to throw if the function does not return a\n * truthy result.\n * @throws if the function does not return a truthy result.\n */\nfunction assertOfType<Type>(\n  value: unknown,\n  validate: (value: unknown) => boolean,\n  message: string,\n): asserts value is Type {\n  assert.ok(validate(value), message);\n}\n\n/**\n * Returns a portion of the given object with only the given keys.\n *\n * @param object - An object.\n * @param keys - The keys to pick from the object.\n * @returns the portion of the object.\n */\n// TODO: Replace `any` with type\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction pick<Obj extends Record<any, any>, Keys extends keyof Obj>(\n  object: Obj,\n  keys: Keys[],\n): Pick<Obj, Keys> {\n  const pickedObject = keys.reduce<Partial<Pick<Obj, Keys>>>(\n    (finalObject, key) => {\n      return { ...finalObject, [key]: object[key] };\n    },\n    {},\n  );\n  assertOfType<Pick<Obj, Keys>>(\n    pickedObject,\n    () => keys.every((key) => key in pickedObject),\n    'The reduce did not produce an object with all of the desired keys.',\n  );\n  return pickedObject;\n}\n\n/**\n * Type guard for determining whether the given value is an error object with a\n * `code` property, such as an instance of Error.\n *\n * TODO: Move this to @metamask/utils.\n *\n * @param error - The object to check.\n * @returns True if `error` has a `code`, false otherwise.\n */\nfunction isErrorWithCode(error: unknown): error is { code: string | number } {\n  return typeof error === 'object' && error !== null && 'code' in error;\n}\n\n/**\n * Builds an identifier for an Infura network client for lookup purposes.\n *\n * @param infuraNetworkOrProviderConfig - The name of an Infura network or a\n * provider config.\n * @returns The built identifier.\n */\nfunction buildInfuraNetworkClientId(\n  infuraNetworkOrProviderConfig:\n    | InfuraNetworkType\n    | (ProviderConfig & { type: InfuraNetworkType }),\n): BuiltInNetworkClientId {\n  if (typeof infuraNetworkOrProviderConfig === 'string') {\n    return infuraNetworkOrProviderConfig;\n  }\n  return infuraNetworkOrProviderConfig.type;\n}\n\n/**\n * Builds an identifier for a custom network client for lookup purposes.\n *\n * @param args - This function can be called two ways:\n * 1. The ID of a network configuration.\n * 2. A provider config and a set of network configurations.\n * @returns The built identifier.\n */\nfunction buildCustomNetworkClientId(\n  ...args:\n    | [NetworkConfigurationId]\n    | [\n        ProviderConfig & { type: typeof NetworkType.rpc; rpcUrl: string },\n        NetworkConfigurations,\n      ]\n): CustomNetworkClientId {\n  if (args.length === 1) {\n    return args[0];\n  }\n  const [{ id, rpcUrl }, networkConfigurations] = args;\n  if (id === undefined) {\n    const matchingNetworkConfiguration = Object.values(\n      networkConfigurations,\n    ).find((networkConfiguration) => {\n      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();\n    });\n    if (matchingNetworkConfiguration) {\n      return matchingNetworkConfiguration.id;\n    }\n    return rpcUrl.toLowerCase();\n  }\n  return id;\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isInfuraProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: InfuraNetworkType } {\n  return isInfuraNetworkType(providerConfig.type);\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isCustomProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: typeof NetworkType.rpc } {\n  return providerConfig.type === NetworkType.rpc;\n}\n\n/**\n * As a provider config represents the settings that are used to interface with\n * an RPC endpoint, it must have both a chain ID and an RPC URL if it represents\n * a custom network. These properties _should_ be set as they are validated in\n * the UI when a user adds a custom network, but just to be safe we validate\n * them here.\n *\n * In addition, historically the `rpcUrl` property on the ProviderConfig type\n * has been optional, even though it should not be. Making this non-optional\n * would be a breaking change, so this function types the provider config\n * correctly so that we don't have to check `rpcUrl` in other places.\n *\n * @param providerConfig - A provider config.\n * @throws if the provider config does not have a chain ID or an RPC URL.\n */\nfunction validateCustomProviderConfig(\n  providerConfig: ProviderConfig & { type: typeof NetworkType.rpc },\n): asserts providerConfig is typeof providerConfig & { rpcUrl: string } {\n  if (providerConfig.chainId === undefined) {\n    throw new Error('chainId must be provided for custom RPC endpoints');\n  }\n  if (providerConfig.rpcUrl === undefined) {\n    throw new Error('rpcUrl must be provided for custom RPC endpoints');\n  }\n}\n/**\n * The string that uniquely identifies an Infura network client.\n */\nexport type BuiltInNetworkClientId = InfuraNetworkType;\n\n/**\n * The string that uniquely identifies a custom network client.\n */\nexport type CustomNetworkClientId = string;\n\n/**\n * The string that uniquely identifies a network client.\n */\nexport type NetworkClientId = BuiltInNetworkClientId | CustomNetworkClientId;\n\n/**\n * Information about networks not held by any other part of state.\n */\nexport type NetworksMetadata = {\n  [networkClientId: NetworkClientId]: NetworkMetadata;\n};\n\n/**\n * @type NetworkState\n *\n * Network controller state\n * @property providerConfig - RPC URL and network name provider settings of the currently connected network\n * @property properties - an additional set of network properties for the currently connected network\n * @property networkConfigurations - the full list of configured networks either preloaded or added by the user.\n */\nexport type NetworkState = {\n  selectedNetworkClientId: NetworkClientId;\n  providerConfig: ProviderConfig;\n  networkConfigurations: NetworkConfigurations;\n  networksMetadata: NetworksMetadata;\n};\n\nconst name = 'NetworkController';\n\n/**\n * Represents the block tracker for the currently selected network. (Note that\n * this is a proxy around a proxy: the inner one exists so that the block\n * tracker doesn't have to exist until it's used, and the outer one exists so\n * that the currently selected network can change without consumers needing to\n * refresh the object reference to that network.)\n */\nexport type BlockTrackerProxy = SwappableProxy<\n  ProxyWithAccessibleTarget<BlockTracker>\n>;\n\n/**\n * Represents the provider for the currently selected network. (Note that this\n * is a proxy around a proxy: the inner one exists so that the provider doesn't\n * have to exist until it's used, and the outer one exists so that the currently\n * selected network can change without consumers needing to refresh the object\n * reference to that network.)\n */\nexport type ProviderProxy = SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n\nexport type NetworkControllerStateChangeEvent = ControllerStateChangeEvent<\n  typeof name,\n  NetworkState\n>;\n\n/**\n * `networkWillChange` is published when the current network is about to be\n * switched, but the new provider has not been created and no state changes have\n * occurred yet.\n */\nexport type NetworkControllerNetworkWillChangeEvent = {\n  type: 'NetworkController:networkWillChange';\n  payload: [NetworkState];\n};\n\n/**\n * `networkDidChange` is published after a provider has been created for a newly\n * switched network (but before the network has been confirmed to be available).\n */\nexport type NetworkControllerNetworkDidChangeEvent = {\n  type: 'NetworkController:networkDidChange';\n  payload: [NetworkState];\n};\n\n/**\n * `infuraIsBlocked` is published after the network is switched to an Infura\n * network, but when Infura returns an error blocking the user based on their\n * location.\n */\nexport type NetworkControllerInfuraIsBlockedEvent = {\n  type: 'NetworkController:infuraIsBlocked';\n  payload: [];\n};\n\n/**\n * `infuraIsBlocked` is published either after the network is switched to an\n * Infura network and Infura does not return an error blocking the user based on\n * their location, or the network is switched to a non-Infura network.\n */\nexport type NetworkControllerInfuraIsUnblockedEvent = {\n  type: 'NetworkController:infuraIsUnblocked';\n  payload: [];\n};\n\nexport type NetworkControllerEvents =\n  | NetworkControllerStateChangeEvent\n  | NetworkControllerNetworkWillChangeEvent\n  | NetworkControllerNetworkDidChangeEvent\n  | NetworkControllerInfuraIsBlockedEvent\n  | NetworkControllerInfuraIsUnblockedEvent;\n\nexport type NetworkControllerGetStateAction = ControllerGetStateAction<\n  typeof name,\n  NetworkState\n>;\n\nexport type NetworkControllerGetProviderConfigAction = {\n  type: `NetworkController:getProviderConfig`;\n  handler: () => ProviderConfig;\n};\n\nexport type NetworkControllerGetEthQueryAction = {\n  type: `NetworkController:getEthQuery`;\n  handler: () => EthQuery | undefined;\n};\n\nexport type NetworkControllerGetNetworkClientByIdAction = {\n  type: `NetworkController:getNetworkClientById`;\n  handler: NetworkController['getNetworkClientById'];\n};\n\nexport type NetworkControllerGetSelectedNetworkClientAction = {\n  type: `NetworkController:getSelectedNetworkClient`;\n  handler: NetworkController['getSelectedNetworkClient'];\n};\n\nexport type NetworkControllerGetEIP1559CompatibilityAction = {\n  type: `NetworkController:getEIP1559Compatibility`;\n  handler: NetworkController['getEIP1559Compatibility'];\n};\n\nexport type NetworkControllerFindNetworkClientIdByChainIdAction = {\n  type: `NetworkController:findNetworkClientIdByChainId`;\n  handler: NetworkController['findNetworkClientIdByChainId'];\n};\n\n/**\n * Change the currently selected network to the given built-in network type.\n *\n * @deprecated This action has been replaced by `setActiveNetwork`, and will be\n * removed in a future release.\n */\nexport type NetworkControllerSetProviderTypeAction = {\n  type: `NetworkController:setProviderType`;\n  handler: NetworkController['setProviderType'];\n};\n\nexport type NetworkControllerSetActiveNetworkAction = {\n  type: `NetworkController:setActiveNetwork`;\n  handler: NetworkController['setActiveNetwork'];\n};\n\nexport type NetworkControllerGetNetworkConfigurationByNetworkClientId = {\n  type: `NetworkController:getNetworkConfigurationByNetworkClientId`;\n  handler: NetworkController['getNetworkConfigurationByNetworkClientId'];\n};\n\nexport type NetworkControllerActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetProviderConfigAction\n  | NetworkControllerGetEthQueryAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetEIP1559CompatibilityAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | NetworkControllerSetActiveNetworkAction\n  | NetworkControllerSetProviderTypeAction\n  | NetworkControllerGetNetworkConfigurationByNetworkClientId;\n\nexport type NetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof name,\n  NetworkControllerActions,\n  NetworkControllerEvents,\n  never,\n  never\n>;\n\nexport type NetworkControllerOptions = {\n  messenger: NetworkControllerMessenger;\n  trackMetaMetricsEvent: () => void;\n  infuraProjectId: string;\n  state?: Partial<NetworkState>;\n};\n\nexport const defaultState: NetworkState = {\n  selectedNetworkClientId: NetworkType.mainnet,\n  providerConfig: {\n    type: NetworkType.mainnet,\n    chainId: ChainId.mainnet,\n    ticker: NetworksTicker.mainnet,\n  },\n  networksMetadata: {},\n  networkConfigurations: {},\n};\n\ntype MetaMetricsEventPayload = {\n  event: string;\n  category: string;\n  referrer?: { url: string };\n  actionId?: number;\n  environmentType?: string;\n  properties?: unknown;\n  sensitiveProperties?: unknown;\n  revenue?: number;\n  currency?: string;\n  value?: number;\n};\n\ntype NetworkConfigurationId = string;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedBuiltInNetworkClientRegistry = Record<\n  BuiltInNetworkClientId,\n  AutoManagedNetworkClient<InfuraNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedCustomNetworkClientRegistry = Record<\n  CustomNetworkClientId,\n  AutoManagedNetworkClient<CustomNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks\n * as well as custom networks that users have added.\n */\ntype AutoManagedNetworkClientRegistry = {\n  [NetworkClientType.Infura]: AutoManagedBuiltInNetworkClientRegistry;\n  [NetworkClientType.Custom]: AutoManagedCustomNetworkClientRegistry;\n};\n\n/**\n * Controller that creates and manages an Ethereum network provider.\n */\nexport class NetworkController extends BaseController<\n  typeof name,\n  NetworkState,\n  NetworkControllerMessenger\n> {\n  #ethQuery?: EthQuery;\n\n  #infuraProjectId: string;\n\n  #trackMetaMetricsEvent: (event: MetaMetricsEventPayload) => void;\n\n  #previousProviderConfig: ProviderConfig;\n\n  #providerProxy: ProviderProxy | undefined;\n\n  #blockTrackerProxy: BlockTrackerProxy | undefined;\n\n  #autoManagedNetworkClientRegistry?: AutoManagedNetworkClientRegistry;\n\n  constructor({\n    messenger,\n    state,\n    infuraProjectId,\n    trackMetaMetricsEvent,\n  }: NetworkControllerOptions) {\n    super({\n      name,\n      metadata: {\n        selectedNetworkClientId: {\n          persist: true,\n          anonymous: false,\n        },\n        networksMetadata: {\n          persist: true,\n          anonymous: false,\n        },\n        providerConfig: {\n          persist: true,\n          anonymous: false,\n        },\n        networkConfigurations: {\n          persist: true,\n          anonymous: false,\n        },\n      },\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    if (!infuraProjectId || typeof infuraProjectId !== 'string') {\n      throw new Error('Invalid Infura project ID');\n    }\n    this.#infuraProjectId = infuraProjectId;\n    this.#trackMetaMetricsEvent = trackMetaMetricsEvent;\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getProviderConfig`,\n      () => {\n        return this.state.providerConfig;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEthQuery`,\n      () => {\n        return this.#ethQuery;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkClientById`,\n      this.getNetworkClientById.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEIP1559Compatibility`,\n      this.getEIP1559Compatibility.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setActiveNetwork`,\n      this.setActiveNetwork.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setProviderType`,\n      this.setProviderType.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:findNetworkClientIdByChainId`,\n      this.findNetworkClientIdByChainId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkConfigurationByNetworkClientId`,\n      this.getNetworkConfigurationByNetworkClientId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getSelectedNetworkClient`,\n      this.getSelectedNetworkClient.bind(this),\n    );\n\n    this.#previousProviderConfig = this.state.providerConfig;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   * @returns The proxy and block tracker proxies.\n   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.\n   */\n  getProviderAndBlockTracker(): {\n    provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>> | undefined;\n    blockTracker:\n      | SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>\n      | undefined;\n  } {\n    return {\n      provider: this.#providerProxy,\n      blockTracker: this.#blockTrackerProxy,\n    };\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @returns an object with the provider and block tracker proxies for the currently selected network.\n   */\n  getSelectedNetworkClient():\n    | {\n        provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n        blockTracker: SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>;\n      }\n    | undefined {\n    if (this.#providerProxy && this.#blockTrackerProxy) {\n      return {\n        provider: this.#providerProxy,\n        blockTracker: this.#blockTrackerProxy,\n      };\n    }\n    return undefined;\n  }\n\n  /**\n   * Returns all of the network clients that have been created so far, keyed by\n   * their identifier in the network client registry. This collection represents\n   * not only built-in networks but also any custom networks that consumers have\n   * added.\n   *\n   * @returns The list of known network clients.\n   */\n  getNetworkClientRegistry(): AutoManagedBuiltInNetworkClientRegistry &\n    AutoManagedCustomNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    return Object.assign(\n      {},\n      autoManagedNetworkClientRegistry[NetworkClientType.Infura],\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom],\n    );\n  }\n\n  /**\n   * Returns the Infura network client with the given ID.\n   *\n   * @param infuraNetworkClientId - An Infura network client ID.\n   * @returns The Infura network client.\n   * @throws If an Infura network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    infuraNetworkClientId: BuiltInNetworkClientId,\n  ): AutoManagedNetworkClient<InfuraNetworkClientConfiguration>;\n\n  /**\n   * Returns the custom network client with the given ID.\n   *\n   * @param customNetworkClientId - A custom network client ID.\n   * @returns The custom network client.\n   * @throws If a custom network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    customNetworkClientId: CustomNetworkClientId,\n  ): AutoManagedNetworkClient<CustomNetworkClientConfiguration>;\n\n  getNetworkClientById(\n    networkClientId: NetworkClientId,\n  ): AutoManagedNetworkClient<NetworkClientConfiguration> {\n    if (!networkClientId) {\n      throw new Error('No network client ID was provided.');\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    if (isInfuraNetworkType(networkClientId)) {\n      const infuraNetworkClient =\n        autoManagedNetworkClientRegistry[NetworkClientType.Infura][\n          networkClientId\n        ];\n      if (!infuraNetworkClient) {\n        throw new Error(\n          `No Infura network client was found with the ID \"${networkClientId}\".`,\n        );\n      }\n      return infuraNetworkClient;\n    }\n\n    const customNetworkClient =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom][\n        networkClientId\n      ];\n    if (!customNetworkClient) {\n      throw new Error(\n        `No custom network client was found with the ID \"${networkClientId}\".`,\n      );\n    }\n    return customNetworkClient;\n  }\n\n  /**\n   * Executes a series of steps to apply the changes to the provider config:\n   *\n   * 1. Notifies subscribers that the network is about to change.\n   * 2. Looks up a known and preinitialized network client matching the provider\n   * config and re-points the provider and block tracker proxy to it.\n   * 3. Notifies subscribers that the network has changed.\n   */\n  async #refreshNetwork() {\n    this.messagingSystem.publish(\n      'NetworkController:networkWillChange',\n      this.state,\n    );\n    this.#applyNetworkSelection();\n    this.messagingSystem.publish(\n      'NetworkController:networkDidChange',\n      this.state,\n    );\n    await this.lookupNetwork();\n  }\n\n  /**\n   * Populates the network clients and establishes the initial network based on\n   * the provider configuration in state.\n   */\n  async initializeProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.#applyNetworkSelection();\n    await this.lookupNetwork();\n  }\n\n  /**\n   * Refreshes the network meta with EIP-1559 support and the network status\n   * based on the given network client ID.\n   *\n   * @param networkClientId - The ID of the network client to update.\n   */\n  async lookupNetworkByClientId(networkClientId: NetworkClientId) {\n    const isInfura = isInfuraNetworkType(networkClientId);\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      updatedIsEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        networkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else if (\n        typeof Error !== 'undefined' &&\n        hasProperty(error as unknown as Error, 'message') &&\n        typeof (error as unknown as Error).message === 'string' &&\n        (error as unknown as Error).message.includes(\n          'No custom network client was found with the ID',\n        )\n      ) {\n        throw error;\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n    this.update((state) => {\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n      const meta = state.networksMetadata[networkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n  }\n\n  /**\n   * Performs side effects after switching to a network. If the network is\n   * available, updates the network state with the network ID of the network and\n   * stores whether the network supports EIP-1559; otherwise clears said\n   * information about the network that may have been previously stored.\n   *\n   * @param networkClientId - (Optional) The ID of the network client to update.\n   * If no ID is provided, uses the currently selected network.\n   * @fires infuraIsBlocked if the network is Infura-supported and is blocking\n   * requests.\n   * @fires infuraIsUnblocked if the network is Infura-supported and is not\n   * blocking requests, or if the network is not Infura-supported.\n   */\n  async lookupNetwork(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      await this.lookupNetworkByClientId(networkClientId);\n      return;\n    }\n\n    if (!this.#ethQuery) {\n      return;\n    }\n\n    const isInfura = isInfuraProviderConfig(this.state.providerConfig);\n\n    let networkChanged = false;\n    const listener = () => {\n      networkChanged = true;\n      this.messagingSystem.unsubscribe(\n        'NetworkController:networkDidChange',\n        listener,\n      );\n    };\n    this.messagingSystem.subscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        this.state.selectedNetworkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n      updatedIsEIP1559Compatible = isEIP1559Compatible;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n\n    if (networkChanged) {\n      // If the network has changed, then `lookupNetwork` either has been or is\n      // in the process of being called, so we don't need to go further.\n      return;\n    }\n    this.messagingSystem.unsubscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    this.update((state) => {\n      const meta = state.networksMetadata[state.selectedNetworkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n\n    if (isInfura) {\n      if (updatedNetworkStatus === NetworkStatus.Available) {\n        this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n      } else if (updatedNetworkStatus === NetworkStatus.Blocked) {\n        this.messagingSystem.publish('NetworkController:infuraIsBlocked');\n      }\n    } else {\n      // Always publish infuraIsUnblocked regardless of network status to\n      // prevent consumers from being stuck in a blocked state if they were\n      // previously connected to an Infura network that was blocked\n      this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n    }\n  }\n\n  /**\n   * Convenience method to update provider network type settings.\n   *\n   * @param type - Human readable network name.\n   * @deprecated This has been replaced by `setActiveNetwork`, and will be\n   * removed in a future release\n   */\n  async setProviderType(type: InfuraNetworkType) {\n    assert.notStrictEqual(\n      type,\n      NetworkType.rpc,\n      `NetworkController - cannot call \"setProviderType\" with type \"${NetworkType.rpc}\". Use \"setActiveNetwork\"`,\n    );\n    assert.ok(\n      isInfuraNetworkType(type),\n      `Unknown Infura provider type \"${type}\".`,\n    );\n\n    await this.setActiveNetwork(type);\n  }\n\n  /**\n   * Convenience method to update provider RPC settings.\n   *\n   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,\n   * or the type of a built-in network.\n   */\n  async setActiveNetwork(networkConfigurationIdOrType: string) {\n    this.#previousProviderConfig = this.state.providerConfig;\n\n    let targetNetwork: ProviderConfig;\n    if (isInfuraNetworkType(networkConfigurationIdOrType)) {\n      const ticker = NetworksTicker[networkConfigurationIdOrType];\n\n      targetNetwork = {\n        chainId: ChainId[networkConfigurationIdOrType],\n        id: undefined,\n        rpcPrefs: BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,\n        rpcUrl: undefined,\n        nickname: undefined,\n        ticker,\n        type: networkConfigurationIdOrType,\n      };\n    } else {\n      if (\n        !Object.keys(this.state.networkConfigurations).includes(\n          networkConfigurationIdOrType,\n        )\n      ) {\n        throw new Error(\n          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`,\n        );\n      }\n      targetNetwork = {\n        ...this.state.networkConfigurations[networkConfigurationIdOrType],\n        type: NetworkType.rpc,\n      };\n    }\n\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = targetNetwork;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Fetches the latest block for the network.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.\n   * @returns A promise that either resolves to the block header or null if\n   * there is no latest block, or rejects with an error.\n   */\n  #getLatestBlock(networkClientId: NetworkClientId): Promise<Block> {\n    if (networkClientId === undefined) {\n      networkClientId = this.state.selectedNetworkClientId;\n    }\n\n    const networkClient = this.getNetworkClientById(networkClientId);\n    const ethQuery = new EthQuery(networkClient.provider);\n\n    return new Promise((resolve, reject) => {\n      ethQuery.sendAsync(\n        { method: 'eth_getBlockByNumber', params: ['latest', false] },\n        (error: unknown, block?: unknown) => {\n          if (error) {\n            reject(error);\n          } else {\n            // TODO: Validate this type\n            resolve(block as Block);\n          }\n        },\n      );\n    });\n  }\n\n  /**\n   * Determines whether the network supports EIP-1559 by checking whether the\n   * latest block has a `baseFeePerGas` property, then updates state\n   * appropriately.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.\n   * @returns A promise that resolves to true if the network supports EIP-1559\n   * , false otherwise, or `undefined` if unable to determine the compatibility.\n   */\n  async getEIP1559Compatibility(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      return this.get1559CompatibilityWithNetworkClientId(networkClientId);\n    }\n    if (!this.#ethQuery) {\n      return false;\n    }\n\n    const { EIPS } =\n      this.state.networksMetadata[this.state.selectedNetworkClientId];\n\n    if (EIPS[1559] !== undefined) {\n      return EIPS[1559];\n    }\n\n    const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n      this.state.selectedNetworkClientId,\n    );\n    this.update((state) => {\n      if (isEIP1559Compatible !== undefined) {\n        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] =\n          isEIP1559Compatible;\n      }\n    });\n    return isEIP1559Compatible;\n  }\n\n  async get1559CompatibilityWithNetworkClientId(\n    networkClientId: NetworkClientId,\n  ) {\n    let metadata = this.state.networksMetadata[networkClientId];\n    if (metadata === undefined) {\n      await this.lookupNetwork(networkClientId);\n      metadata = this.state.networksMetadata[networkClientId];\n    }\n    const { EIPS } = metadata;\n\n    // may want to include some 'freshness' value - something to make sure we refetch this from time to time\n    return EIPS[1559];\n  }\n\n  /**\n   * Retrieves and checks the latest block from the currently selected\n   * network; if the block has a `baseFeePerGas` property, then we know\n   * that the network supports EIP-1559; otherwise it doesn't.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility\n   * @returns A promise that resolves to `true` if the network supports EIP-1559,\n   * `false` otherwise, or `undefined` if unable to retrieve the last block.\n   */\n  async #determineEIP1559Compatibility(\n    networkClientId: NetworkClientId,\n  ): Promise<boolean | undefined> {\n    const latestBlock = await this.#getLatestBlock(networkClientId);\n\n    if (!latestBlock) {\n      return undefined;\n    }\n\n    return latestBlock.baseFeePerGas !== undefined;\n  }\n\n  /**\n   * Re-initializes the provider and block tracker for the current network.\n   */\n  async resetConnection() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Returns a configuration object for the network identified by the given\n   * network client ID. If given an Infura network type, constructs one based on\n   * what we know about the network; otherwise attempts locates a network\n   * configuration in state that corresponds to the network client ID.\n   *\n   * @param networkClientId - The network client ID.\n   * @returns The configuration for the referenced network if one exists, or\n   * undefined otherwise.\n   */\n  getNetworkConfigurationByNetworkClientId(\n    networkClientId: NetworkClientId,\n  ): NetworkConfiguration | undefined {\n    if (isInfuraNetworkType(networkClientId)) {\n      const rpcUrl = `https://${networkClientId}.infura.io/v3/${\n        this.#infuraProjectId\n      }`;\n      return {\n        rpcUrl,\n        ...BUILT_IN_NETWORKS[networkClientId],\n      };\n    }\n\n    return this.state.networkConfigurations[networkClientId];\n  }\n\n  /**\n   * Adds a new custom network or updates the information for an existing\n   * network.\n   *\n   * This may involve updating the `networkConfigurations` property in\n   * state as well and/or adding a new network client to the network client\n   * registry. The `rpcUrl` and `chainId` of the given object are used to\n   * determine which action to take:\n   *\n   * - If the `rpcUrl` corresponds to an existing network configuration\n   * (case-insensitively), then it is overwritten with the object. Furthermore,\n   * if the `chainId` is different from the existing network configuration, then\n   * the existing network client is replaced with a new one.\n   * - If the `rpcUrl` does not correspond to an existing network configuration\n   * (case-insensitively), then the object is used to add a new network\n   * configuration along with a new network client.\n   *\n   * @param networkConfiguration - The network configuration to add or update.\n   * @param options - Additional configuration options.\n   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.\n   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).\n   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).\n   * @returns The ID for the added or updated network configuration.\n   */\n  async upsertNetworkConfiguration(\n    networkConfiguration: NetworkConfiguration,\n    {\n      referrer,\n      source,\n      setActive = false,\n    }: {\n      referrer: string;\n      source: string;\n      setActive?: boolean;\n    },\n  ): Promise<string> {\n    const sanitizedNetworkConfiguration: NetworkConfiguration = pick(\n      networkConfiguration,\n      ['rpcUrl', 'chainId', 'ticker', 'nickname', 'rpcPrefs'],\n    );\n    const { rpcUrl, chainId, ticker } = sanitizedNetworkConfiguration;\n\n    assertIsStrictHexString(chainId);\n    if (!isSafeChainId(chainId)) {\n      throw new Error(\n        `Invalid chain ID \"${chainId}\": numerical value greater than max safe value.`,\n      );\n    }\n    if (!rpcUrl) {\n      throw new Error(\n        'An rpcUrl is required to add or update network configuration',\n      );\n    }\n    if (!referrer || !source) {\n      throw new Error(\n        'referrer and source are required arguments for adding or updating a network configuration',\n      );\n    }\n    try {\n      new URL(rpcUrl);\n      // TODO: Replace `any` with type\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    } catch (e: any) {\n      if (e.message.includes('Invalid URL')) {\n        throw new Error('rpcUrl must be a valid URL');\n      }\n    }\n    if (!ticker) {\n      throw new Error(\n        'A ticker is required to add or update networkConfiguration',\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    const existingNetworkConfiguration = Object.values(\n      this.state.networkConfigurations,\n    ).find(\n      (networkConfig) =>\n        networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase(),\n    );\n    const upsertedNetworkConfigurationId = existingNetworkConfiguration\n      ? existingNetworkConfiguration.id\n      : random();\n    const networkClientId = buildCustomNetworkClientId(\n      upsertedNetworkConfigurationId,\n    );\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    const shouldDestroyExistingNetworkClient =\n      existingAutoManagedNetworkClient &&\n      existingAutoManagedNetworkClient.configuration.chainId !== chainId;\n    if (shouldDestroyExistingNetworkClient) {\n      existingAutoManagedNetworkClient.destroy();\n    }\n    if (\n      !existingAutoManagedNetworkClient ||\n      shouldDestroyExistingNetworkClient\n    ) {\n      customNetworkClientRegistry[networkClientId] =\n        createAutoManagedNetworkClient({\n          type: NetworkClientType.Custom,\n          chainId,\n          rpcUrl,\n          ticker,\n        });\n    }\n\n    this.update((state) => {\n      state.networkConfigurations[upsertedNetworkConfigurationId] = {\n        id: upsertedNetworkConfigurationId,\n        ...sanitizedNetworkConfiguration,\n      };\n    });\n\n    if (!existingNetworkConfiguration) {\n      this.#trackMetaMetricsEvent({\n        event: 'Custom Network Added',\n        category: 'Network',\n        referrer: {\n          url: referrer,\n        },\n        properties: {\n          chain_id: chainId,\n          symbol: ticker,\n          source,\n        },\n      });\n    }\n\n    if (setActive) {\n      await this.setActiveNetwork(upsertedNetworkConfigurationId);\n    }\n\n    return upsertedNetworkConfigurationId;\n  }\n\n  /**\n   * Removes a custom network from state.\n   *\n   * This involves updating the `networkConfigurations` property in state as\n   * well and removing the network client that corresponds to the network from\n   * the client registry.\n   *\n   * @param networkConfigurationId - The ID of an existing network\n   * configuration.\n   */\n  removeNetworkConfiguration(networkConfigurationId: string) {\n    if (!this.state.networkConfigurations[networkConfigurationId]) {\n      throw new Error(\n        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`,\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);\n\n    this.update((state) => {\n      delete state.networkConfigurations[networkConfigurationId];\n    });\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    existingAutoManagedNetworkClient.destroy();\n    delete customNetworkClientRegistry[networkClientId];\n  }\n\n  /**\n   * Switches to the previously selected network, assuming that there is one\n   * (if not and `initializeProvider` has not been previously called, then this\n   * method is equivalent to calling `resetConnection`).\n   */\n  async rollbackToPreviousProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = this.#previousProviderConfig;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Deactivates the controller, stopping any ongoing polling.\n   *\n   * In-progress requests will not be aborted.\n   */\n  async destroy() {\n    await this.#blockTrackerProxy?.destroy();\n  }\n\n  /**\n   * Updates the controller using the given backup data.\n   *\n   * @param backup - The data that has been backed up.\n   * @param backup.networkConfigurations - Network configurations in the backup.\n   */\n  loadBackup({\n    networkConfigurations,\n  }: {\n    networkConfigurations: NetworkState['networkConfigurations'];\n  }): void {\n    this.update((state) => {\n      state.networkConfigurations = {\n        ...state.networkConfigurations,\n        ...networkConfigurations,\n      };\n    });\n  }\n\n  /**\n   * Searches for a network configuration ID with the given ChainID and returns it.\n   *\n   * @param chainId - ChainId to search for\n   * @returns networkClientId of the network configuration with the given chainId\n   */\n  findNetworkClientIdByChainId(chainId: Hex): NetworkClientId {\n    const networkClients = this.getNetworkClientRegistry();\n    const networkClientEntry = Object.entries(networkClients).find(\n      ([_, networkClient]) => networkClient.configuration.chainId === chainId,\n    );\n    if (networkClientEntry === undefined) {\n      throw new Error(\"Couldn't find networkClientId for chainId\");\n    }\n    return networkClientEntry[0];\n  }\n\n  /**\n   * Before accessing or switching the network, the registry of network clients\n   * needs to be populated. Otherwise, `#applyNetworkSelection` and\n   * `getNetworkClientRegistry` will throw an error. This method checks to see if the\n   * population step has happened yet, and if not, makes it happen.\n   *\n   * @returns The populated network client registry.\n   */\n  #ensureAutoManagedNetworkClientRegistryPopulated(): AutoManagedNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#autoManagedNetworkClientRegistry ??\n      this.#createAutoManagedNetworkClientRegistry();\n    this.#autoManagedNetworkClientRegistry = autoManagedNetworkClientRegistry;\n    return autoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the registry of network clients based on the set of built-in\n   * networks as well as the custom networks in state.\n   *\n   * @returns The network clients keyed by ID.\n   */\n  #createAutoManagedNetworkClientRegistry(): AutoManagedNetworkClientRegistry {\n    return [\n      ...this.#buildIdentifiedInfuraNetworkClientConfigurations(),\n      ...this.#buildIdentifiedCustomNetworkClientConfigurations(),\n      ...this.#buildIdentifiedNetworkClientConfigurationsFromProviderConfig(),\n    ].reduce(\n      (\n        registry,\n        [networkClientType, networkClientId, networkClientConfiguration],\n      ) => {\n        const autoManagedNetworkClient = createAutoManagedNetworkClient(\n          networkClientConfiguration,\n        );\n        if (networkClientId in registry[networkClientType]) {\n          return registry;\n        }\n        return {\n          ...registry,\n          [networkClientType]: {\n            ...registry[networkClientType],\n            [networkClientId]: autoManagedNetworkClient,\n          },\n        };\n      },\n      {\n        [NetworkClientType.Infura]: {},\n        [NetworkClientType.Custom]: {},\n      },\n    ) as AutoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the list of network clients for built-in networks (that is,\n   * the subset of the networks we know Infura supports that consumers do not\n   * need to explicitly add).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedInfuraNetworkClientConfigurations(): [\n    NetworkClientType.Infura,\n    BuiltInNetworkClientId,\n    InfuraNetworkClientConfiguration,\n  ][] {\n    return knownKeysOf(InfuraNetworkType).map((network) => {\n      const networkClientId = buildInfuraNetworkClientId(network);\n      const networkClientConfiguration: InfuraNetworkClientConfiguration = {\n        type: NetworkClientType.Infura,\n        network,\n        infuraProjectId: this.#infuraProjectId,\n        chainId: BUILT_IN_NETWORKS[network].chainId,\n        ticker: BUILT_IN_NETWORKS[network].ticker,\n      };\n      return [\n        NetworkClientType.Infura,\n        networkClientId,\n        networkClientConfiguration,\n      ];\n    });\n  }\n\n  /**\n   * Constructs the list of network clients for custom networks (that is, those\n   * which consumers have added via `networkConfigurations`).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedCustomNetworkClientConfigurations(): [\n    NetworkClientType.Custom,\n    CustomNetworkClientId,\n    CustomNetworkClientConfiguration,\n  ][] {\n    return Object.entries(this.state.networkConfigurations).map(\n      ([networkConfigurationId, networkConfiguration]) => {\n        if (networkConfiguration.chainId === undefined) {\n          throw new Error('chainId must be provided for custom RPC endpoints');\n        }\n        if (networkConfiguration.rpcUrl === undefined) {\n          throw new Error('rpcUrl must be provided for custom RPC endpoints');\n        }\n        const networkClientId = buildCustomNetworkClientId(\n          networkConfigurationId,\n        );\n        const networkClientConfiguration: CustomNetworkClientConfiguration = {\n          type: NetworkClientType.Custom,\n          chainId: networkConfiguration.chainId,\n          rpcUrl: networkConfiguration.rpcUrl,\n          ticker: networkConfiguration.ticker,\n        };\n        return [\n          NetworkClientType.Custom,\n          networkClientId,\n          networkClientConfiguration,\n        ];\n      },\n    );\n  }\n\n  /**\n   * Converts the provider config object in state to a network client\n   * configuration object.\n   *\n   * @returns The network client config.\n   * @throws If the provider config is of type \"rpc\" and lacks either a\n   * `chainId` or an `rpcUrl`.\n   */\n  #buildIdentifiedNetworkClientConfigurationsFromProviderConfig():\n    | [\n        [\n          NetworkClientType.Custom,\n          CustomNetworkClientId,\n          CustomNetworkClientConfiguration,\n        ],\n      ]\n    | [] {\n    const { providerConfig } = this.state;\n\n    if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const networkClientConfiguration: CustomNetworkClientConfiguration = {\n        chainId: providerConfig.chainId,\n        rpcUrl: providerConfig.rpcUrl,\n        type: NetworkClientType.Custom,\n        ticker: providerConfig.ticker,\n      };\n      return [\n        [NetworkClientType.Custom, networkClientId, networkClientConfiguration],\n      ];\n    }\n\n    if (isInfuraProviderConfig(providerConfig)) {\n      return [];\n    }\n\n    throw new Error(`Unrecognized network type: '${providerConfig.type}'`);\n  }\n\n  /**\n   * Uses the information in the provider config object to look up a known and\n   * preinitialized network client. Once a network client is found, updates the\n   * provider and block tracker proxy to point to those from the network client,\n   * then finally creates an EthQuery that points to the provider proxy.\n   *\n   * @throws If no network client could be found matching the current provider\n   * config.\n   */\n  #applyNetworkSelection() {\n    if (!this.#autoManagedNetworkClientRegistry) {\n      throw new Error(\n        'initializeProvider must be called first in order to switch the network',\n      );\n    }\n\n    const { providerConfig } = this.state;\n\n    let autoManagedNetworkClient: AutoManagedNetworkClient<NetworkClientConfiguration>;\n\n    let networkClientId: NetworkClientId;\n    if (isInfuraProviderConfig(providerConfig)) {\n      const networkClientType = NetworkClientType.Infura;\n      networkClientId = buildInfuraNetworkClientId(providerConfig);\n      const builtInNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient =\n        builtInNetworkClientRegistry[networkClientId as BuiltInNetworkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find custom network matching ${networkClientId}`,\n        );\n      }\n    } else if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientType = NetworkClientType.Custom;\n      networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const customNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find built-in network matching ${networkClientId}`,\n        );\n      }\n    } else {\n      throw new Error('Could not determine type of provider config');\n    }\n\n    this.update((state) => {\n      state.selectedNetworkClientId = networkClientId;\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n    });\n\n    const { provider, blockTracker } = autoManagedNetworkClient;\n\n    if (this.#providerProxy) {\n      this.#providerProxy.setTarget(provider);\n    } else {\n      this.#providerProxy = createEventEmitterProxy(provider);\n    }\n\n    if (this.#blockTrackerProxy) {\n      this.#blockTrackerProxy.setTarget(blockTracker);\n    } else {\n      this.#blockTrackerProxy = createEventEmitterProxy(blockTracker, {\n        eventFilter: 'skipInternal',\n      });\n    }\n\n    this.#ethQuery = new EthQuery(this.#providerProxy);\n  }\n}\n"]}
+\ No newline at end of file
+diff --git a/dist/chunk-PQBSOEJ3.mjs b/dist/chunk-PQBSOEJ3.mjs
+new file mode 100644
+index 0000000000000000000000000000000000000000..bdeb78450f68d1102d22701ff4252b28addb324a
+--- /dev/null
++++ b/dist/chunk-PQBSOEJ3.mjs
+@@ -0,0 +1,1034 @@
++import {
++  INFURA_BLOCKED_KEY
++} from "./chunk-2QJYHWIP.mjs";
++import {
++  createAutoManagedNetworkClient
++} from "./chunk-G5HYTGGH.mjs";
++import {
++  createModuleLogger,
++  projectLogger
++} from "./chunk-VTLOAS2R.mjs";
++import {
++  __privateAdd,
++  __privateGet,
++  __privateMethod,
++  __privateSet
++} from "./chunk-XUI43LEZ.mjs";
++
++// src/NetworkController.ts
++import { BaseController } from "@metamask/base-controller";
++import {
++  BUILT_IN_NETWORKS,
++  NetworksTicker,
++  ChainId,
++  InfuraNetworkType,
++  NetworkType,
++  isSafeChainId,
++  isInfuraNetworkType
++} from "@metamask/controller-utils";
++import EthQuery from "@metamask/eth-query";
++import { errorCodes } from "@metamask/rpc-errors";
++import { createEventEmitterProxy } from "@metamask/swappable-obj-proxy";
++import {
++  assertIsStrictHexString,
++  hasProperty,
++  isPlainObject
++} from "@metamask/utils";
++import { strict as assert } from "assert";
++import { v4 as random } from "uuid";
++var log = createModuleLogger(projectLogger, "NetworkController");
++function knownKeysOf(object) {
++  return Object.keys(object);
++}
++function assertOfType(value, validate, message) {
++  assert.ok(validate(value), message);
++}
++function pick(object, keys) {
++  const pickedObject = keys.reduce(
++    (finalObject, key) => {
++      return { ...finalObject, [key]: object[key] };
++    },
++    {}
++  );
++  assertOfType(
++    pickedObject,
++    () => keys.every((key) => key in pickedObject),
++    "The reduce did not produce an object with all of the desired keys."
++  );
++  return pickedObject;
++}
++function isErrorWithCode(error) {
++  return typeof error === "object" && error !== null && "code" in error;
++}
++function buildInfuraNetworkClientId(infuraNetworkOrProviderConfig) {
++  if (typeof infuraNetworkOrProviderConfig === "string") {
++    return infuraNetworkOrProviderConfig;
++  }
++  return infuraNetworkOrProviderConfig.type;
++}
++function buildCustomNetworkClientId(...args) {
++  if (args.length === 1) {
++    return args[0];
++  }
++  const [{ id, rpcUrl }, networkConfigurations] = args;
++  if (id === void 0) {
++    const matchingNetworkConfiguration = Object.values(
++      networkConfigurations
++    ).find((networkConfiguration) => {
++      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();
++    });
++    if (matchingNetworkConfiguration) {
++      return matchingNetworkConfiguration.id;
++    }
++    return rpcUrl.toLowerCase();
++  }
++  return id;
++}
++function isInfuraProviderConfig(providerConfig) {
++  return isInfuraNetworkType(providerConfig.type);
++}
++function isCustomProviderConfig(providerConfig) {
++  return providerConfig.type === NetworkType.rpc;
++}
++function validateCustomProviderConfig(providerConfig) {
++  if (providerConfig.chainId === void 0) {
++    throw new Error("chainId must be provided for custom RPC endpoints");
++  }
++  if (providerConfig.rpcUrl === void 0) {
++    throw new Error("rpcUrl must be provided for custom RPC endpoints");
++  }
++}
++var name = "NetworkController";
++var defaultState = {
++  selectedNetworkClientId: NetworkType.mainnet,
++  providerConfig: {
++    type: NetworkType.mainnet,
++    chainId: ChainId.mainnet,
++    ticker: NetworksTicker.mainnet
++  },
++  networksMetadata: {},
++  networkConfigurations: {}
++};
++var _ethQuery, _infuraProjectId, _trackMetaMetricsEvent, _previousProviderConfig, _providerProxy, _blockTrackerProxy, _autoManagedNetworkClientRegistry, _refreshNetwork, refreshNetwork_fn, _getLatestBlock, getLatestBlock_fn, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn, _applyNetworkSelection, applyNetworkSelection_fn;
++var NetworkController = class extends BaseController {
++  constructor({
++    messenger,
++    state,
++    infuraProjectId,
++    trackMetaMetricsEvent
++  }) {
++    super({
++      name,
++      metadata: {
++        selectedNetworkClientId: {
++          persist: true,
++          anonymous: false
++        },
++        networksMetadata: {
++          persist: true,
++          anonymous: false
++        },
++        providerConfig: {
++          persist: true,
++          anonymous: false
++        },
++        networkConfigurations: {
++          persist: true,
++          anonymous: false
++        }
++      },
++      messenger,
++      state: { ...defaultState, ...state }
++    });
++    /**
++     * Executes a series of steps to apply the changes to the provider config:
++     *
++     * 1. Notifies subscribers that the network is about to change.
++     * 2. Looks up a known and preinitialized network client matching the provider
++     * config and re-points the provider and block tracker proxy to it.
++     * 3. Notifies subscribers that the network has changed.
++     */
++    __privateAdd(this, _refreshNetwork);
++    /**
++     * Fetches the latest block for the network.
++     *
++     * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.
++     * @returns A promise that either resolves to the block header or null if
++     * there is no latest block, or rejects with an error.
++     */
++    __privateAdd(this, _getLatestBlock);
++    /**
++     * Retrieves and checks the latest block from the currently selected
++     * network; if the block has a `baseFeePerGas` property, then we know
++     * that the network supports EIP-1559; otherwise it doesn't.
++     *
++     * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility
++     * @returns A promise that resolves to `true` if the network supports EIP-1559,
++     * `false` otherwise, or `undefined` if unable to retrieve the last block.
++     */
++    __privateAdd(this, _determineEIP1559Compatibility);
++    /**
++     * Before accessing or switching the network, the registry of network clients
++     * needs to be populated. Otherwise, `#applyNetworkSelection` and
++     * `getNetworkClientRegistry` will throw an error. This method checks to see if the
++     * population step has happened yet, and if not, makes it happen.
++     *
++     * @returns The populated network client registry.
++     */
++    __privateAdd(this, _ensureAutoManagedNetworkClientRegistryPopulated);
++    /**
++     * Constructs the registry of network clients based on the set of built-in
++     * networks as well as the custom networks in state.
++     *
++     * @returns The network clients keyed by ID.
++     */
++    __privateAdd(this, _createAutoManagedNetworkClientRegistry);
++    /**
++     * Constructs the list of network clients for built-in networks (that is,
++     * the subset of the networks we know Infura supports that consumers do not
++     * need to explicitly add).
++     *
++     * @returns The network clients.
++     */
++    __privateAdd(this, _buildIdentifiedInfuraNetworkClientConfigurations);
++    /**
++     * Constructs the list of network clients for custom networks (that is, those
++     * which consumers have added via `networkConfigurations`).
++     *
++     * @returns The network clients.
++     */
++    __privateAdd(this, _buildIdentifiedCustomNetworkClientConfigurations);
++    /**
++     * Converts the provider config object in state to a network client
++     * configuration object.
++     *
++     * @returns The network client config.
++     * @throws If the provider config is of type "rpc" and lacks either a
++     * `chainId` or an `rpcUrl`.
++     */
++    __privateAdd(this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig);
++    /**
++     * Uses the information in the provider config object to look up a known and
++     * preinitialized network client. Once a network client is found, updates the
++     * provider and block tracker proxy to point to those from the network client,
++     * then finally creates an EthQuery that points to the provider proxy.
++     *
++     * @throws If no network client could be found matching the current provider
++     * config.
++     */
++    __privateAdd(this, _applyNetworkSelection);
++    __privateAdd(this, _ethQuery, void 0);
++    __privateAdd(this, _infuraProjectId, void 0);
++    __privateAdd(this, _trackMetaMetricsEvent, void 0);
++    __privateAdd(this, _previousProviderConfig, void 0);
++    __privateAdd(this, _providerProxy, void 0);
++    __privateAdd(this, _blockTrackerProxy, void 0);
++    __privateAdd(this, _autoManagedNetworkClientRegistry, void 0);
++    if (!infuraProjectId || typeof infuraProjectId !== "string") {
++      throw new Error("Invalid Infura project ID");
++    }
++    __privateSet(this, _infuraProjectId, infuraProjectId);
++    __privateSet(this, _trackMetaMetricsEvent, trackMetaMetricsEvent);
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getProviderConfig`,
++      () => {
++        return this.state.providerConfig;
++      }
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getEthQuery`,
++      () => {
++        return __privateGet(this, _ethQuery);
++      }
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getNetworkClientById`,
++      this.getNetworkClientById.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getEIP1559Compatibility`,
++      this.getEIP1559Compatibility.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:setActiveNetwork`,
++      this.setActiveNetwork.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:setProviderType`,
++      this.setProviderType.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:findNetworkClientIdByChainId`,
++      this.findNetworkClientIdByChainId.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getNetworkConfigurationByNetworkClientId`,
++      this.getNetworkConfigurationByNetworkClientId.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getSelectedNetworkClient`,
++      this.getSelectedNetworkClient.bind(this)
++    );
++    __privateSet(this, _previousProviderConfig, this.state.providerConfig);
++  }
++  /**
++   * Accesses the provider and block tracker for the currently selected network.
++   * @returns The proxy and block tracker proxies.
++   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.
++   */
++  getProviderAndBlockTracker() {
++    return {
++      provider: __privateGet(this, _providerProxy),
++      blockTracker: __privateGet(this, _blockTrackerProxy)
++    };
++  }
++  /**
++   * Accesses the provider and block tracker for the currently selected network.
++   *
++   * @returns an object with the provider and block tracker proxies for the currently selected network.
++   */
++  getSelectedNetworkClient() {
++    if (__privateGet(this, _providerProxy) && __privateGet(this, _blockTrackerProxy)) {
++      return {
++        provider: __privateGet(this, _providerProxy),
++        blockTracker: __privateGet(this, _blockTrackerProxy)
++      };
++    }
++    return void 0;
++  }
++  /**
++   * Returns all of the network clients that have been created so far, keyed by
++   * their identifier in the network client registry. This collection represents
++   * not only built-in networks but also any custom networks that consumers have
++   * added.
++   *
++   * @returns The list of known network clients.
++   */
++  getNetworkClientRegistry() {
++    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    return Object.assign(
++      {},
++      autoManagedNetworkClientRegistry["infura" /* Infura */],
++      autoManagedNetworkClientRegistry["custom" /* Custom */]
++    );
++  }
++  getNetworkClientById(networkClientId) {
++    if (!networkClientId) {
++      throw new Error("No network client ID was provided.");
++    }
++    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    if (isInfuraNetworkType(networkClientId)) {
++      const infuraNetworkClient = autoManagedNetworkClientRegistry["infura" /* Infura */][networkClientId];
++      if (!infuraNetworkClient) {
++        throw new Error(
++          `No Infura network client was found with the ID "${networkClientId}".`
++        );
++      }
++      return infuraNetworkClient;
++    }
++    const customNetworkClient = autoManagedNetworkClientRegistry["custom" /* Custom */][networkClientId];
++    if (!customNetworkClient) {
++      throw new Error(
++        `No custom network client was found with the ID "${networkClientId}".`
++      );
++    }
++    return customNetworkClient;
++  }
++  /**
++   * Populates the network clients and establishes the initial network based on
++   * the provider configuration in state.
++   */
++  async initializeProvider() {
++    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
++  }
++  /**
++   * Refreshes the network meta with EIP-1559 support and the network status
++   * based on the given network client ID.
++   *
++   * @param networkClientId - The ID of the network client to update.
++   */
++  async lookupNetworkByClientId(networkClientId) {
++    const isInfura = isInfuraNetworkType(networkClientId);
++    let updatedNetworkStatus;
++    let updatedIsEIP1559Compatible;
++    try {
++      updatedIsEIP1559Compatible = await __privateMethod(this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, networkClientId);
++      updatedNetworkStatus = "available" /* Available */;
++    } catch (error) {
++      if (isErrorWithCode(error)) {
++        let responseBody;
++        if (isInfura && hasProperty(error, "message") && typeof error.message === "string") {
++          try {
++            responseBody = JSON.parse(error.message);
++          } catch {
++          }
++        }
++        if (isPlainObject(responseBody) && responseBody.error === INFURA_BLOCKED_KEY) {
++          updatedNetworkStatus = "blocked" /* Blocked */;
++        } else if (error.code === errorCodes.rpc.internal) {
++          updatedNetworkStatus = "unknown" /* Unknown */;
++        } else {
++          updatedNetworkStatus = "unavailable" /* Unavailable */;
++        }
++      } else if (typeof Error !== "undefined" && hasProperty(error, "message") && typeof error.message === "string" && error.message.includes(
++        "No custom network client was found with the ID"
++      )) {
++        throw error;
++      } else {
++        log("NetworkController - could not determine network status", error);
++        updatedNetworkStatus = "unknown" /* Unknown */;
++      }
++    }
++    this.update((state) => {
++      if (state.networksMetadata[networkClientId] === void 0) {
++        state.networksMetadata[networkClientId] = {
++          status: "unknown" /* Unknown */,
++          EIPS: {}
++        };
++      }
++      const meta = state.networksMetadata[networkClientId];
++      meta.status = updatedNetworkStatus;
++      if (updatedIsEIP1559Compatible === void 0) {
++        delete meta.EIPS[1559];
++      } else {
++        meta.EIPS[1559] = updatedIsEIP1559Compatible;
++      }
++    });
++  }
++  /**
++   * Performs side effects after switching to a network. If the network is
++   * available, updates the network state with the network ID of the network and
++   * stores whether the network supports EIP-1559; otherwise clears said
++   * information about the network that may have been previously stored.
++   *
++   * @param networkClientId - (Optional) The ID of the network client to update.
++   * If no ID is provided, uses the currently selected network.
++   * @fires infuraIsBlocked if the network is Infura-supported and is blocking
++   * requests.
++   * @fires infuraIsUnblocked if the network is Infura-supported and is not
++   * blocking requests, or if the network is not Infura-supported.
++   */
++  async lookupNetwork(networkClientId) {
++    if (networkClientId) {
++      await this.lookupNetworkByClientId(networkClientId);
++      return;
++    }
++    if (!__privateGet(this, _ethQuery)) {
++      return;
++    }
++    const isInfura = isInfuraProviderConfig(this.state.providerConfig);
++    let networkChanged = false;
++    const listener = () => {
++      networkChanged = true;
++      this.messagingSystem.unsubscribe(
++        "NetworkController:networkDidChange",
++        listener
++      );
++    };
++    this.messagingSystem.subscribe(
++      "NetworkController:networkDidChange",
++      listener
++    );
++    let updatedNetworkStatus;
++    let updatedIsEIP1559Compatible;
++    try {
++      const isEIP1559Compatible = await __privateMethod(this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
++      updatedNetworkStatus = "available" /* Available */;
++      updatedIsEIP1559Compatible = isEIP1559Compatible;
++    } catch (error) {
++      if (isErrorWithCode(error)) {
++        let responseBody;
++        if (isInfura && hasProperty(error, "message") && typeof error.message === "string") {
++          try {
++            responseBody = JSON.parse(error.message);
++          } catch {
++          }
++        }
++        if (isPlainObject(responseBody) && responseBody.error === INFURA_BLOCKED_KEY) {
++          updatedNetworkStatus = "blocked" /* Blocked */;
++        } else if (error.code === errorCodes.rpc.internal) {
++          updatedNetworkStatus = "unknown" /* Unknown */;
++        } else {
++          updatedNetworkStatus = "unavailable" /* Unavailable */;
++        }
++      } else {
++        log("NetworkController - could not determine network status", error);
++        updatedNetworkStatus = "unknown" /* Unknown */;
++      }
++    }
++    if (networkChanged) {
++      return;
++    }
++    this.messagingSystem.unsubscribe(
++      "NetworkController:networkDidChange",
++      listener
++    );
++    this.update((state) => {
++      const meta = state.networksMetadata[state.selectedNetworkClientId];
++      meta.status = updatedNetworkStatus;
++      if (updatedIsEIP1559Compatible === void 0) {
++        delete meta.EIPS[1559];
++      } else {
++        meta.EIPS[1559] = updatedIsEIP1559Compatible;
++      }
++    });
++    if (isInfura) {
++      if (updatedNetworkStatus === "available" /* Available */) {
++        this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
++      } else if (updatedNetworkStatus === "blocked" /* Blocked */) {
++        this.messagingSystem.publish("NetworkController:infuraIsBlocked");
++      }
++    } else {
++      this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
++    }
++  }
++  /**
++   * Convenience method to update provider network type settings.
++   *
++   * @param type - Human readable network name.
++   * @deprecated This has been replaced by `setActiveNetwork`, and will be
++   * removed in a future release
++   */
++  async setProviderType(type) {
++    assert.notStrictEqual(
++      type,
++      NetworkType.rpc,
++      `NetworkController - cannot call "setProviderType" with type "${NetworkType.rpc}". Use "setActiveNetwork"`
++    );
++    assert.ok(
++      isInfuraNetworkType(type),
++      `Unknown Infura provider type "${type}".`
++    );
++    await this.setActiveNetwork(type);
++  }
++  /**
++   * Convenience method to update provider RPC settings.
++   *
++   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,
++   * or the type of a built-in network.
++   */
++  async setActiveNetwork(networkConfigurationIdOrType) {
++    __privateSet(this, _previousProviderConfig, this.state.providerConfig);
++    let targetNetwork;
++    if (isInfuraNetworkType(networkConfigurationIdOrType)) {
++      const ticker = NetworksTicker[networkConfigurationIdOrType];
++      targetNetwork = {
++        chainId: ChainId[networkConfigurationIdOrType],
++        id: void 0,
++        rpcPrefs: BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,
++        rpcUrl: void 0,
++        nickname: void 0,
++        ticker,
++        type: networkConfigurationIdOrType
++      };
++    } else {
++      if (!Object.keys(this.state.networkConfigurations).includes(
++        networkConfigurationIdOrType
++      )) {
++        throw new Error(
++          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`
++        );
++      }
++      targetNetwork = {
++        ...this.state.networkConfigurations[networkConfigurationIdOrType],
++        type: NetworkType.rpc
++      };
++    }
++    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    this.update((state) => {
++      state.providerConfig = targetNetwork;
++    });
++    await __privateMethod(this, _refreshNetwork, refreshNetwork_fn).call(this);
++  }
++  /**
++   * Determines whether the network supports EIP-1559 by checking whether the
++   * latest block has a `baseFeePerGas` property, then updates state
++   * appropriately.
++   *
++   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.
++   * @returns A promise that resolves to true if the network supports EIP-1559
++   * , false otherwise, or `undefined` if unable to determine the compatibility.
++   */
++  async getEIP1559Compatibility(networkClientId) {
++    if (networkClientId) {
++      return this.get1559CompatibilityWithNetworkClientId(networkClientId);
++    }
++    if (!__privateGet(this, _ethQuery)) {
++      return false;
++    }
++    const { EIPS } = this.state.networksMetadata[this.state.selectedNetworkClientId];
++    if (EIPS[1559] !== void 0) {
++      return EIPS[1559];
++    }
++    const isEIP1559Compatible = await __privateMethod(this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
++    this.update((state) => {
++      if (isEIP1559Compatible !== void 0) {
++        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] = isEIP1559Compatible;
++      }
++    });
++    return isEIP1559Compatible;
++  }
++  async get1559CompatibilityWithNetworkClientId(networkClientId) {
++    let metadata = this.state.networksMetadata[networkClientId];
++    if (metadata === void 0) {
++      await this.lookupNetwork(networkClientId);
++      metadata = this.state.networksMetadata[networkClientId];
++    }
++    const { EIPS } = metadata;
++    return EIPS[1559];
++  }
++  /**
++   * Re-initializes the provider and block tracker for the current network.
++   */
++  async resetConnection() {
++    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    await __privateMethod(this, _refreshNetwork, refreshNetwork_fn).call(this);
++  }
++  /**
++   * Returns a configuration object for the network identified by the given
++   * network client ID. If given an Infura network type, constructs one based on
++   * what we know about the network; otherwise attempts locates a network
++   * configuration in state that corresponds to the network client ID.
++   *
++   * @param networkClientId - The network client ID.
++   * @returns The configuration for the referenced network if one exists, or
++   * undefined otherwise.
++   */
++  getNetworkConfigurationByNetworkClientId(networkClientId) {
++    if (isInfuraNetworkType(networkClientId)) {
++      const rpcUrl = `https://${networkClientId}.infura.io/v3/${__privateGet(this, _infuraProjectId)}`;
++      return {
++        rpcUrl,
++        ...BUILT_IN_NETWORKS[networkClientId]
++      };
++    }
++    return this.state.networkConfigurations[networkClientId];
++  }
++  /**
++   * Adds a new custom network or updates the information for an existing
++   * network.
++   *
++   * This may involve updating the `networkConfigurations` property in
++   * state as well and/or adding a new network client to the network client
++   * registry. The `rpcUrl` and `chainId` of the given object are used to
++   * determine which action to take:
++   *
++   * - If the `rpcUrl` corresponds to an existing network configuration
++   * (case-insensitively), then it is overwritten with the object. Furthermore,
++   * if the `chainId` is different from the existing network configuration, then
++   * the existing network client is replaced with a new one.
++   * - If the `rpcUrl` does not correspond to an existing network configuration
++   * (case-insensitively), then the object is used to add a new network
++   * configuration along with a new network client.
++   *
++   * @param networkConfiguration - The network configuration to add or update.
++   * @param options - Additional configuration options.
++   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.
++   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).
++   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).
++   * @returns The ID for the added or updated network configuration.
++   */
++  async upsertNetworkConfiguration(networkConfiguration, {
++    referrer,
++    source,
++    setActive = false
++  }) {
++    const sanitizedNetworkConfiguration = pick(networkConfiguration, [
++      "rpcUrl",
++      "chainId",
++      "ticker",
++      "nickname",
++      "rpcPrefs",
++      "id"
++    ]);
++    const { rpcUrl, chainId, ticker, id } = sanitizedNetworkConfiguration;
++    assertIsStrictHexString(chainId);
++    if (!isSafeChainId(chainId)) {
++      throw new Error(
++        `Invalid chain ID "${chainId}": numerical value greater than max safe value.`
++      );
++    }
++    if (!rpcUrl) {
++      throw new Error(
++        "An rpcUrl is required to add or update network configuration"
++      );
++    }
++    if (!referrer || !source) {
++      throw new Error(
++        "referrer and source are required arguments for adding or updating a network configuration"
++      );
++    }
++    try {
++      new URL(rpcUrl);
++    } catch (e) {
++      if (e.message.includes("Invalid URL")) {
++        throw new Error("rpcUrl must be a valid URL");
++      }
++    }
++    if (!ticker) {
++      throw new Error(
++        "A ticker is required to add or update networkConfiguration"
++      );
++    }
++    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    const existingNetworkConfigurationWithId = Object.values(
++      this.state.networkConfigurations
++    ).find((networkConfig) => networkConfig.id === id);
++    if (id && !existingNetworkConfigurationWithId) {
++      throw new Error("No network configuration matches the provided id");
++    }
++    const existingNetworkConfigurationWithRpcUrl = Object.values(
++      this.state.networkConfigurations
++    ).find(
++      (networkConfig) => networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase()
++    );
++    if (id && existingNetworkConfigurationWithRpcUrl && existingNetworkConfigurationWithRpcUrl.id !== id) {
++      throw new Error(
++        "A different network configuration already exists with the provided rpcUrl"
++      );
++    }
++    const existingNetworkConfiguration = existingNetworkConfigurationWithId ?? existingNetworkConfigurationWithRpcUrl;
++    const upsertedNetworkConfigurationId = existingNetworkConfiguration ? existingNetworkConfiguration.id : random();
++    const networkClientId = buildCustomNetworkClientId(
++      upsertedNetworkConfigurationId
++    );
++    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
++    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
++    const shouldDestroyExistingNetworkClient = existingAutoManagedNetworkClient && existingAutoManagedNetworkClient.configuration.chainId !== chainId;
++    if (shouldDestroyExistingNetworkClient) {
++      existingAutoManagedNetworkClient.destroy();
++    }
++    if (!existingAutoManagedNetworkClient || shouldDestroyExistingNetworkClient) {
++      customNetworkClientRegistry[networkClientId] = createAutoManagedNetworkClient({
++        type: "custom" /* Custom */,
++        chainId,
++        rpcUrl,
++        ticker
++      });
++    }
++    this.update((state) => {
++      state.networkConfigurations[upsertedNetworkConfigurationId] = {
++        // Core PR: https://github.com/MetaMask/core/pull/4614
++        // Core Patch Branch: jl/network-controller@18.1.2-patch
++        ...sanitizedNetworkConfiguration,
++        id: upsertedNetworkConfigurationId
++      };
++    });
++    if (!existingNetworkConfiguration) {
++      __privateGet(this, _trackMetaMetricsEvent).call(this, {
++        event: "Custom Network Added",
++        category: "Network",
++        referrer: {
++          url: referrer
++        },
++        properties: {
++          chain_id: chainId,
++          symbol: ticker,
++          source
++        }
++      });
++    }
++    if (setActive) {
++      await this.setActiveNetwork(upsertedNetworkConfigurationId);
++    }
++    return upsertedNetworkConfigurationId;
++  }
++  /**
++   * Removes a custom network from state.
++   *
++   * This involves updating the `networkConfigurations` property in state as
++   * well and removing the network client that corresponds to the network from
++   * the client registry.
++   *
++   * @param networkConfigurationId - The ID of an existing network
++   * configuration.
++   */
++  removeNetworkConfiguration(networkConfigurationId) {
++    if (!this.state.networkConfigurations[networkConfigurationId]) {
++      throw new Error(
++        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`
++      );
++    }
++    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);
++    this.update((state) => {
++      delete state.networkConfigurations[networkConfigurationId];
++    });
++    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
++    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
++    existingAutoManagedNetworkClient.destroy();
++    delete customNetworkClientRegistry[networkClientId];
++  }
++  /**
++   * Switches to the previously selected network, assuming that there is one
++   * (if not and `initializeProvider` has not been previously called, then this
++   * method is equivalent to calling `resetConnection`).
++   */
++  async rollbackToPreviousProvider() {
++    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    this.update((state) => {
++      state.providerConfig = __privateGet(this, _previousProviderConfig);
++    });
++    await __privateMethod(this, _refreshNetwork, refreshNetwork_fn).call(this);
++  }
++  /**
++   * Deactivates the controller, stopping any ongoing polling.
++   *
++   * In-progress requests will not be aborted.
++   */
++  async destroy() {
++    await __privateGet(this, _blockTrackerProxy)?.destroy();
++  }
++  /**
++   * Updates the controller using the given backup data.
++   *
++   * @param backup - The data that has been backed up.
++   * @param backup.networkConfigurations - Network configurations in the backup.
++   */
++  loadBackup({
++    networkConfigurations
++  }) {
++    this.update((state) => {
++      state.networkConfigurations = {
++        ...state.networkConfigurations,
++        ...networkConfigurations
++      };
++    });
++  }
++  /**
++   * Searches for a network configuration ID with the given ChainID and returns it.
++   *
++   * @param chainId - ChainId to search for
++   * @returns networkClientId of the network configuration with the given chainId
++   */
++  findNetworkClientIdByChainId(chainId) {
++    const networkClients = this.getNetworkClientRegistry();
++    const networkClientEntry = Object.entries(networkClients).find(
++      ([_, networkClient]) => networkClient.configuration.chainId === chainId
++    );
++    if (networkClientEntry === void 0) {
++      throw new Error("Couldn't find networkClientId for chainId");
++    }
++    return networkClientEntry[0];
++  }
++};
++_ethQuery = new WeakMap();
++_infuraProjectId = new WeakMap();
++_trackMetaMetricsEvent = new WeakMap();
++_previousProviderConfig = new WeakMap();
++_providerProxy = new WeakMap();
++_blockTrackerProxy = new WeakMap();
++_autoManagedNetworkClientRegistry = new WeakMap();
++_refreshNetwork = new WeakSet();
++refreshNetwork_fn = async function() {
++  this.messagingSystem.publish(
++    "NetworkController:networkWillChange",
++    this.state
++  );
++  __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
++  this.messagingSystem.publish(
++    "NetworkController:networkDidChange",
++    this.state
++  );
++  await this.lookupNetwork();
++};
++_getLatestBlock = new WeakSet();
++getLatestBlock_fn = function(networkClientId) {
++  if (networkClientId === void 0) {
++    networkClientId = this.state.selectedNetworkClientId;
++  }
++  const networkClient = this.getNetworkClientById(networkClientId);
++  const ethQuery = new EthQuery(networkClient.provider);
++  return new Promise((resolve, reject) => {
++    ethQuery.sendAsync(
++      { method: "eth_getBlockByNumber", params: ["latest", false] },
++      (error, block) => {
++        if (error) {
++          reject(error);
++        } else {
++          resolve(block);
++        }
++      }
++    );
++  });
++};
++_determineEIP1559Compatibility = new WeakSet();
++determineEIP1559Compatibility_fn = async function(networkClientId) {
++  const latestBlock = await __privateMethod(this, _getLatestBlock, getLatestBlock_fn).call(this, networkClientId);
++  if (!latestBlock) {
++    return void 0;
++  }
++  return latestBlock.baseFeePerGas !== void 0;
++};
++_ensureAutoManagedNetworkClientRegistryPopulated = new WeakSet();
++ensureAutoManagedNetworkClientRegistryPopulated_fn = function() {
++  const autoManagedNetworkClientRegistry = __privateGet(this, _autoManagedNetworkClientRegistry) ?? __privateMethod(this, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn).call(this);
++  __privateSet(this, _autoManagedNetworkClientRegistry, autoManagedNetworkClientRegistry);
++  return autoManagedNetworkClientRegistry;
++};
++_createAutoManagedNetworkClientRegistry = new WeakSet();
++createAutoManagedNetworkClientRegistry_fn = function() {
++  return [
++    ...__privateMethod(this, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn).call(this),
++    ...__privateMethod(this, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn).call(this),
++    ...__privateMethod(this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn).call(this)
++  ].reduce(
++    (registry, [networkClientType, networkClientId, networkClientConfiguration]) => {
++      const autoManagedNetworkClient = createAutoManagedNetworkClient(
++        networkClientConfiguration
++      );
++      if (networkClientId in registry[networkClientType]) {
++        return registry;
++      }
++      return {
++        ...registry,
++        [networkClientType]: {
++          ...registry[networkClientType],
++          [networkClientId]: autoManagedNetworkClient
++        }
++      };
++    },
++    {
++      ["infura" /* Infura */]: {},
++      ["custom" /* Custom */]: {}
++    }
++  );
++};
++_buildIdentifiedInfuraNetworkClientConfigurations = new WeakSet();
++buildIdentifiedInfuraNetworkClientConfigurations_fn = function() {
++  return knownKeysOf(InfuraNetworkType).map((network) => {
++    const networkClientId = buildInfuraNetworkClientId(network);
++    const networkClientConfiguration = {
++      type: "infura" /* Infura */,
++      network,
++      infuraProjectId: __privateGet(this, _infuraProjectId),
++      chainId: BUILT_IN_NETWORKS[network].chainId,
++      ticker: BUILT_IN_NETWORKS[network].ticker
++    };
++    return [
++      "infura" /* Infura */,
++      networkClientId,
++      networkClientConfiguration
++    ];
++  });
++};
++_buildIdentifiedCustomNetworkClientConfigurations = new WeakSet();
++buildIdentifiedCustomNetworkClientConfigurations_fn = function() {
++  return Object.entries(this.state.networkConfigurations).map(
++    ([networkConfigurationId, networkConfiguration]) => {
++      if (networkConfiguration.chainId === void 0) {
++        throw new Error("chainId must be provided for custom RPC endpoints");
++      }
++      if (networkConfiguration.rpcUrl === void 0) {
++        throw new Error("rpcUrl must be provided for custom RPC endpoints");
++      }
++      const networkClientId = buildCustomNetworkClientId(
++        networkConfigurationId
++      );
++      const networkClientConfiguration = {
++        type: "custom" /* Custom */,
++        chainId: networkConfiguration.chainId,
++        rpcUrl: networkConfiguration.rpcUrl,
++        ticker: networkConfiguration.ticker
++      };
++      return [
++        "custom" /* Custom */,
++        networkClientId,
++        networkClientConfiguration
++      ];
++    }
++  );
++};
++_buildIdentifiedNetworkClientConfigurationsFromProviderConfig = new WeakSet();
++buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn = function() {
++  const { providerConfig } = this.state;
++  if (isCustomProviderConfig(providerConfig)) {
++    validateCustomProviderConfig(providerConfig);
++    const networkClientId = buildCustomNetworkClientId(
++      providerConfig,
++      this.state.networkConfigurations
++    );
++    const networkClientConfiguration = {
++      chainId: providerConfig.chainId,
++      rpcUrl: providerConfig.rpcUrl,
++      type: "custom" /* Custom */,
++      ticker: providerConfig.ticker
++    };
++    return [
++      ["custom" /* Custom */, networkClientId, networkClientConfiguration]
++    ];
++  }
++  if (isInfuraProviderConfig(providerConfig)) {
++    return [];
++  }
++  throw new Error(`Unrecognized network type: '${providerConfig.type}'`);
++};
++_applyNetworkSelection = new WeakSet();
++applyNetworkSelection_fn = function() {
++  if (!__privateGet(this, _autoManagedNetworkClientRegistry)) {
++    throw new Error(
++      "initializeProvider must be called first in order to switch the network"
++    );
++  }
++  const { providerConfig } = this.state;
++  let autoManagedNetworkClient;
++  let networkClientId;
++  if (isInfuraProviderConfig(providerConfig)) {
++    const networkClientType = "infura" /* Infura */;
++    networkClientId = buildInfuraNetworkClientId(providerConfig);
++    const builtInNetworkClientRegistry = __privateGet(this, _autoManagedNetworkClientRegistry)[networkClientType];
++    autoManagedNetworkClient = builtInNetworkClientRegistry[networkClientId];
++    if (!autoManagedNetworkClient) {
++      throw new Error(
++        `Could not find custom network matching ${networkClientId}`
++      );
++    }
++  } else if (isCustomProviderConfig(providerConfig)) {
++    validateCustomProviderConfig(providerConfig);
++    const networkClientType = "custom" /* Custom */;
++    networkClientId = buildCustomNetworkClientId(
++      providerConfig,
++      this.state.networkConfigurations
++    );
++    const customNetworkClientRegistry = __privateGet(this, _autoManagedNetworkClientRegistry)[networkClientType];
++    autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
++    if (!autoManagedNetworkClient) {
++      throw new Error(
++        `Could not find built-in network matching ${networkClientId}`
++      );
++    }
++  } else {
++    throw new Error("Could not determine type of provider config");
++  }
++  this.update((state) => {
++    state.selectedNetworkClientId = networkClientId;
++    if (state.networksMetadata[networkClientId] === void 0) {
++      state.networksMetadata[networkClientId] = {
++        status: "unknown" /* Unknown */,
++        EIPS: {}
++      };
++    }
++  });
++  const { provider, blockTracker } = autoManagedNetworkClient;
++  if (__privateGet(this, _providerProxy)) {
++    __privateGet(this, _providerProxy).setTarget(provider);
++  } else {
++    __privateSet(this, _providerProxy, createEventEmitterProxy(provider));
++  }
++  if (__privateGet(this, _blockTrackerProxy)) {
++    __privateGet(this, _blockTrackerProxy).setTarget(blockTracker);
++  } else {
++    __privateSet(this, _blockTrackerProxy, createEventEmitterProxy(blockTracker, {
++      eventFilter: "skipInternal"
++    }));
++  }
++  __privateSet(this, _ethQuery, new EthQuery(__privateGet(this, _providerProxy)));
++};
++
++export {
++  knownKeysOf,
++  defaultState,
++  NetworkController
++};
++//# sourceMappingURL=chunk-PQBSOEJ3.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-PQBSOEJ3.mjs.map b/dist/chunk-PQBSOEJ3.mjs.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..66bf4a8efa76956e684b30573a162f2942191425
+--- /dev/null
++++ b/dist/chunk-PQBSOEJ3.mjs.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/NetworkController.ts"],"sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport {\n  BUILT_IN_NETWORKS,\n  NetworksTicker,\n  ChainId,\n  InfuraNetworkType,\n  NetworkType,\n  isSafeChainId,\n  isInfuraNetworkType,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport { errorCodes } from '@metamask/rpc-errors';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { SwappableProxy } from '@metamask/swappable-obj-proxy';\nimport type { Hex } from '@metamask/utils';\nimport {\n  assertIsStrictHexString,\n  hasProperty,\n  isPlainObject,\n} from '@metamask/utils';\nimport { strict as assert } from 'assert';\nimport { v4 as random } from 'uuid';\n\nimport { INFURA_BLOCKED_KEY, NetworkStatus } from './constants';\nimport type {\n  AutoManagedNetworkClient,\n  ProxyWithAccessibleTarget,\n} from './create-auto-managed-network-client';\nimport { createAutoManagedNetworkClient } from './create-auto-managed-network-client';\nimport { projectLogger, createModuleLogger } from './logger';\nimport { NetworkClientType } from './types';\nimport type {\n  BlockTracker,\n  Provider,\n  CustomNetworkClientConfiguration,\n  InfuraNetworkClientConfiguration,\n  NetworkClientConfiguration,\n} from './types';\n\nconst log = createModuleLogger(projectLogger, 'NetworkController');\n\n/**\n * @type ProviderConfig\n *\n * Configuration passed to web3-provider-engine\n * @property rpcUrl - RPC target URL.\n * @property type - Human-readable network name.\n * @property chainId - Network ID as per EIP-155.\n * @property ticker - Currency ticker.\n * @property nickname - Personalized network name.\n * @property id - Network Configuration Id.\n */\nexport type ProviderConfig = {\n  rpcUrl?: string;\n  type: NetworkType;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: { blockExplorerUrl?: string };\n  id?: NetworkConfigurationId;\n};\n\nexport type Block = {\n  baseFeePerGas?: string;\n};\n\n/**\n * Information about a network not held by any other part of state.\n */\nexport type NetworkMetadata = {\n  /**\n   * EIPs supported by the network.\n   */\n  EIPS: {\n    [eipNumber: number]: boolean;\n  };\n  /**\n   * Indicates the availability of the network\n   */\n  status: NetworkStatus;\n};\n\n/**\n * Custom RPC network information\n *\n * @property rpcUrl - RPC target URL.\n * @property chainId - Network ID as per EIP-155\n * @property nickname - Personalized network name.\n * @property ticker - Currency ticker.\n * @property rpcPrefs - Personalized preferences.\n */\nexport type NetworkConfiguration = {\n  rpcUrl: string;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: {\n    blockExplorerUrl: string;\n  };\n};\n\n/**\n * The collection of network configurations in state.\n */\ntype NetworkConfigurations = Record<\n  NetworkConfigurationId,\n  NetworkConfiguration & { id: NetworkConfigurationId }\n>;\n\n/**\n * `Object.keys()` is intentionally generic: it returns the keys of an object,\n * but it cannot make guarantees about the contents of that object, so the type\n * of the keys is merely `string[]`. While this is technically accurate, it is\n * also unnecessary if we have an object that we own and whose contents are\n * known exactly.\n *\n * TODO: Move to @metamask/utils.\n *\n * @param object - The object.\n * @returns The keys of an object, typed according to the type of the object\n * itself.\n */\nexport function knownKeysOf<K extends PropertyKey>(\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  object: Partial<Record<K, any>>,\n) {\n  return Object.keys(object) as K[];\n}\n\n/**\n * Asserts that the given value is of the given type if the given validation\n * function returns a truthy result.\n *\n * @param value - The value to validate.\n * @param validate - A function used to validate that the value is of the given\n * type. Takes the `value` as an argument and is expected to return true or\n * false.\n * @param message - The message to throw if the function does not return a\n * truthy result.\n * @throws if the function does not return a truthy result.\n */\nfunction assertOfType<Type>(\n  value: unknown,\n  validate: (value: unknown) => boolean,\n  message: string,\n): asserts value is Type {\n  assert.ok(validate(value), message);\n}\n\n/**\n * Returns a portion of the given object with only the given keys.\n *\n * @param object - An object.\n * @param keys - The keys to pick from the object.\n * @returns the portion of the object.\n */\n// TODO: Replace `any` with type\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction pick<Obj extends Record<any, any>, Keys extends keyof Obj>(\n  object: Obj,\n  keys: Keys[],\n): Pick<Obj, Keys> {\n  const pickedObject = keys.reduce<Partial<Pick<Obj, Keys>>>(\n    (finalObject, key) => {\n      return { ...finalObject, [key]: object[key] };\n    },\n    {},\n  );\n  assertOfType<Pick<Obj, Keys>>(\n    pickedObject,\n    () => keys.every((key) => key in pickedObject),\n    'The reduce did not produce an object with all of the desired keys.',\n  );\n  return pickedObject;\n}\n\n/**\n * Type guard for determining whether the given value is an error object with a\n * `code` property, such as an instance of Error.\n *\n * TODO: Move this to @metamask/utils.\n *\n * @param error - The object to check.\n * @returns True if `error` has a `code`, false otherwise.\n */\nfunction isErrorWithCode(error: unknown): error is { code: string | number } {\n  return typeof error === 'object' && error !== null && 'code' in error;\n}\n\n/**\n * Builds an identifier for an Infura network client for lookup purposes.\n *\n * @param infuraNetworkOrProviderConfig - The name of an Infura network or a\n * provider config.\n * @returns The built identifier.\n */\nfunction buildInfuraNetworkClientId(\n  infuraNetworkOrProviderConfig:\n    | InfuraNetworkType\n    | (ProviderConfig & { type: InfuraNetworkType }),\n): BuiltInNetworkClientId {\n  if (typeof infuraNetworkOrProviderConfig === 'string') {\n    return infuraNetworkOrProviderConfig;\n  }\n  return infuraNetworkOrProviderConfig.type;\n}\n\n/**\n * Builds an identifier for a custom network client for lookup purposes.\n *\n * @param args - This function can be called two ways:\n * 1. The ID of a network configuration.\n * 2. A provider config and a set of network configurations.\n * @returns The built identifier.\n */\nfunction buildCustomNetworkClientId(\n  ...args:\n    | [NetworkConfigurationId]\n    | [\n        ProviderConfig & { type: typeof NetworkType.rpc; rpcUrl: string },\n        NetworkConfigurations,\n      ]\n): CustomNetworkClientId {\n  if (args.length === 1) {\n    return args[0];\n  }\n  const [{ id, rpcUrl }, networkConfigurations] = args;\n  if (id === undefined) {\n    const matchingNetworkConfiguration = Object.values(\n      networkConfigurations,\n    ).find((networkConfiguration) => {\n      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();\n    });\n    if (matchingNetworkConfiguration) {\n      return matchingNetworkConfiguration.id;\n    }\n    return rpcUrl.toLowerCase();\n  }\n  return id;\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isInfuraProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: InfuraNetworkType } {\n  return isInfuraNetworkType(providerConfig.type);\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isCustomProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: typeof NetworkType.rpc } {\n  return providerConfig.type === NetworkType.rpc;\n}\n\n/**\n * As a provider config represents the settings that are used to interface with\n * an RPC endpoint, it must have both a chain ID and an RPC URL if it represents\n * a custom network. These properties _should_ be set as they are validated in\n * the UI when a user adds a custom network, but just to be safe we validate\n * them here.\n *\n * In addition, historically the `rpcUrl` property on the ProviderConfig type\n * has been optional, even though it should not be. Making this non-optional\n * would be a breaking change, so this function types the provider config\n * correctly so that we don't have to check `rpcUrl` in other places.\n *\n * @param providerConfig - A provider config.\n * @throws if the provider config does not have a chain ID or an RPC URL.\n */\nfunction validateCustomProviderConfig(\n  providerConfig: ProviderConfig & { type: typeof NetworkType.rpc },\n): asserts providerConfig is typeof providerConfig & { rpcUrl: string } {\n  if (providerConfig.chainId === undefined) {\n    throw new Error('chainId must be provided for custom RPC endpoints');\n  }\n  if (providerConfig.rpcUrl === undefined) {\n    throw new Error('rpcUrl must be provided for custom RPC endpoints');\n  }\n}\n/**\n * The string that uniquely identifies an Infura network client.\n */\nexport type BuiltInNetworkClientId = InfuraNetworkType;\n\n/**\n * The string that uniquely identifies a custom network client.\n */\nexport type CustomNetworkClientId = string;\n\n/**\n * The string that uniquely identifies a network client.\n */\nexport type NetworkClientId = BuiltInNetworkClientId | CustomNetworkClientId;\n\n/**\n * Information about networks not held by any other part of state.\n */\nexport type NetworksMetadata = {\n  [networkClientId: NetworkClientId]: NetworkMetadata;\n};\n\n/**\n * @type NetworkState\n *\n * Network controller state\n * @property providerConfig - RPC URL and network name provider settings of the currently connected network\n * @property properties - an additional set of network properties for the currently connected network\n * @property networkConfigurations - the full list of configured networks either preloaded or added by the user.\n */\nexport type NetworkState = {\n  selectedNetworkClientId: NetworkClientId;\n  providerConfig: ProviderConfig;\n  networkConfigurations: NetworkConfigurations;\n  networksMetadata: NetworksMetadata;\n};\n\nconst name = 'NetworkController';\n\n/**\n * Represents the block tracker for the currently selected network. (Note that\n * this is a proxy around a proxy: the inner one exists so that the block\n * tracker doesn't have to exist until it's used, and the outer one exists so\n * that the currently selected network can change without consumers needing to\n * refresh the object reference to that network.)\n */\nexport type BlockTrackerProxy = SwappableProxy<\n  ProxyWithAccessibleTarget<BlockTracker>\n>;\n\n/**\n * Represents the provider for the currently selected network. (Note that this\n * is a proxy around a proxy: the inner one exists so that the provider doesn't\n * have to exist until it's used, and the outer one exists so that the currently\n * selected network can change without consumers needing to refresh the object\n * reference to that network.)\n */\nexport type ProviderProxy = SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n\nexport type NetworkControllerStateChangeEvent = ControllerStateChangeEvent<\n  typeof name,\n  NetworkState\n>;\n\n/**\n * `networkWillChange` is published when the current network is about to be\n * switched, but the new provider has not been created and no state changes have\n * occurred yet.\n */\nexport type NetworkControllerNetworkWillChangeEvent = {\n  type: 'NetworkController:networkWillChange';\n  payload: [NetworkState];\n};\n\n/**\n * `networkDidChange` is published after a provider has been created for a newly\n * switched network (but before the network has been confirmed to be available).\n */\nexport type NetworkControllerNetworkDidChangeEvent = {\n  type: 'NetworkController:networkDidChange';\n  payload: [NetworkState];\n};\n\n/**\n * `infuraIsBlocked` is published after the network is switched to an Infura\n * network, but when Infura returns an error blocking the user based on their\n * location.\n */\nexport type NetworkControllerInfuraIsBlockedEvent = {\n  type: 'NetworkController:infuraIsBlocked';\n  payload: [];\n};\n\n/**\n * `infuraIsBlocked` is published either after the network is switched to an\n * Infura network and Infura does not return an error blocking the user based on\n * their location, or the network is switched to a non-Infura network.\n */\nexport type NetworkControllerInfuraIsUnblockedEvent = {\n  type: 'NetworkController:infuraIsUnblocked';\n  payload: [];\n};\n\nexport type NetworkControllerEvents =\n  | NetworkControllerStateChangeEvent\n  | NetworkControllerNetworkWillChangeEvent\n  | NetworkControllerNetworkDidChangeEvent\n  | NetworkControllerInfuraIsBlockedEvent\n  | NetworkControllerInfuraIsUnblockedEvent;\n\nexport type NetworkControllerGetStateAction = ControllerGetStateAction<\n  typeof name,\n  NetworkState\n>;\n\nexport type NetworkControllerGetProviderConfigAction = {\n  type: `NetworkController:getProviderConfig`;\n  handler: () => ProviderConfig;\n};\n\nexport type NetworkControllerGetEthQueryAction = {\n  type: `NetworkController:getEthQuery`;\n  handler: () => EthQuery | undefined;\n};\n\nexport type NetworkControllerGetNetworkClientByIdAction = {\n  type: `NetworkController:getNetworkClientById`;\n  handler: NetworkController['getNetworkClientById'];\n};\n\nexport type NetworkControllerGetSelectedNetworkClientAction = {\n  type: `NetworkController:getSelectedNetworkClient`;\n  handler: NetworkController['getSelectedNetworkClient'];\n};\n\nexport type NetworkControllerGetEIP1559CompatibilityAction = {\n  type: `NetworkController:getEIP1559Compatibility`;\n  handler: NetworkController['getEIP1559Compatibility'];\n};\n\nexport type NetworkControllerFindNetworkClientIdByChainIdAction = {\n  type: `NetworkController:findNetworkClientIdByChainId`;\n  handler: NetworkController['findNetworkClientIdByChainId'];\n};\n\n/**\n * Change the currently selected network to the given built-in network type.\n *\n * @deprecated This action has been replaced by `setActiveNetwork`, and will be\n * removed in a future release.\n */\nexport type NetworkControllerSetProviderTypeAction = {\n  type: `NetworkController:setProviderType`;\n  handler: NetworkController['setProviderType'];\n};\n\nexport type NetworkControllerSetActiveNetworkAction = {\n  type: `NetworkController:setActiveNetwork`;\n  handler: NetworkController['setActiveNetwork'];\n};\n\nexport type NetworkControllerGetNetworkConfigurationByNetworkClientId = {\n  type: `NetworkController:getNetworkConfigurationByNetworkClientId`;\n  handler: NetworkController['getNetworkConfigurationByNetworkClientId'];\n};\n\nexport type NetworkControllerActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetProviderConfigAction\n  | NetworkControllerGetEthQueryAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetEIP1559CompatibilityAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | NetworkControllerSetActiveNetworkAction\n  | NetworkControllerSetProviderTypeAction\n  | NetworkControllerGetNetworkConfigurationByNetworkClientId;\n\nexport type NetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof name,\n  NetworkControllerActions,\n  NetworkControllerEvents,\n  never,\n  never\n>;\n\nexport type NetworkControllerOptions = {\n  messenger: NetworkControllerMessenger;\n  trackMetaMetricsEvent: () => void;\n  infuraProjectId: string;\n  state?: Partial<NetworkState>;\n};\n\nexport const defaultState: NetworkState = {\n  selectedNetworkClientId: NetworkType.mainnet,\n  providerConfig: {\n    type: NetworkType.mainnet,\n    chainId: ChainId.mainnet,\n    ticker: NetworksTicker.mainnet,\n  },\n  networksMetadata: {},\n  networkConfigurations: {},\n};\n\ntype MetaMetricsEventPayload = {\n  event: string;\n  category: string;\n  referrer?: { url: string };\n  actionId?: number;\n  environmentType?: string;\n  properties?: unknown;\n  sensitiveProperties?: unknown;\n  revenue?: number;\n  currency?: string;\n  value?: number;\n};\n\ntype NetworkConfigurationId = string;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedBuiltInNetworkClientRegistry = Record<\n  BuiltInNetworkClientId,\n  AutoManagedNetworkClient<InfuraNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedCustomNetworkClientRegistry = Record<\n  CustomNetworkClientId,\n  AutoManagedNetworkClient<CustomNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks\n * as well as custom networks that users have added.\n */\ntype AutoManagedNetworkClientRegistry = {\n  [NetworkClientType.Infura]: AutoManagedBuiltInNetworkClientRegistry;\n  [NetworkClientType.Custom]: AutoManagedCustomNetworkClientRegistry;\n};\n\n/**\n * Controller that creates and manages an Ethereum network provider.\n */\nexport class NetworkController extends BaseController<\n  typeof name,\n  NetworkState,\n  NetworkControllerMessenger\n> {\n  #ethQuery?: EthQuery;\n\n  #infuraProjectId: string;\n\n  #trackMetaMetricsEvent: (event: MetaMetricsEventPayload) => void;\n\n  #previousProviderConfig: ProviderConfig;\n\n  #providerProxy: ProviderProxy | undefined;\n\n  #blockTrackerProxy: BlockTrackerProxy | undefined;\n\n  #autoManagedNetworkClientRegistry?: AutoManagedNetworkClientRegistry;\n\n  constructor({\n    messenger,\n    state,\n    infuraProjectId,\n    trackMetaMetricsEvent,\n  }: NetworkControllerOptions) {\n    super({\n      name,\n      metadata: {\n        selectedNetworkClientId: {\n          persist: true,\n          anonymous: false,\n        },\n        networksMetadata: {\n          persist: true,\n          anonymous: false,\n        },\n        providerConfig: {\n          persist: true,\n          anonymous: false,\n        },\n        networkConfigurations: {\n          persist: true,\n          anonymous: false,\n        },\n      },\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    if (!infuraProjectId || typeof infuraProjectId !== 'string') {\n      throw new Error('Invalid Infura project ID');\n    }\n    this.#infuraProjectId = infuraProjectId;\n    this.#trackMetaMetricsEvent = trackMetaMetricsEvent;\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getProviderConfig`,\n      () => {\n        return this.state.providerConfig;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEthQuery`,\n      () => {\n        return this.#ethQuery;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkClientById`,\n      this.getNetworkClientById.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEIP1559Compatibility`,\n      this.getEIP1559Compatibility.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setActiveNetwork`,\n      this.setActiveNetwork.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setProviderType`,\n      this.setProviderType.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:findNetworkClientIdByChainId`,\n      this.findNetworkClientIdByChainId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkConfigurationByNetworkClientId`,\n      this.getNetworkConfigurationByNetworkClientId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getSelectedNetworkClient`,\n      this.getSelectedNetworkClient.bind(this),\n    );\n\n    this.#previousProviderConfig = this.state.providerConfig;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   * @returns The proxy and block tracker proxies.\n   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.\n   */\n  getProviderAndBlockTracker(): {\n    provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>> | undefined;\n    blockTracker:\n      | SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>\n      | undefined;\n  } {\n    return {\n      provider: this.#providerProxy,\n      blockTracker: this.#blockTrackerProxy,\n    };\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @returns an object with the provider and block tracker proxies for the currently selected network.\n   */\n  getSelectedNetworkClient():\n    | {\n        provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n        blockTracker: SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>;\n      }\n    | undefined {\n    if (this.#providerProxy && this.#blockTrackerProxy) {\n      return {\n        provider: this.#providerProxy,\n        blockTracker: this.#blockTrackerProxy,\n      };\n    }\n    return undefined;\n  }\n\n  /**\n   * Returns all of the network clients that have been created so far, keyed by\n   * their identifier in the network client registry. This collection represents\n   * not only built-in networks but also any custom networks that consumers have\n   * added.\n   *\n   * @returns The list of known network clients.\n   */\n  getNetworkClientRegistry(): AutoManagedBuiltInNetworkClientRegistry &\n    AutoManagedCustomNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    return Object.assign(\n      {},\n      autoManagedNetworkClientRegistry[NetworkClientType.Infura],\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom],\n    );\n  }\n\n  /**\n   * Returns the Infura network client with the given ID.\n   *\n   * @param infuraNetworkClientId - An Infura network client ID.\n   * @returns The Infura network client.\n   * @throws If an Infura network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    infuraNetworkClientId: BuiltInNetworkClientId,\n  ): AutoManagedNetworkClient<InfuraNetworkClientConfiguration>;\n\n  /**\n   * Returns the custom network client with the given ID.\n   *\n   * @param customNetworkClientId - A custom network client ID.\n   * @returns The custom network client.\n   * @throws If a custom network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    customNetworkClientId: CustomNetworkClientId,\n  ): AutoManagedNetworkClient<CustomNetworkClientConfiguration>;\n\n  getNetworkClientById(\n    networkClientId: NetworkClientId,\n  ): AutoManagedNetworkClient<NetworkClientConfiguration> {\n    if (!networkClientId) {\n      throw new Error('No network client ID was provided.');\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    if (isInfuraNetworkType(networkClientId)) {\n      const infuraNetworkClient =\n        autoManagedNetworkClientRegistry[NetworkClientType.Infura][\n          networkClientId\n        ];\n      if (!infuraNetworkClient) {\n        throw new Error(\n          `No Infura network client was found with the ID \"${networkClientId}\".`,\n        );\n      }\n      return infuraNetworkClient;\n    }\n\n    const customNetworkClient =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom][\n        networkClientId\n      ];\n    if (!customNetworkClient) {\n      throw new Error(\n        `No custom network client was found with the ID \"${networkClientId}\".`,\n      );\n    }\n    return customNetworkClient;\n  }\n\n  /**\n   * Executes a series of steps to apply the changes to the provider config:\n   *\n   * 1. Notifies subscribers that the network is about to change.\n   * 2. Looks up a known and preinitialized network client matching the provider\n   * config and re-points the provider and block tracker proxy to it.\n   * 3. Notifies subscribers that the network has changed.\n   */\n  async #refreshNetwork() {\n    this.messagingSystem.publish(\n      'NetworkController:networkWillChange',\n      this.state,\n    );\n    this.#applyNetworkSelection();\n    this.messagingSystem.publish(\n      'NetworkController:networkDidChange',\n      this.state,\n    );\n    await this.lookupNetwork();\n  }\n\n  /**\n   * Populates the network clients and establishes the initial network based on\n   * the provider configuration in state.\n   */\n  async initializeProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.#applyNetworkSelection();\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    // await this.lookupNetwork();\n  }\n\n  /**\n   * Refreshes the network meta with EIP-1559 support and the network status\n   * based on the given network client ID.\n   *\n   * @param networkClientId - The ID of the network client to update.\n   */\n  async lookupNetworkByClientId(networkClientId: NetworkClientId) {\n    const isInfura = isInfuraNetworkType(networkClientId);\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      updatedIsEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        networkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else if (\n        typeof Error !== 'undefined' &&\n        hasProperty(error as unknown as Error, 'message') &&\n        typeof (error as unknown as Error).message === 'string' &&\n        (error as unknown as Error).message.includes(\n          'No custom network client was found with the ID',\n        )\n      ) {\n        throw error;\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n    this.update((state) => {\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n      const meta = state.networksMetadata[networkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n  }\n\n  /**\n   * Performs side effects after switching to a network. If the network is\n   * available, updates the network state with the network ID of the network and\n   * stores whether the network supports EIP-1559; otherwise clears said\n   * information about the network that may have been previously stored.\n   *\n   * @param networkClientId - (Optional) The ID of the network client to update.\n   * If no ID is provided, uses the currently selected network.\n   * @fires infuraIsBlocked if the network is Infura-supported and is blocking\n   * requests.\n   * @fires infuraIsUnblocked if the network is Infura-supported and is not\n   * blocking requests, or if the network is not Infura-supported.\n   */\n  async lookupNetwork(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      await this.lookupNetworkByClientId(networkClientId);\n      return;\n    }\n\n    if (!this.#ethQuery) {\n      return;\n    }\n\n    const isInfura = isInfuraProviderConfig(this.state.providerConfig);\n\n    let networkChanged = false;\n    const listener = () => {\n      networkChanged = true;\n      this.messagingSystem.unsubscribe(\n        'NetworkController:networkDidChange',\n        listener,\n      );\n    };\n    this.messagingSystem.subscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        this.state.selectedNetworkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n      updatedIsEIP1559Compatible = isEIP1559Compatible;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n\n    if (networkChanged) {\n      // If the network has changed, then `lookupNetwork` either has been or is\n      // in the process of being called, so we don't need to go further.\n      return;\n    }\n    this.messagingSystem.unsubscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    this.update((state) => {\n      const meta = state.networksMetadata[state.selectedNetworkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n\n    if (isInfura) {\n      if (updatedNetworkStatus === NetworkStatus.Available) {\n        this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n      } else if (updatedNetworkStatus === NetworkStatus.Blocked) {\n        this.messagingSystem.publish('NetworkController:infuraIsBlocked');\n      }\n    } else {\n      // Always publish infuraIsUnblocked regardless of network status to\n      // prevent consumers from being stuck in a blocked state if they were\n      // previously connected to an Infura network that was blocked\n      this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n    }\n  }\n\n  /**\n   * Convenience method to update provider network type settings.\n   *\n   * @param type - Human readable network name.\n   * @deprecated This has been replaced by `setActiveNetwork`, and will be\n   * removed in a future release\n   */\n  async setProviderType(type: InfuraNetworkType) {\n    assert.notStrictEqual(\n      type,\n      NetworkType.rpc,\n      `NetworkController - cannot call \"setProviderType\" with type \"${NetworkType.rpc}\". Use \"setActiveNetwork\"`,\n    );\n    assert.ok(\n      isInfuraNetworkType(type),\n      `Unknown Infura provider type \"${type}\".`,\n    );\n\n    await this.setActiveNetwork(type);\n  }\n\n  /**\n   * Convenience method to update provider RPC settings.\n   *\n   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,\n   * or the type of a built-in network.\n   */\n  async setActiveNetwork(networkConfigurationIdOrType: string) {\n    this.#previousProviderConfig = this.state.providerConfig;\n\n    let targetNetwork: ProviderConfig;\n    if (isInfuraNetworkType(networkConfigurationIdOrType)) {\n      const ticker = NetworksTicker[networkConfigurationIdOrType];\n\n      targetNetwork = {\n        chainId: ChainId[networkConfigurationIdOrType],\n        id: undefined,\n        rpcPrefs: BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,\n        rpcUrl: undefined,\n        nickname: undefined,\n        ticker,\n        type: networkConfigurationIdOrType,\n      };\n    } else {\n      if (\n        !Object.keys(this.state.networkConfigurations).includes(\n          networkConfigurationIdOrType,\n        )\n      ) {\n        throw new Error(\n          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`,\n        );\n      }\n      targetNetwork = {\n        ...this.state.networkConfigurations[networkConfigurationIdOrType],\n        type: NetworkType.rpc,\n      };\n    }\n\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = targetNetwork;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Fetches the latest block for the network.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.\n   * @returns A promise that either resolves to the block header or null if\n   * there is no latest block, or rejects with an error.\n   */\n  #getLatestBlock(networkClientId: NetworkClientId): Promise<Block> {\n    if (networkClientId === undefined) {\n      networkClientId = this.state.selectedNetworkClientId;\n    }\n\n    const networkClient = this.getNetworkClientById(networkClientId);\n    const ethQuery = new EthQuery(networkClient.provider);\n\n    return new Promise((resolve, reject) => {\n      ethQuery.sendAsync(\n        { method: 'eth_getBlockByNumber', params: ['latest', false] },\n        (error: unknown, block?: unknown) => {\n          if (error) {\n            reject(error);\n          } else {\n            // TODO: Validate this type\n            resolve(block as Block);\n          }\n        },\n      );\n    });\n  }\n\n  /**\n   * Determines whether the network supports EIP-1559 by checking whether the\n   * latest block has a `baseFeePerGas` property, then updates state\n   * appropriately.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.\n   * @returns A promise that resolves to true if the network supports EIP-1559\n   * , false otherwise, or `undefined` if unable to determine the compatibility.\n   */\n  async getEIP1559Compatibility(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      return this.get1559CompatibilityWithNetworkClientId(networkClientId);\n    }\n    if (!this.#ethQuery) {\n      return false;\n    }\n\n    const { EIPS } =\n      this.state.networksMetadata[this.state.selectedNetworkClientId];\n\n    if (EIPS[1559] !== undefined) {\n      return EIPS[1559];\n    }\n\n    const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n      this.state.selectedNetworkClientId,\n    );\n    this.update((state) => {\n      if (isEIP1559Compatible !== undefined) {\n        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] =\n          isEIP1559Compatible;\n      }\n    });\n    return isEIP1559Compatible;\n  }\n\n  async get1559CompatibilityWithNetworkClientId(\n    networkClientId: NetworkClientId,\n  ) {\n    let metadata = this.state.networksMetadata[networkClientId];\n    if (metadata === undefined) {\n      await this.lookupNetwork(networkClientId);\n      metadata = this.state.networksMetadata[networkClientId];\n    }\n    const { EIPS } = metadata;\n\n    // may want to include some 'freshness' value - something to make sure we refetch this from time to time\n    return EIPS[1559];\n  }\n\n  /**\n   * Retrieves and checks the latest block from the currently selected\n   * network; if the block has a `baseFeePerGas` property, then we know\n   * that the network supports EIP-1559; otherwise it doesn't.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility\n   * @returns A promise that resolves to `true` if the network supports EIP-1559,\n   * `false` otherwise, or `undefined` if unable to retrieve the last block.\n   */\n  async #determineEIP1559Compatibility(\n    networkClientId: NetworkClientId,\n  ): Promise<boolean | undefined> {\n    const latestBlock = await this.#getLatestBlock(networkClientId);\n\n    if (!latestBlock) {\n      return undefined;\n    }\n\n    return latestBlock.baseFeePerGas !== undefined;\n  }\n\n  /**\n   * Re-initializes the provider and block tracker for the current network.\n   */\n  async resetConnection() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Returns a configuration object for the network identified by the given\n   * network client ID. If given an Infura network type, constructs one based on\n   * what we know about the network; otherwise attempts locates a network\n   * configuration in state that corresponds to the network client ID.\n   *\n   * @param networkClientId - The network client ID.\n   * @returns The configuration for the referenced network if one exists, or\n   * undefined otherwise.\n   */\n  getNetworkConfigurationByNetworkClientId(\n    networkClientId: NetworkClientId,\n  ): NetworkConfiguration | undefined {\n    if (isInfuraNetworkType(networkClientId)) {\n      const rpcUrl = `https://${networkClientId}.infura.io/v3/${\n        this.#infuraProjectId\n      }`;\n      return {\n        rpcUrl,\n        ...BUILT_IN_NETWORKS[networkClientId],\n      };\n    }\n\n    return this.state.networkConfigurations[networkClientId];\n  }\n\n  /**\n   * Adds a new custom network or updates the information for an existing\n   * network.\n   *\n   * This may involve updating the `networkConfigurations` property in\n   * state as well and/or adding a new network client to the network client\n   * registry. The `rpcUrl` and `chainId` of the given object are used to\n   * determine which action to take:\n   *\n   * - If the `rpcUrl` corresponds to an existing network configuration\n   * (case-insensitively), then it is overwritten with the object. Furthermore,\n   * if the `chainId` is different from the existing network configuration, then\n   * the existing network client is replaced with a new one.\n   * - If the `rpcUrl` does not correspond to an existing network configuration\n   * (case-insensitively), then the object is used to add a new network\n   * configuration along with a new network client.\n   *\n   * @param networkConfiguration - The network configuration to add or update.\n   * @param options - Additional configuration options.\n   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.\n   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).\n   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).\n   * @returns The ID for the added or updated network configuration.\n   */\n  async upsertNetworkConfiguration(\n    // Core PR: https://github.com/MetaMask/core/pull/4614\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    networkConfiguration: NetworkConfiguration & {\n      id?: NetworkConfigurationId;\n    },\n    {\n      referrer,\n      source,\n      setActive = false,\n    }: {\n      referrer: string;\n      source: string;\n      setActive?: boolean;\n    },\n  ): Promise<string> {\n    // Core PR: https://github.com/MetaMask/core/pull/4614\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    const sanitizedNetworkConfiguration: NetworkConfiguration & {\n      id?: NetworkConfigurationId;\n    } = pick(networkConfiguration, [\n      'rpcUrl',\n      'chainId',\n      'ticker',\n      'nickname',\n      'rpcPrefs',\n      'id',\n    ]);\n    const { rpcUrl, chainId, ticker, id } = sanitizedNetworkConfiguration;\n\n    assertIsStrictHexString(chainId);\n    if (!isSafeChainId(chainId)) {\n      throw new Error(\n        `Invalid chain ID \"${chainId}\": numerical value greater than max safe value.`,\n      );\n    }\n    if (!rpcUrl) {\n      throw new Error(\n        'An rpcUrl is required to add or update network configuration',\n      );\n    }\n    if (!referrer || !source) {\n      throw new Error(\n        'referrer and source are required arguments for adding or updating a network configuration',\n      );\n    }\n    try {\n      new URL(rpcUrl);\n      // TODO: Replace `any` with type\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    } catch (e: any) {\n      if (e.message.includes('Invalid URL')) {\n        throw new Error('rpcUrl must be a valid URL');\n      }\n    }\n    if (!ticker) {\n      throw new Error(\n        'A ticker is required to add or update networkConfiguration',\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    // Core PR: https://github.com/MetaMask/core/pull/4614\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    const existingNetworkConfigurationWithId = Object.values(\n      this.state.networkConfigurations,\n    ).find((networkConfig) => networkConfig.id === id);\n    if (id && !existingNetworkConfigurationWithId) {\n      throw new Error('No network configuration matches the provided id');\n    }\n\n    const existingNetworkConfigurationWithRpcUrl = Object.values(\n      this.state.networkConfigurations,\n    ).find(\n      (networkConfig) =>\n        networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase(),\n    );\n    if (\n      id &&\n      existingNetworkConfigurationWithRpcUrl &&\n      existingNetworkConfigurationWithRpcUrl.id !== id\n    ) {\n      throw new Error(\n        'A different network configuration already exists with the provided rpcUrl',\n      );\n    }\n\n    const existingNetworkConfiguration =\n      existingNetworkConfigurationWithId ??\n      existingNetworkConfigurationWithRpcUrl;\n\n    const upsertedNetworkConfigurationId = existingNetworkConfiguration\n      ? existingNetworkConfiguration.id\n      : random();\n    const networkClientId = buildCustomNetworkClientId(\n      upsertedNetworkConfigurationId,\n    );\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    const shouldDestroyExistingNetworkClient =\n      existingAutoManagedNetworkClient &&\n      existingAutoManagedNetworkClient.configuration.chainId !== chainId;\n    if (shouldDestroyExistingNetworkClient) {\n      existingAutoManagedNetworkClient.destroy();\n    }\n    if (\n      !existingAutoManagedNetworkClient ||\n      shouldDestroyExistingNetworkClient\n    ) {\n      customNetworkClientRegistry[networkClientId] =\n        createAutoManagedNetworkClient({\n          type: NetworkClientType.Custom,\n          chainId,\n          rpcUrl,\n          ticker,\n        });\n    }\n\n    this.update((state) => {\n      state.networkConfigurations[upsertedNetworkConfigurationId] = {\n        // Core PR: https://github.com/MetaMask/core/pull/4614\n        // Core Patch Branch: jl/network-controller@18.1.2-patch\n        ...sanitizedNetworkConfiguration,\n        id: upsertedNetworkConfigurationId,\n      };\n    });\n\n    if (!existingNetworkConfiguration) {\n      this.#trackMetaMetricsEvent({\n        event: 'Custom Network Added',\n        category: 'Network',\n        referrer: {\n          url: referrer,\n        },\n        properties: {\n          chain_id: chainId,\n          symbol: ticker,\n          source,\n        },\n      });\n    }\n\n    if (setActive) {\n      await this.setActiveNetwork(upsertedNetworkConfigurationId);\n    }\n\n    return upsertedNetworkConfigurationId;\n  }\n\n  /**\n   * Removes a custom network from state.\n   *\n   * This involves updating the `networkConfigurations` property in state as\n   * well and removing the network client that corresponds to the network from\n   * the client registry.\n   *\n   * @param networkConfigurationId - The ID of an existing network\n   * configuration.\n   */\n  removeNetworkConfiguration(networkConfigurationId: string) {\n    if (!this.state.networkConfigurations[networkConfigurationId]) {\n      throw new Error(\n        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`,\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);\n\n    this.update((state) => {\n      delete state.networkConfigurations[networkConfigurationId];\n    });\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    existingAutoManagedNetworkClient.destroy();\n    delete customNetworkClientRegistry[networkClientId];\n  }\n\n  /**\n   * Switches to the previously selected network, assuming that there is one\n   * (if not and `initializeProvider` has not been previously called, then this\n   * method is equivalent to calling `resetConnection`).\n   */\n  async rollbackToPreviousProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = this.#previousProviderConfig;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Deactivates the controller, stopping any ongoing polling.\n   *\n   * In-progress requests will not be aborted.\n   */\n  async destroy() {\n    await this.#blockTrackerProxy?.destroy();\n  }\n\n  /**\n   * Updates the controller using the given backup data.\n   *\n   * @param backup - The data that has been backed up.\n   * @param backup.networkConfigurations - Network configurations in the backup.\n   */\n  loadBackup({\n    networkConfigurations,\n  }: {\n    networkConfigurations: NetworkState['networkConfigurations'];\n  }): void {\n    this.update((state) => {\n      state.networkConfigurations = {\n        ...state.networkConfigurations,\n        ...networkConfigurations,\n      };\n    });\n  }\n\n  /**\n   * Searches for a network configuration ID with the given ChainID and returns it.\n   *\n   * @param chainId - ChainId to search for\n   * @returns networkClientId of the network configuration with the given chainId\n   */\n  findNetworkClientIdByChainId(chainId: Hex): NetworkClientId {\n    const networkClients = this.getNetworkClientRegistry();\n    const networkClientEntry = Object.entries(networkClients).find(\n      ([_, networkClient]) => networkClient.configuration.chainId === chainId,\n    );\n    if (networkClientEntry === undefined) {\n      throw new Error(\"Couldn't find networkClientId for chainId\");\n    }\n    return networkClientEntry[0];\n  }\n\n  /**\n   * Before accessing or switching the network, the registry of network clients\n   * needs to be populated. Otherwise, `#applyNetworkSelection` and\n   * `getNetworkClientRegistry` will throw an error. This method checks to see if the\n   * population step has happened yet, and if not, makes it happen.\n   *\n   * @returns The populated network client registry.\n   */\n  #ensureAutoManagedNetworkClientRegistryPopulated(): AutoManagedNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#autoManagedNetworkClientRegistry ??\n      this.#createAutoManagedNetworkClientRegistry();\n    this.#autoManagedNetworkClientRegistry = autoManagedNetworkClientRegistry;\n    return autoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the registry of network clients based on the set of built-in\n   * networks as well as the custom networks in state.\n   *\n   * @returns The network clients keyed by ID.\n   */\n  #createAutoManagedNetworkClientRegistry(): AutoManagedNetworkClientRegistry {\n    return [\n      ...this.#buildIdentifiedInfuraNetworkClientConfigurations(),\n      ...this.#buildIdentifiedCustomNetworkClientConfigurations(),\n      ...this.#buildIdentifiedNetworkClientConfigurationsFromProviderConfig(),\n    ].reduce(\n      (\n        registry,\n        [networkClientType, networkClientId, networkClientConfiguration],\n      ) => {\n        const autoManagedNetworkClient = createAutoManagedNetworkClient(\n          networkClientConfiguration,\n        );\n        if (networkClientId in registry[networkClientType]) {\n          return registry;\n        }\n        return {\n          ...registry,\n          [networkClientType]: {\n            ...registry[networkClientType],\n            [networkClientId]: autoManagedNetworkClient,\n          },\n        };\n      },\n      {\n        [NetworkClientType.Infura]: {},\n        [NetworkClientType.Custom]: {},\n      },\n    ) as AutoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the list of network clients for built-in networks (that is,\n   * the subset of the networks we know Infura supports that consumers do not\n   * need to explicitly add).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedInfuraNetworkClientConfigurations(): [\n    NetworkClientType.Infura,\n    BuiltInNetworkClientId,\n    InfuraNetworkClientConfiguration,\n  ][] {\n    return knownKeysOf(InfuraNetworkType).map((network) => {\n      const networkClientId = buildInfuraNetworkClientId(network);\n      const networkClientConfiguration: InfuraNetworkClientConfiguration = {\n        type: NetworkClientType.Infura,\n        network,\n        infuraProjectId: this.#infuraProjectId,\n        chainId: BUILT_IN_NETWORKS[network].chainId,\n        ticker: BUILT_IN_NETWORKS[network].ticker,\n      };\n      return [\n        NetworkClientType.Infura,\n        networkClientId,\n        networkClientConfiguration,\n      ];\n    });\n  }\n\n  /**\n   * Constructs the list of network clients for custom networks (that is, those\n   * which consumers have added via `networkConfigurations`).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedCustomNetworkClientConfigurations(): [\n    NetworkClientType.Custom,\n    CustomNetworkClientId,\n    CustomNetworkClientConfiguration,\n  ][] {\n    return Object.entries(this.state.networkConfigurations).map(\n      ([networkConfigurationId, networkConfiguration]) => {\n        if (networkConfiguration.chainId === undefined) {\n          throw new Error('chainId must be provided for custom RPC endpoints');\n        }\n        if (networkConfiguration.rpcUrl === undefined) {\n          throw new Error('rpcUrl must be provided for custom RPC endpoints');\n        }\n        const networkClientId = buildCustomNetworkClientId(\n          networkConfigurationId,\n        );\n        const networkClientConfiguration: CustomNetworkClientConfiguration = {\n          type: NetworkClientType.Custom,\n          chainId: networkConfiguration.chainId,\n          rpcUrl: networkConfiguration.rpcUrl,\n          ticker: networkConfiguration.ticker,\n        };\n        return [\n          NetworkClientType.Custom,\n          networkClientId,\n          networkClientConfiguration,\n        ];\n      },\n    );\n  }\n\n  /**\n   * Converts the provider config object in state to a network client\n   * configuration object.\n   *\n   * @returns The network client config.\n   * @throws If the provider config is of type \"rpc\" and lacks either a\n   * `chainId` or an `rpcUrl`.\n   */\n  #buildIdentifiedNetworkClientConfigurationsFromProviderConfig():\n    | [\n        [\n          NetworkClientType.Custom,\n          CustomNetworkClientId,\n          CustomNetworkClientConfiguration,\n        ],\n      ]\n    | [] {\n    const { providerConfig } = this.state;\n\n    if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const networkClientConfiguration: CustomNetworkClientConfiguration = {\n        chainId: providerConfig.chainId,\n        rpcUrl: providerConfig.rpcUrl,\n        type: NetworkClientType.Custom,\n        ticker: providerConfig.ticker,\n      };\n      return [\n        [NetworkClientType.Custom, networkClientId, networkClientConfiguration],\n      ];\n    }\n\n    if (isInfuraProviderConfig(providerConfig)) {\n      return [];\n    }\n\n    throw new Error(`Unrecognized network type: '${providerConfig.type}'`);\n  }\n\n  /**\n   * Uses the information in the provider config object to look up a known and\n   * preinitialized network client. Once a network client is found, updates the\n   * provider and block tracker proxy to point to those from the network client,\n   * then finally creates an EthQuery that points to the provider proxy.\n   *\n   * @throws If no network client could be found matching the current provider\n   * config.\n   */\n  #applyNetworkSelection() {\n    if (!this.#autoManagedNetworkClientRegistry) {\n      throw new Error(\n        'initializeProvider must be called first in order to switch the network',\n      );\n    }\n\n    const { providerConfig } = this.state;\n\n    let autoManagedNetworkClient: AutoManagedNetworkClient<NetworkClientConfiguration>;\n\n    let networkClientId: NetworkClientId;\n    if (isInfuraProviderConfig(providerConfig)) {\n      const networkClientType = NetworkClientType.Infura;\n      networkClientId = buildInfuraNetworkClientId(providerConfig);\n      const builtInNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient =\n        builtInNetworkClientRegistry[networkClientId as BuiltInNetworkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find custom network matching ${networkClientId}`,\n        );\n      }\n    } else if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientType = NetworkClientType.Custom;\n      networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const customNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find built-in network matching ${networkClientId}`,\n        );\n      }\n    } else {\n      throw new Error('Could not determine type of provider config');\n    }\n\n    this.update((state) => {\n      state.selectedNetworkClientId = networkClientId;\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n    });\n\n    const { provider, blockTracker } = autoManagedNetworkClient;\n\n    if (this.#providerProxy) {\n      this.#providerProxy.setTarget(provider);\n    } else {\n      this.#providerProxy = createEventEmitterProxy(provider);\n    }\n\n    if (this.#blockTrackerProxy) {\n      this.#blockTrackerProxy.setTarget(blockTracker);\n    } else {\n      this.#blockTrackerProxy = createEventEmitterProxy(blockTracker, {\n        eventFilter: 'skipInternal',\n      });\n    }\n\n    this.#ethQuery = new EthQuery(this.#providerProxy);\n  }\n}\n"],"mappings":"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","names":[]}
+\ No newline at end of file
+diff --git a/dist/chunk-RSKJC2QZ.js b/dist/chunk-RSKJC2QZ.js
+new file mode 100644
+index 0000000000000000000000000000000000000000..055c68ff3542080660d282d5ad668ec886f17f1e
+--- /dev/null
++++ b/dist/chunk-RSKJC2QZ.js
+@@ -0,0 +1,1034 @@
++"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
++
++var _chunkZKNI7MD3js = require('./chunk-ZKNI7MD3.js');
++
++
++var _chunkZV34XXLTjs = require('./chunk-ZV34XXLT.js');
++
++
++
++var _chunkVGYLDDJBjs = require('./chunk-VGYLDDJB.js');
++
++
++
++
++
++var _chunkZ4BLTVTBjs = require('./chunk-Z4BLTVTB.js');
++
++// src/NetworkController.ts
++var _basecontroller = require('@metamask/base-controller');
++
++
++
++
++
++
++
++
++var _controllerutils = require('@metamask/controller-utils');
++var _ethquery = require('@metamask/eth-query'); var _ethquery2 = _interopRequireDefault(_ethquery);
++var _rpcerrors = require('@metamask/rpc-errors');
++var _swappableobjproxy = require('@metamask/swappable-obj-proxy');
++
++
++
++
++var _utils = require('@metamask/utils');
++var _assert = require('assert');
++var _uuid = require('uuid');
++var log = _chunkVGYLDDJBjs.createModuleLogger.call(void 0, _chunkVGYLDDJBjs.projectLogger, "NetworkController");
++function knownKeysOf(object) {
++  return Object.keys(object);
++}
++function assertOfType(value, validate, message) {
++  _assert.strict.ok(validate(value), message);
++}
++function pick(object, keys) {
++  const pickedObject = keys.reduce(
++    (finalObject, key) => {
++      return { ...finalObject, [key]: object[key] };
++    },
++    {}
++  );
++  assertOfType(
++    pickedObject,
++    () => keys.every((key) => key in pickedObject),
++    "The reduce did not produce an object with all of the desired keys."
++  );
++  return pickedObject;
++}
++function isErrorWithCode(error) {
++  return typeof error === "object" && error !== null && "code" in error;
++}
++function buildInfuraNetworkClientId(infuraNetworkOrProviderConfig) {
++  if (typeof infuraNetworkOrProviderConfig === "string") {
++    return infuraNetworkOrProviderConfig;
++  }
++  return infuraNetworkOrProviderConfig.type;
++}
++function buildCustomNetworkClientId(...args) {
++  if (args.length === 1) {
++    return args[0];
++  }
++  const [{ id, rpcUrl }, networkConfigurations] = args;
++  if (id === void 0) {
++    const matchingNetworkConfiguration = Object.values(
++      networkConfigurations
++    ).find((networkConfiguration) => {
++      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();
++    });
++    if (matchingNetworkConfiguration) {
++      return matchingNetworkConfiguration.id;
++    }
++    return rpcUrl.toLowerCase();
++  }
++  return id;
++}
++function isInfuraProviderConfig(providerConfig) {
++  return _controllerutils.isInfuraNetworkType.call(void 0, providerConfig.type);
++}
++function isCustomProviderConfig(providerConfig) {
++  return providerConfig.type === _controllerutils.NetworkType.rpc;
++}
++function validateCustomProviderConfig(providerConfig) {
++  if (providerConfig.chainId === void 0) {
++    throw new Error("chainId must be provided for custom RPC endpoints");
++  }
++  if (providerConfig.rpcUrl === void 0) {
++    throw new Error("rpcUrl must be provided for custom RPC endpoints");
++  }
++}
++var name = "NetworkController";
++var defaultState = {
++  selectedNetworkClientId: _controllerutils.NetworkType.mainnet,
++  providerConfig: {
++    type: _controllerutils.NetworkType.mainnet,
++    chainId: _controllerutils.ChainId.mainnet,
++    ticker: _controllerutils.NetworksTicker.mainnet
++  },
++  networksMetadata: {},
++  networkConfigurations: {}
++};
++var _ethQuery, _infuraProjectId, _trackMetaMetricsEvent, _previousProviderConfig, _providerProxy, _blockTrackerProxy, _autoManagedNetworkClientRegistry, _refreshNetwork, refreshNetwork_fn, _getLatestBlock, getLatestBlock_fn, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn, _applyNetworkSelection, applyNetworkSelection_fn;
++var NetworkController = class extends _basecontroller.BaseController {
++  constructor({
++    messenger,
++    state,
++    infuraProjectId,
++    trackMetaMetricsEvent
++  }) {
++    super({
++      name,
++      metadata: {
++        selectedNetworkClientId: {
++          persist: true,
++          anonymous: false
++        },
++        networksMetadata: {
++          persist: true,
++          anonymous: false
++        },
++        providerConfig: {
++          persist: true,
++          anonymous: false
++        },
++        networkConfigurations: {
++          persist: true,
++          anonymous: false
++        }
++      },
++      messenger,
++      state: { ...defaultState, ...state }
++    });
++    /**
++     * Executes a series of steps to apply the changes to the provider config:
++     *
++     * 1. Notifies subscribers that the network is about to change.
++     * 2. Looks up a known and preinitialized network client matching the provider
++     * config and re-points the provider and block tracker proxy to it.
++     * 3. Notifies subscribers that the network has changed.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _refreshNetwork);
++    /**
++     * Fetches the latest block for the network.
++     *
++     * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.
++     * @returns A promise that either resolves to the block header or null if
++     * there is no latest block, or rejects with an error.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _getLatestBlock);
++    /**
++     * Retrieves and checks the latest block from the currently selected
++     * network; if the block has a `baseFeePerGas` property, then we know
++     * that the network supports EIP-1559; otherwise it doesn't.
++     *
++     * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility
++     * @returns A promise that resolves to `true` if the network supports EIP-1559,
++     * `false` otherwise, or `undefined` if unable to retrieve the last block.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _determineEIP1559Compatibility);
++    /**
++     * Before accessing or switching the network, the registry of network clients
++     * needs to be populated. Otherwise, `#applyNetworkSelection` and
++     * `getNetworkClientRegistry` will throw an error. This method checks to see if the
++     * population step has happened yet, and if not, makes it happen.
++     *
++     * @returns The populated network client registry.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated);
++    /**
++     * Constructs the registry of network clients based on the set of built-in
++     * networks as well as the custom networks in state.
++     *
++     * @returns The network clients keyed by ID.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _createAutoManagedNetworkClientRegistry);
++    /**
++     * Constructs the list of network clients for built-in networks (that is,
++     * the subset of the networks we know Infura supports that consumers do not
++     * need to explicitly add).
++     *
++     * @returns The network clients.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedInfuraNetworkClientConfigurations);
++    /**
++     * Constructs the list of network clients for custom networks (that is, those
++     * which consumers have added via `networkConfigurations`).
++     *
++     * @returns The network clients.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedCustomNetworkClientConfigurations);
++    /**
++     * Converts the provider config object in state to a network client
++     * configuration object.
++     *
++     * @returns The network client config.
++     * @throws If the provider config is of type "rpc" and lacks either a
++     * `chainId` or an `rpcUrl`.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig);
++    /**
++     * Uses the information in the provider config object to look up a known and
++     * preinitialized network client. Once a network client is found, updates the
++     * provider and block tracker proxy to point to those from the network client,
++     * then finally creates an EthQuery that points to the provider proxy.
++     *
++     * @throws If no network client could be found matching the current provider
++     * config.
++     */
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _applyNetworkSelection);
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _ethQuery, void 0);
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _infuraProjectId, void 0);
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _trackMetaMetricsEvent, void 0);
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _previousProviderConfig, void 0);
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _providerProxy, void 0);
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _blockTrackerProxy, void 0);
++    _chunkZ4BLTVTBjs.__privateAdd.call(void 0, this, _autoManagedNetworkClientRegistry, void 0);
++    if (!infuraProjectId || typeof infuraProjectId !== "string") {
++      throw new Error("Invalid Infura project ID");
++    }
++    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _infuraProjectId, infuraProjectId);
++    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _trackMetaMetricsEvent, trackMetaMetricsEvent);
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getProviderConfig`,
++      () => {
++        return this.state.providerConfig;
++      }
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getEthQuery`,
++      () => {
++        return _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery);
++      }
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getNetworkClientById`,
++      this.getNetworkClientById.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getEIP1559Compatibility`,
++      this.getEIP1559Compatibility.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:setActiveNetwork`,
++      this.setActiveNetwork.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:setProviderType`,
++      this.setProviderType.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:findNetworkClientIdByChainId`,
++      this.findNetworkClientIdByChainId.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getNetworkConfigurationByNetworkClientId`,
++      this.getNetworkConfigurationByNetworkClientId.bind(this)
++    );
++    this.messagingSystem.registerActionHandler(
++      `${this.name}:getSelectedNetworkClient`,
++      this.getSelectedNetworkClient.bind(this)
++    );
++    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previousProviderConfig, this.state.providerConfig);
++  }
++  /**
++   * Accesses the provider and block tracker for the currently selected network.
++   * @returns The proxy and block tracker proxies.
++   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.
++   */
++  getProviderAndBlockTracker() {
++    return {
++      provider: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy),
++      blockTracker: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)
++    };
++  }
++  /**
++   * Accesses the provider and block tracker for the currently selected network.
++   *
++   * @returns an object with the provider and block tracker proxies for the currently selected network.
++   */
++  getSelectedNetworkClient() {
++    if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy) && _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)) {
++      return {
++        provider: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy),
++        blockTracker: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)
++      };
++    }
++    return void 0;
++  }
++  /**
++   * Returns all of the network clients that have been created so far, keyed by
++   * their identifier in the network client registry. This collection represents
++   * not only built-in networks but also any custom networks that consumers have
++   * added.
++   *
++   * @returns The list of known network clients.
++   */
++  getNetworkClientRegistry() {
++    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    return Object.assign(
++      {},
++      autoManagedNetworkClientRegistry["infura" /* Infura */],
++      autoManagedNetworkClientRegistry["custom" /* Custom */]
++    );
++  }
++  getNetworkClientById(networkClientId) {
++    if (!networkClientId) {
++      throw new Error("No network client ID was provided.");
++    }
++    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    if (_controllerutils.isInfuraNetworkType.call(void 0, networkClientId)) {
++      const infuraNetworkClient = autoManagedNetworkClientRegistry["infura" /* Infura */][networkClientId];
++      if (!infuraNetworkClient) {
++        throw new Error(
++          `No Infura network client was found with the ID "${networkClientId}".`
++        );
++      }
++      return infuraNetworkClient;
++    }
++    const customNetworkClient = autoManagedNetworkClientRegistry["custom" /* Custom */][networkClientId];
++    if (!customNetworkClient) {
++      throw new Error(
++        `No custom network client was found with the ID "${networkClientId}".`
++      );
++    }
++    return customNetworkClient;
++  }
++  /**
++   * Populates the network clients and establishes the initial network based on
++   * the provider configuration in state.
++   */
++  async initializeProvider() {
++    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
++  }
++  /**
++   * Refreshes the network meta with EIP-1559 support and the network status
++   * based on the given network client ID.
++   *
++   * @param networkClientId - The ID of the network client to update.
++   */
++  async lookupNetworkByClientId(networkClientId) {
++    const isInfura = _controllerutils.isInfuraNetworkType.call(void 0, networkClientId);
++    let updatedNetworkStatus;
++    let updatedIsEIP1559Compatible;
++    try {
++      updatedIsEIP1559Compatible = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, networkClientId);
++      updatedNetworkStatus = "available" /* Available */;
++    } catch (error) {
++      if (isErrorWithCode(error)) {
++        let responseBody;
++        if (isInfura && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string") {
++          try {
++            responseBody = JSON.parse(error.message);
++          } catch {
++          }
++        }
++        if (_utils.isPlainObject.call(void 0, responseBody) && responseBody.error === _chunkZKNI7MD3js.INFURA_BLOCKED_KEY) {
++          updatedNetworkStatus = "blocked" /* Blocked */;
++        } else if (error.code === _rpcerrors.errorCodes.rpc.internal) {
++          updatedNetworkStatus = "unknown" /* Unknown */;
++        } else {
++          updatedNetworkStatus = "unavailable" /* Unavailable */;
++        }
++      } else if (typeof Error !== "undefined" && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string" && error.message.includes(
++        "No custom network client was found with the ID"
++      )) {
++        throw error;
++      } else {
++        log("NetworkController - could not determine network status", error);
++        updatedNetworkStatus = "unknown" /* Unknown */;
++      }
++    }
++    this.update((state) => {
++      if (state.networksMetadata[networkClientId] === void 0) {
++        state.networksMetadata[networkClientId] = {
++          status: "unknown" /* Unknown */,
++          EIPS: {}
++        };
++      }
++      const meta = state.networksMetadata[networkClientId];
++      meta.status = updatedNetworkStatus;
++      if (updatedIsEIP1559Compatible === void 0) {
++        delete meta.EIPS[1559];
++      } else {
++        meta.EIPS[1559] = updatedIsEIP1559Compatible;
++      }
++    });
++  }
++  /**
++   * Performs side effects after switching to a network. If the network is
++   * available, updates the network state with the network ID of the network and
++   * stores whether the network supports EIP-1559; otherwise clears said
++   * information about the network that may have been previously stored.
++   *
++   * @param networkClientId - (Optional) The ID of the network client to update.
++   * If no ID is provided, uses the currently selected network.
++   * @fires infuraIsBlocked if the network is Infura-supported and is blocking
++   * requests.
++   * @fires infuraIsUnblocked if the network is Infura-supported and is not
++   * blocking requests, or if the network is not Infura-supported.
++   */
++  async lookupNetwork(networkClientId) {
++    if (networkClientId) {
++      await this.lookupNetworkByClientId(networkClientId);
++      return;
++    }
++    if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery)) {
++      return;
++    }
++    const isInfura = isInfuraProviderConfig(this.state.providerConfig);
++    let networkChanged = false;
++    const listener = () => {
++      networkChanged = true;
++      this.messagingSystem.unsubscribe(
++        "NetworkController:networkDidChange",
++        listener
++      );
++    };
++    this.messagingSystem.subscribe(
++      "NetworkController:networkDidChange",
++      listener
++    );
++    let updatedNetworkStatus;
++    let updatedIsEIP1559Compatible;
++    try {
++      const isEIP1559Compatible = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
++      updatedNetworkStatus = "available" /* Available */;
++      updatedIsEIP1559Compatible = isEIP1559Compatible;
++    } catch (error) {
++      if (isErrorWithCode(error)) {
++        let responseBody;
++        if (isInfura && _utils.hasProperty.call(void 0, error, "message") && typeof error.message === "string") {
++          try {
++            responseBody = JSON.parse(error.message);
++          } catch {
++          }
++        }
++        if (_utils.isPlainObject.call(void 0, responseBody) && responseBody.error === _chunkZKNI7MD3js.INFURA_BLOCKED_KEY) {
++          updatedNetworkStatus = "blocked" /* Blocked */;
++        } else if (error.code === _rpcerrors.errorCodes.rpc.internal) {
++          updatedNetworkStatus = "unknown" /* Unknown */;
++        } else {
++          updatedNetworkStatus = "unavailable" /* Unavailable */;
++        }
++      } else {
++        log("NetworkController - could not determine network status", error);
++        updatedNetworkStatus = "unknown" /* Unknown */;
++      }
++    }
++    if (networkChanged) {
++      return;
++    }
++    this.messagingSystem.unsubscribe(
++      "NetworkController:networkDidChange",
++      listener
++    );
++    this.update((state) => {
++      const meta = state.networksMetadata[state.selectedNetworkClientId];
++      meta.status = updatedNetworkStatus;
++      if (updatedIsEIP1559Compatible === void 0) {
++        delete meta.EIPS[1559];
++      } else {
++        meta.EIPS[1559] = updatedIsEIP1559Compatible;
++      }
++    });
++    if (isInfura) {
++      if (updatedNetworkStatus === "available" /* Available */) {
++        this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
++      } else if (updatedNetworkStatus === "blocked" /* Blocked */) {
++        this.messagingSystem.publish("NetworkController:infuraIsBlocked");
++      }
++    } else {
++      this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
++    }
++  }
++  /**
++   * Convenience method to update provider network type settings.
++   *
++   * @param type - Human readable network name.
++   * @deprecated This has been replaced by `setActiveNetwork`, and will be
++   * removed in a future release
++   */
++  async setProviderType(type) {
++    _assert.strict.notStrictEqual(
++      type,
++      _controllerutils.NetworkType.rpc,
++      `NetworkController - cannot call "setProviderType" with type "${_controllerutils.NetworkType.rpc}". Use "setActiveNetwork"`
++    );
++    _assert.strict.ok(
++      _controllerutils.isInfuraNetworkType.call(void 0, type),
++      `Unknown Infura provider type "${type}".`
++    );
++    await this.setActiveNetwork(type);
++  }
++  /**
++   * Convenience method to update provider RPC settings.
++   *
++   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,
++   * or the type of a built-in network.
++   */
++  async setActiveNetwork(networkConfigurationIdOrType) {
++    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _previousProviderConfig, this.state.providerConfig);
++    let targetNetwork;
++    if (_controllerutils.isInfuraNetworkType.call(void 0, networkConfigurationIdOrType)) {
++      const ticker = _controllerutils.NetworksTicker[networkConfigurationIdOrType];
++      targetNetwork = {
++        chainId: _controllerutils.ChainId[networkConfigurationIdOrType],
++        id: void 0,
++        rpcPrefs: _controllerutils.BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,
++        rpcUrl: void 0,
++        nickname: void 0,
++        ticker,
++        type: networkConfigurationIdOrType
++      };
++    } else {
++      if (!Object.keys(this.state.networkConfigurations).includes(
++        networkConfigurationIdOrType
++      )) {
++        throw new Error(
++          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`
++        );
++      }
++      targetNetwork = {
++        ...this.state.networkConfigurations[networkConfigurationIdOrType],
++        type: _controllerutils.NetworkType.rpc
++      };
++    }
++    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    this.update((state) => {
++      state.providerConfig = targetNetwork;
++    });
++    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
++  }
++  /**
++   * Determines whether the network supports EIP-1559 by checking whether the
++   * latest block has a `baseFeePerGas` property, then updates state
++   * appropriately.
++   *
++   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.
++   * @returns A promise that resolves to true if the network supports EIP-1559
++   * , false otherwise, or `undefined` if unable to determine the compatibility.
++   */
++  async getEIP1559Compatibility(networkClientId) {
++    if (networkClientId) {
++      return this.get1559CompatibilityWithNetworkClientId(networkClientId);
++    }
++    if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _ethQuery)) {
++      return false;
++    }
++    const { EIPS } = this.state.networksMetadata[this.state.selectedNetworkClientId];
++    if (EIPS[1559] !== void 0) {
++      return EIPS[1559];
++    }
++    const isEIP1559Compatible = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
++    this.update((state) => {
++      if (isEIP1559Compatible !== void 0) {
++        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] = isEIP1559Compatible;
++      }
++    });
++    return isEIP1559Compatible;
++  }
++  async get1559CompatibilityWithNetworkClientId(networkClientId) {
++    let metadata = this.state.networksMetadata[networkClientId];
++    if (metadata === void 0) {
++      await this.lookupNetwork(networkClientId);
++      metadata = this.state.networksMetadata[networkClientId];
++    }
++    const { EIPS } = metadata;
++    return EIPS[1559];
++  }
++  /**
++   * Re-initializes the provider and block tracker for the current network.
++   */
++  async resetConnection() {
++    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
++  }
++  /**
++   * Returns a configuration object for the network identified by the given
++   * network client ID. If given an Infura network type, constructs one based on
++   * what we know about the network; otherwise attempts locates a network
++   * configuration in state that corresponds to the network client ID.
++   *
++   * @param networkClientId - The network client ID.
++   * @returns The configuration for the referenced network if one exists, or
++   * undefined otherwise.
++   */
++  getNetworkConfigurationByNetworkClientId(networkClientId) {
++    if (_controllerutils.isInfuraNetworkType.call(void 0, networkClientId)) {
++      const rpcUrl = `https://${networkClientId}.infura.io/v3/${_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _infuraProjectId)}`;
++      return {
++        rpcUrl,
++        ..._controllerutils.BUILT_IN_NETWORKS[networkClientId]
++      };
++    }
++    return this.state.networkConfigurations[networkClientId];
++  }
++  /**
++   * Adds a new custom network or updates the information for an existing
++   * network.
++   *
++   * This may involve updating the `networkConfigurations` property in
++   * state as well and/or adding a new network client to the network client
++   * registry. The `rpcUrl` and `chainId` of the given object are used to
++   * determine which action to take:
++   *
++   * - If the `rpcUrl` corresponds to an existing network configuration
++   * (case-insensitively), then it is overwritten with the object. Furthermore,
++   * if the `chainId` is different from the existing network configuration, then
++   * the existing network client is replaced with a new one.
++   * - If the `rpcUrl` does not correspond to an existing network configuration
++   * (case-insensitively), then the object is used to add a new network
++   * configuration along with a new network client.
++   *
++   * @param networkConfiguration - The network configuration to add or update.
++   * @param options - Additional configuration options.
++   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.
++   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).
++   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).
++   * @returns The ID for the added or updated network configuration.
++   */
++  async upsertNetworkConfiguration(networkConfiguration, {
++    referrer,
++    source,
++    setActive = false
++  }) {
++    const sanitizedNetworkConfiguration = pick(networkConfiguration, [
++      "rpcUrl",
++      "chainId",
++      "ticker",
++      "nickname",
++      "rpcPrefs",
++      "id"
++    ]);
++    const { rpcUrl, chainId, ticker, id } = sanitizedNetworkConfiguration;
++    _utils.assertIsStrictHexString.call(void 0, chainId);
++    if (!_controllerutils.isSafeChainId.call(void 0, chainId)) {
++      throw new Error(
++        `Invalid chain ID "${chainId}": numerical value greater than max safe value.`
++      );
++    }
++    if (!rpcUrl) {
++      throw new Error(
++        "An rpcUrl is required to add or update network configuration"
++      );
++    }
++    if (!referrer || !source) {
++      throw new Error(
++        "referrer and source are required arguments for adding or updating a network configuration"
++      );
++    }
++    try {
++      new URL(rpcUrl);
++    } catch (e) {
++      if (e.message.includes("Invalid URL")) {
++        throw new Error("rpcUrl must be a valid URL");
++      }
++    }
++    if (!ticker) {
++      throw new Error(
++        "A ticker is required to add or update networkConfiguration"
++      );
++    }
++    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    const existingNetworkConfigurationWithId = Object.values(
++      this.state.networkConfigurations
++    ).find((networkConfig) => networkConfig.id === id);
++    if (id && !existingNetworkConfigurationWithId) {
++      throw new Error("No network configuration matches the provided id");
++    }
++    const existingNetworkConfigurationWithRpcUrl = Object.values(
++      this.state.networkConfigurations
++    ).find(
++      (networkConfig) => networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase()
++    );
++    if (id && existingNetworkConfigurationWithRpcUrl && existingNetworkConfigurationWithRpcUrl.id !== id) {
++      throw new Error(
++        "A different network configuration already exists with the provided rpcUrl"
++      );
++    }
++    const existingNetworkConfiguration = existingNetworkConfigurationWithId ?? existingNetworkConfigurationWithRpcUrl;
++    const upsertedNetworkConfigurationId = existingNetworkConfiguration ? existingNetworkConfiguration.id : _uuid.v4.call(void 0, );
++    const networkClientId = buildCustomNetworkClientId(
++      upsertedNetworkConfigurationId
++    );
++    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
++    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
++    const shouldDestroyExistingNetworkClient = existingAutoManagedNetworkClient && existingAutoManagedNetworkClient.configuration.chainId !== chainId;
++    if (shouldDestroyExistingNetworkClient) {
++      existingAutoManagedNetworkClient.destroy();
++    }
++    if (!existingAutoManagedNetworkClient || shouldDestroyExistingNetworkClient) {
++      customNetworkClientRegistry[networkClientId] = _chunkZV34XXLTjs.createAutoManagedNetworkClient.call(void 0, {
++        type: "custom" /* Custom */,
++        chainId,
++        rpcUrl,
++        ticker
++      });
++    }
++    this.update((state) => {
++      state.networkConfigurations[upsertedNetworkConfigurationId] = {
++        // Core PR: https://github.com/MetaMask/core/pull/4614
++        // Core Patch Branch: jl/network-controller@18.1.2-patch
++        ...sanitizedNetworkConfiguration,
++        id: upsertedNetworkConfigurationId
++      };
++    });
++    if (!existingNetworkConfiguration) {
++      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _trackMetaMetricsEvent).call(this, {
++        event: "Custom Network Added",
++        category: "Network",
++        referrer: {
++          url: referrer
++        },
++        properties: {
++          chain_id: chainId,
++          symbol: ticker,
++          source
++        }
++      });
++    }
++    if (setActive) {
++      await this.setActiveNetwork(upsertedNetworkConfigurationId);
++    }
++    return upsertedNetworkConfigurationId;
++  }
++  /**
++   * Removes a custom network from state.
++   *
++   * This involves updating the `networkConfigurations` property in state as
++   * well and removing the network client that corresponds to the network from
++   * the client registry.
++   *
++   * @param networkConfigurationId - The ID of an existing network
++   * configuration.
++   */
++  removeNetworkConfiguration(networkConfigurationId) {
++    if (!this.state.networkConfigurations[networkConfigurationId]) {
++      throw new Error(
++        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`
++      );
++    }
++    const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);
++    this.update((state) => {
++      delete state.networkConfigurations[networkConfigurationId];
++    });
++    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
++    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
++    existingAutoManagedNetworkClient.destroy();
++    delete customNetworkClientRegistry[networkClientId];
++  }
++  /**
++   * Switches to the previously selected network, assuming that there is one
++   * (if not and `initializeProvider` has not been previously called, then this
++   * method is equivalent to calling `resetConnection`).
++   */
++  async rollbackToPreviousProvider() {
++    _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
++    this.update((state) => {
++      state.providerConfig = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _previousProviderConfig);
++    });
++    await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _refreshNetwork, refreshNetwork_fn).call(this);
++  }
++  /**
++   * Deactivates the controller, stopping any ongoing polling.
++   *
++   * In-progress requests will not be aborted.
++   */
++  async destroy() {
++    await _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)?.destroy();
++  }
++  /**
++   * Updates the controller using the given backup data.
++   *
++   * @param backup - The data that has been backed up.
++   * @param backup.networkConfigurations - Network configurations in the backup.
++   */
++  loadBackup({
++    networkConfigurations
++  }) {
++    this.update((state) => {
++      state.networkConfigurations = {
++        ...state.networkConfigurations,
++        ...networkConfigurations
++      };
++    });
++  }
++  /**
++   * Searches for a network configuration ID with the given ChainID and returns it.
++   *
++   * @param chainId - ChainId to search for
++   * @returns networkClientId of the network configuration with the given chainId
++   */
++  findNetworkClientIdByChainId(chainId) {
++    const networkClients = this.getNetworkClientRegistry();
++    const networkClientEntry = Object.entries(networkClients).find(
++      ([_, networkClient]) => networkClient.configuration.chainId === chainId
++    );
++    if (networkClientEntry === void 0) {
++      throw new Error("Couldn't find networkClientId for chainId");
++    }
++    return networkClientEntry[0];
++  }
++};
++_ethQuery = new WeakMap();
++_infuraProjectId = new WeakMap();
++_trackMetaMetricsEvent = new WeakMap();
++_previousProviderConfig = new WeakMap();
++_providerProxy = new WeakMap();
++_blockTrackerProxy = new WeakMap();
++_autoManagedNetworkClientRegistry = new WeakMap();
++_refreshNetwork = new WeakSet();
++refreshNetwork_fn = async function() {
++  this.messagingSystem.publish(
++    "NetworkController:networkWillChange",
++    this.state
++  );
++  _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
++  this.messagingSystem.publish(
++    "NetworkController:networkDidChange",
++    this.state
++  );
++  await this.lookupNetwork();
++};
++_getLatestBlock = new WeakSet();
++getLatestBlock_fn = function(networkClientId) {
++  if (networkClientId === void 0) {
++    networkClientId = this.state.selectedNetworkClientId;
++  }
++  const networkClient = this.getNetworkClientById(networkClientId);
++  const ethQuery = new (0, _ethquery2.default)(networkClient.provider);
++  return new Promise((resolve, reject) => {
++    ethQuery.sendAsync(
++      { method: "eth_getBlockByNumber", params: ["latest", false] },
++      (error, block) => {
++        if (error) {
++          reject(error);
++        } else {
++          resolve(block);
++        }
++      }
++    );
++  });
++};
++_determineEIP1559Compatibility = new WeakSet();
++determineEIP1559Compatibility_fn = async function(networkClientId) {
++  const latestBlock = await _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _getLatestBlock, getLatestBlock_fn).call(this, networkClientId);
++  if (!latestBlock) {
++    return void 0;
++  }
++  return latestBlock.baseFeePerGas !== void 0;
++};
++_ensureAutoManagedNetworkClientRegistryPopulated = new WeakSet();
++ensureAutoManagedNetworkClientRegistryPopulated_fn = function() {
++  const autoManagedNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry) ?? _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn).call(this);
++  _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _autoManagedNetworkClientRegistry, autoManagedNetworkClientRegistry);
++  return autoManagedNetworkClientRegistry;
++};
++_createAutoManagedNetworkClientRegistry = new WeakSet();
++createAutoManagedNetworkClientRegistry_fn = function() {
++  return [
++    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn).call(this),
++    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn).call(this),
++    ..._chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn).call(this)
++  ].reduce(
++    (registry, [networkClientType, networkClientId, networkClientConfiguration]) => {
++      const autoManagedNetworkClient = _chunkZV34XXLTjs.createAutoManagedNetworkClient.call(void 0, 
++        networkClientConfiguration
++      );
++      if (networkClientId in registry[networkClientType]) {
++        return registry;
++      }
++      return {
++        ...registry,
++        [networkClientType]: {
++          ...registry[networkClientType],
++          [networkClientId]: autoManagedNetworkClient
++        }
++      };
++    },
++    {
++      ["infura" /* Infura */]: {},
++      ["custom" /* Custom */]: {}
++    }
++  );
++};
++_buildIdentifiedInfuraNetworkClientConfigurations = new WeakSet();
++buildIdentifiedInfuraNetworkClientConfigurations_fn = function() {
++  return knownKeysOf(_controllerutils.InfuraNetworkType).map((network) => {
++    const networkClientId = buildInfuraNetworkClientId(network);
++    const networkClientConfiguration = {
++      type: "infura" /* Infura */,
++      network,
++      infuraProjectId: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _infuraProjectId),
++      chainId: _controllerutils.BUILT_IN_NETWORKS[network].chainId,
++      ticker: _controllerutils.BUILT_IN_NETWORKS[network].ticker
++    };
++    return [
++      "infura" /* Infura */,
++      networkClientId,
++      networkClientConfiguration
++    ];
++  });
++};
++_buildIdentifiedCustomNetworkClientConfigurations = new WeakSet();
++buildIdentifiedCustomNetworkClientConfigurations_fn = function() {
++  return Object.entries(this.state.networkConfigurations).map(
++    ([networkConfigurationId, networkConfiguration]) => {
++      if (networkConfiguration.chainId === void 0) {
++        throw new Error("chainId must be provided for custom RPC endpoints");
++      }
++      if (networkConfiguration.rpcUrl === void 0) {
++        throw new Error("rpcUrl must be provided for custom RPC endpoints");
++      }
++      const networkClientId = buildCustomNetworkClientId(
++        networkConfigurationId
++      );
++      const networkClientConfiguration = {
++        type: "custom" /* Custom */,
++        chainId: networkConfiguration.chainId,
++        rpcUrl: networkConfiguration.rpcUrl,
++        ticker: networkConfiguration.ticker
++      };
++      return [
++        "custom" /* Custom */,
++        networkClientId,
++        networkClientConfiguration
++      ];
++    }
++  );
++};
++_buildIdentifiedNetworkClientConfigurationsFromProviderConfig = new WeakSet();
++buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn = function() {
++  const { providerConfig } = this.state;
++  if (isCustomProviderConfig(providerConfig)) {
++    validateCustomProviderConfig(providerConfig);
++    const networkClientId = buildCustomNetworkClientId(
++      providerConfig,
++      this.state.networkConfigurations
++    );
++    const networkClientConfiguration = {
++      chainId: providerConfig.chainId,
++      rpcUrl: providerConfig.rpcUrl,
++      type: "custom" /* Custom */,
++      ticker: providerConfig.ticker
++    };
++    return [
++      ["custom" /* Custom */, networkClientId, networkClientConfiguration]
++    ];
++  }
++  if (isInfuraProviderConfig(providerConfig)) {
++    return [];
++  }
++  throw new Error(`Unrecognized network type: '${providerConfig.type}'`);
++};
++_applyNetworkSelection = new WeakSet();
++applyNetworkSelection_fn = function() {
++  if (!_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)) {
++    throw new Error(
++      "initializeProvider must be called first in order to switch the network"
++    );
++  }
++  const { providerConfig } = this.state;
++  let autoManagedNetworkClient;
++  let networkClientId;
++  if (isInfuraProviderConfig(providerConfig)) {
++    const networkClientType = "infura" /* Infura */;
++    networkClientId = buildInfuraNetworkClientId(providerConfig);
++    const builtInNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)[networkClientType];
++    autoManagedNetworkClient = builtInNetworkClientRegistry[networkClientId];
++    if (!autoManagedNetworkClient) {
++      throw new Error(
++        `Could not find custom network matching ${networkClientId}`
++      );
++    }
++  } else if (isCustomProviderConfig(providerConfig)) {
++    validateCustomProviderConfig(providerConfig);
++    const networkClientType = "custom" /* Custom */;
++    networkClientId = buildCustomNetworkClientId(
++      providerConfig,
++      this.state.networkConfigurations
++    );
++    const customNetworkClientRegistry = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _autoManagedNetworkClientRegistry)[networkClientType];
++    autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
++    if (!autoManagedNetworkClient) {
++      throw new Error(
++        `Could not find built-in network matching ${networkClientId}`
++      );
++    }
++  } else {
++    throw new Error("Could not determine type of provider config");
++  }
++  this.update((state) => {
++    state.selectedNetworkClientId = networkClientId;
++    if (state.networksMetadata[networkClientId] === void 0) {
++      state.networksMetadata[networkClientId] = {
++        status: "unknown" /* Unknown */,
++        EIPS: {}
++      };
++    }
++  });
++  const { provider, blockTracker } = autoManagedNetworkClient;
++  if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy)) {
++    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy).setTarget(provider);
++  } else {
++    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _providerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, provider));
++  }
++  if (_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy)) {
++    _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _blockTrackerProxy).setTarget(blockTracker);
++  } else {
++    _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _blockTrackerProxy, _swappableobjproxy.createEventEmitterProxy.call(void 0, blockTracker, {
++      eventFilter: "skipInternal"
++    }));
++  }
++  _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _ethQuery, new (0, _ethquery2.default)(_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _providerProxy)));
++};
++
++
++
++
++
++exports.knownKeysOf = knownKeysOf; exports.defaultState = defaultState; exports.NetworkController = NetworkController;
++//# sourceMappingURL=chunk-RSKJC2QZ.js.map
+\ No newline at end of file
+diff --git a/dist/chunk-RSKJC2QZ.js.map b/dist/chunk-RSKJC2QZ.js.map
+new file mode 100644
+index 0000000000000000000000000000000000000000..4a1d9fbeb4da3096ed23c0b527af20b1b8010f1e
+--- /dev/null
++++ b/dist/chunk-RSKJC2QZ.js.map
+@@ -0,0 +1 @@
++{"version":3,"sources":["../src/NetworkController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport {\n  BUILT_IN_NETWORKS,\n  NetworksTicker,\n  ChainId,\n  InfuraNetworkType,\n  NetworkType,\n  isSafeChainId,\n  isInfuraNetworkType,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport { errorCodes } from '@metamask/rpc-errors';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { SwappableProxy } from '@metamask/swappable-obj-proxy';\nimport type { Hex } from '@metamask/utils';\nimport {\n  assertIsStrictHexString,\n  hasProperty,\n  isPlainObject,\n} from '@metamask/utils';\nimport { strict as assert } from 'assert';\nimport { v4 as random } from 'uuid';\n\nimport { INFURA_BLOCKED_KEY, NetworkStatus } from './constants';\nimport type {\n  AutoManagedNetworkClient,\n  ProxyWithAccessibleTarget,\n} from './create-auto-managed-network-client';\nimport { createAutoManagedNetworkClient } from './create-auto-managed-network-client';\nimport { projectLogger, createModuleLogger } from './logger';\nimport { NetworkClientType } from './types';\nimport type {\n  BlockTracker,\n  Provider,\n  CustomNetworkClientConfiguration,\n  InfuraNetworkClientConfiguration,\n  NetworkClientConfiguration,\n} from './types';\n\nconst log = createModuleLogger(projectLogger, 'NetworkController');\n\n/**\n * @type ProviderConfig\n *\n * Configuration passed to web3-provider-engine\n * @property rpcUrl - RPC target URL.\n * @property type - Human-readable network name.\n * @property chainId - Network ID as per EIP-155.\n * @property ticker - Currency ticker.\n * @property nickname - Personalized network name.\n * @property id - Network Configuration Id.\n */\nexport type ProviderConfig = {\n  rpcUrl?: string;\n  type: NetworkType;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: { blockExplorerUrl?: string };\n  id?: NetworkConfigurationId;\n};\n\nexport type Block = {\n  baseFeePerGas?: string;\n};\n\n/**\n * Information about a network not held by any other part of state.\n */\nexport type NetworkMetadata = {\n  /**\n   * EIPs supported by the network.\n   */\n  EIPS: {\n    [eipNumber: number]: boolean;\n  };\n  /**\n   * Indicates the availability of the network\n   */\n  status: NetworkStatus;\n};\n\n/**\n * Custom RPC network information\n *\n * @property rpcUrl - RPC target URL.\n * @property chainId - Network ID as per EIP-155\n * @property nickname - Personalized network name.\n * @property ticker - Currency ticker.\n * @property rpcPrefs - Personalized preferences.\n */\nexport type NetworkConfiguration = {\n  rpcUrl: string;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: {\n    blockExplorerUrl: string;\n  };\n};\n\n/**\n * The collection of network configurations in state.\n */\ntype NetworkConfigurations = Record<\n  NetworkConfigurationId,\n  NetworkConfiguration & { id: NetworkConfigurationId }\n>;\n\n/**\n * `Object.keys()` is intentionally generic: it returns the keys of an object,\n * but it cannot make guarantees about the contents of that object, so the type\n * of the keys is merely `string[]`. While this is technically accurate, it is\n * also unnecessary if we have an object that we own and whose contents are\n * known exactly.\n *\n * TODO: Move to @metamask/utils.\n *\n * @param object - The object.\n * @returns The keys of an object, typed according to the type of the object\n * itself.\n */\nexport function knownKeysOf<K extends PropertyKey>(\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  object: Partial<Record<K, any>>,\n) {\n  return Object.keys(object) as K[];\n}\n\n/**\n * Asserts that the given value is of the given type if the given validation\n * function returns a truthy result.\n *\n * @param value - The value to validate.\n * @param validate - A function used to validate that the value is of the given\n * type. Takes the `value` as an argument and is expected to return true or\n * false.\n * @param message - The message to throw if the function does not return a\n * truthy result.\n * @throws if the function does not return a truthy result.\n */\nfunction assertOfType<Type>(\n  value: unknown,\n  validate: (value: unknown) => boolean,\n  message: string,\n): asserts value is Type {\n  assert.ok(validate(value), message);\n}\n\n/**\n * Returns a portion of the given object with only the given keys.\n *\n * @param object - An object.\n * @param keys - The keys to pick from the object.\n * @returns the portion of the object.\n */\n// TODO: Replace `any` with type\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction pick<Obj extends Record<any, any>, Keys extends keyof Obj>(\n  object: Obj,\n  keys: Keys[],\n): Pick<Obj, Keys> {\n  const pickedObject = keys.reduce<Partial<Pick<Obj, Keys>>>(\n    (finalObject, key) => {\n      return { ...finalObject, [key]: object[key] };\n    },\n    {},\n  );\n  assertOfType<Pick<Obj, Keys>>(\n    pickedObject,\n    () => keys.every((key) => key in pickedObject),\n    'The reduce did not produce an object with all of the desired keys.',\n  );\n  return pickedObject;\n}\n\n/**\n * Type guard for determining whether the given value is an error object with a\n * `code` property, such as an instance of Error.\n *\n * TODO: Move this to @metamask/utils.\n *\n * @param error - The object to check.\n * @returns True if `error` has a `code`, false otherwise.\n */\nfunction isErrorWithCode(error: unknown): error is { code: string | number } {\n  return typeof error === 'object' && error !== null && 'code' in error;\n}\n\n/**\n * Builds an identifier for an Infura network client for lookup purposes.\n *\n * @param infuraNetworkOrProviderConfig - The name of an Infura network or a\n * provider config.\n * @returns The built identifier.\n */\nfunction buildInfuraNetworkClientId(\n  infuraNetworkOrProviderConfig:\n    | InfuraNetworkType\n    | (ProviderConfig & { type: InfuraNetworkType }),\n): BuiltInNetworkClientId {\n  if (typeof infuraNetworkOrProviderConfig === 'string') {\n    return infuraNetworkOrProviderConfig;\n  }\n  return infuraNetworkOrProviderConfig.type;\n}\n\n/**\n * Builds an identifier for a custom network client for lookup purposes.\n *\n * @param args - This function can be called two ways:\n * 1. The ID of a network configuration.\n * 2. A provider config and a set of network configurations.\n * @returns The built identifier.\n */\nfunction buildCustomNetworkClientId(\n  ...args:\n    | [NetworkConfigurationId]\n    | [\n        ProviderConfig & { type: typeof NetworkType.rpc; rpcUrl: string },\n        NetworkConfigurations,\n      ]\n): CustomNetworkClientId {\n  if (args.length === 1) {\n    return args[0];\n  }\n  const [{ id, rpcUrl }, networkConfigurations] = args;\n  if (id === undefined) {\n    const matchingNetworkConfiguration = Object.values(\n      networkConfigurations,\n    ).find((networkConfiguration) => {\n      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();\n    });\n    if (matchingNetworkConfiguration) {\n      return matchingNetworkConfiguration.id;\n    }\n    return rpcUrl.toLowerCase();\n  }\n  return id;\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isInfuraProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: InfuraNetworkType } {\n  return isInfuraNetworkType(providerConfig.type);\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isCustomProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: typeof NetworkType.rpc } {\n  return providerConfig.type === NetworkType.rpc;\n}\n\n/**\n * As a provider config represents the settings that are used to interface with\n * an RPC endpoint, it must have both a chain ID and an RPC URL if it represents\n * a custom network. These properties _should_ be set as they are validated in\n * the UI when a user adds a custom network, but just to be safe we validate\n * them here.\n *\n * In addition, historically the `rpcUrl` property on the ProviderConfig type\n * has been optional, even though it should not be. Making this non-optional\n * would be a breaking change, so this function types the provider config\n * correctly so that we don't have to check `rpcUrl` in other places.\n *\n * @param providerConfig - A provider config.\n * @throws if the provider config does not have a chain ID or an RPC URL.\n */\nfunction validateCustomProviderConfig(\n  providerConfig: ProviderConfig & { type: typeof NetworkType.rpc },\n): asserts providerConfig is typeof providerConfig & { rpcUrl: string } {\n  if (providerConfig.chainId === undefined) {\n    throw new Error('chainId must be provided for custom RPC endpoints');\n  }\n  if (providerConfig.rpcUrl === undefined) {\n    throw new Error('rpcUrl must be provided for custom RPC endpoints');\n  }\n}\n/**\n * The string that uniquely identifies an Infura network client.\n */\nexport type BuiltInNetworkClientId = InfuraNetworkType;\n\n/**\n * The string that uniquely identifies a custom network client.\n */\nexport type CustomNetworkClientId = string;\n\n/**\n * The string that uniquely identifies a network client.\n */\nexport type NetworkClientId = BuiltInNetworkClientId | CustomNetworkClientId;\n\n/**\n * Information about networks not held by any other part of state.\n */\nexport type NetworksMetadata = {\n  [networkClientId: NetworkClientId]: NetworkMetadata;\n};\n\n/**\n * @type NetworkState\n *\n * Network controller state\n * @property providerConfig - RPC URL and network name provider settings of the currently connected network\n * @property properties - an additional set of network properties for the currently connected network\n * @property networkConfigurations - the full list of configured networks either preloaded or added by the user.\n */\nexport type NetworkState = {\n  selectedNetworkClientId: NetworkClientId;\n  providerConfig: ProviderConfig;\n  networkConfigurations: NetworkConfigurations;\n  networksMetadata: NetworksMetadata;\n};\n\nconst name = 'NetworkController';\n\n/**\n * Represents the block tracker for the currently selected network. (Note that\n * this is a proxy around a proxy: the inner one exists so that the block\n * tracker doesn't have to exist until it's used, and the outer one exists so\n * that the currently selected network can change without consumers needing to\n * refresh the object reference to that network.)\n */\nexport type BlockTrackerProxy = SwappableProxy<\n  ProxyWithAccessibleTarget<BlockTracker>\n>;\n\n/**\n * Represents the provider for the currently selected network. (Note that this\n * is a proxy around a proxy: the inner one exists so that the provider doesn't\n * have to exist until it's used, and the outer one exists so that the currently\n * selected network can change without consumers needing to refresh the object\n * reference to that network.)\n */\nexport type ProviderProxy = SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n\nexport type NetworkControllerStateChangeEvent = ControllerStateChangeEvent<\n  typeof name,\n  NetworkState\n>;\n\n/**\n * `networkWillChange` is published when the current network is about to be\n * switched, but the new provider has not been created and no state changes have\n * occurred yet.\n */\nexport type NetworkControllerNetworkWillChangeEvent = {\n  type: 'NetworkController:networkWillChange';\n  payload: [NetworkState];\n};\n\n/**\n * `networkDidChange` is published after a provider has been created for a newly\n * switched network (but before the network has been confirmed to be available).\n */\nexport type NetworkControllerNetworkDidChangeEvent = {\n  type: 'NetworkController:networkDidChange';\n  payload: [NetworkState];\n};\n\n/**\n * `infuraIsBlocked` is published after the network is switched to an Infura\n * network, but when Infura returns an error blocking the user based on their\n * location.\n */\nexport type NetworkControllerInfuraIsBlockedEvent = {\n  type: 'NetworkController:infuraIsBlocked';\n  payload: [];\n};\n\n/**\n * `infuraIsBlocked` is published either after the network is switched to an\n * Infura network and Infura does not return an error blocking the user based on\n * their location, or the network is switched to a non-Infura network.\n */\nexport type NetworkControllerInfuraIsUnblockedEvent = {\n  type: 'NetworkController:infuraIsUnblocked';\n  payload: [];\n};\n\nexport type NetworkControllerEvents =\n  | NetworkControllerStateChangeEvent\n  | NetworkControllerNetworkWillChangeEvent\n  | NetworkControllerNetworkDidChangeEvent\n  | NetworkControllerInfuraIsBlockedEvent\n  | NetworkControllerInfuraIsUnblockedEvent;\n\nexport type NetworkControllerGetStateAction = ControllerGetStateAction<\n  typeof name,\n  NetworkState\n>;\n\nexport type NetworkControllerGetProviderConfigAction = {\n  type: `NetworkController:getProviderConfig`;\n  handler: () => ProviderConfig;\n};\n\nexport type NetworkControllerGetEthQueryAction = {\n  type: `NetworkController:getEthQuery`;\n  handler: () => EthQuery | undefined;\n};\n\nexport type NetworkControllerGetNetworkClientByIdAction = {\n  type: `NetworkController:getNetworkClientById`;\n  handler: NetworkController['getNetworkClientById'];\n};\n\nexport type NetworkControllerGetSelectedNetworkClientAction = {\n  type: `NetworkController:getSelectedNetworkClient`;\n  handler: NetworkController['getSelectedNetworkClient'];\n};\n\nexport type NetworkControllerGetEIP1559CompatibilityAction = {\n  type: `NetworkController:getEIP1559Compatibility`;\n  handler: NetworkController['getEIP1559Compatibility'];\n};\n\nexport type NetworkControllerFindNetworkClientIdByChainIdAction = {\n  type: `NetworkController:findNetworkClientIdByChainId`;\n  handler: NetworkController['findNetworkClientIdByChainId'];\n};\n\n/**\n * Change the currently selected network to the given built-in network type.\n *\n * @deprecated This action has been replaced by `setActiveNetwork`, and will be\n * removed in a future release.\n */\nexport type NetworkControllerSetProviderTypeAction = {\n  type: `NetworkController:setProviderType`;\n  handler: NetworkController['setProviderType'];\n};\n\nexport type NetworkControllerSetActiveNetworkAction = {\n  type: `NetworkController:setActiveNetwork`;\n  handler: NetworkController['setActiveNetwork'];\n};\n\nexport type NetworkControllerGetNetworkConfigurationByNetworkClientId = {\n  type: `NetworkController:getNetworkConfigurationByNetworkClientId`;\n  handler: NetworkController['getNetworkConfigurationByNetworkClientId'];\n};\n\nexport type NetworkControllerActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetProviderConfigAction\n  | NetworkControllerGetEthQueryAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetEIP1559CompatibilityAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | NetworkControllerSetActiveNetworkAction\n  | NetworkControllerSetProviderTypeAction\n  | NetworkControllerGetNetworkConfigurationByNetworkClientId;\n\nexport type NetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof name,\n  NetworkControllerActions,\n  NetworkControllerEvents,\n  never,\n  never\n>;\n\nexport type NetworkControllerOptions = {\n  messenger: NetworkControllerMessenger;\n  trackMetaMetricsEvent: () => void;\n  infuraProjectId: string;\n  state?: Partial<NetworkState>;\n};\n\nexport const defaultState: NetworkState = {\n  selectedNetworkClientId: NetworkType.mainnet,\n  providerConfig: {\n    type: NetworkType.mainnet,\n    chainId: ChainId.mainnet,\n    ticker: NetworksTicker.mainnet,\n  },\n  networksMetadata: {},\n  networkConfigurations: {},\n};\n\ntype MetaMetricsEventPayload = {\n  event: string;\n  category: string;\n  referrer?: { url: string };\n  actionId?: number;\n  environmentType?: string;\n  properties?: unknown;\n  sensitiveProperties?: unknown;\n  revenue?: number;\n  currency?: string;\n  value?: number;\n};\n\ntype NetworkConfigurationId = string;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedBuiltInNetworkClientRegistry = Record<\n  BuiltInNetworkClientId,\n  AutoManagedNetworkClient<InfuraNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedCustomNetworkClientRegistry = Record<\n  CustomNetworkClientId,\n  AutoManagedNetworkClient<CustomNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks\n * as well as custom networks that users have added.\n */\ntype AutoManagedNetworkClientRegistry = {\n  [NetworkClientType.Infura]: AutoManagedBuiltInNetworkClientRegistry;\n  [NetworkClientType.Custom]: AutoManagedCustomNetworkClientRegistry;\n};\n\n/**\n * Controller that creates and manages an Ethereum network provider.\n */\nexport class NetworkController extends BaseController<\n  typeof name,\n  NetworkState,\n  NetworkControllerMessenger\n> {\n  #ethQuery?: EthQuery;\n\n  #infuraProjectId: string;\n\n  #trackMetaMetricsEvent: (event: MetaMetricsEventPayload) => void;\n\n  #previousProviderConfig: ProviderConfig;\n\n  #providerProxy: ProviderProxy | undefined;\n\n  #blockTrackerProxy: BlockTrackerProxy | undefined;\n\n  #autoManagedNetworkClientRegistry?: AutoManagedNetworkClientRegistry;\n\n  constructor({\n    messenger,\n    state,\n    infuraProjectId,\n    trackMetaMetricsEvent,\n  }: NetworkControllerOptions) {\n    super({\n      name,\n      metadata: {\n        selectedNetworkClientId: {\n          persist: true,\n          anonymous: false,\n        },\n        networksMetadata: {\n          persist: true,\n          anonymous: false,\n        },\n        providerConfig: {\n          persist: true,\n          anonymous: false,\n        },\n        networkConfigurations: {\n          persist: true,\n          anonymous: false,\n        },\n      },\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    if (!infuraProjectId || typeof infuraProjectId !== 'string') {\n      throw new Error('Invalid Infura project ID');\n    }\n    this.#infuraProjectId = infuraProjectId;\n    this.#trackMetaMetricsEvent = trackMetaMetricsEvent;\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getProviderConfig`,\n      () => {\n        return this.state.providerConfig;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEthQuery`,\n      () => {\n        return this.#ethQuery;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkClientById`,\n      this.getNetworkClientById.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEIP1559Compatibility`,\n      this.getEIP1559Compatibility.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setActiveNetwork`,\n      this.setActiveNetwork.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setProviderType`,\n      this.setProviderType.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:findNetworkClientIdByChainId`,\n      this.findNetworkClientIdByChainId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkConfigurationByNetworkClientId`,\n      this.getNetworkConfigurationByNetworkClientId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getSelectedNetworkClient`,\n      this.getSelectedNetworkClient.bind(this),\n    );\n\n    this.#previousProviderConfig = this.state.providerConfig;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   * @returns The proxy and block tracker proxies.\n   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.\n   */\n  getProviderAndBlockTracker(): {\n    provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>> | undefined;\n    blockTracker:\n      | SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>\n      | undefined;\n  } {\n    return {\n      provider: this.#providerProxy,\n      blockTracker: this.#blockTrackerProxy,\n    };\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @returns an object with the provider and block tracker proxies for the currently selected network.\n   */\n  getSelectedNetworkClient():\n    | {\n        provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n        blockTracker: SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>;\n      }\n    | undefined {\n    if (this.#providerProxy && this.#blockTrackerProxy) {\n      return {\n        provider: this.#providerProxy,\n        blockTracker: this.#blockTrackerProxy,\n      };\n    }\n    return undefined;\n  }\n\n  /**\n   * Returns all of the network clients that have been created so far, keyed by\n   * their identifier in the network client registry. This collection represents\n   * not only built-in networks but also any custom networks that consumers have\n   * added.\n   *\n   * @returns The list of known network clients.\n   */\n  getNetworkClientRegistry(): AutoManagedBuiltInNetworkClientRegistry &\n    AutoManagedCustomNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    return Object.assign(\n      {},\n      autoManagedNetworkClientRegistry[NetworkClientType.Infura],\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom],\n    );\n  }\n\n  /**\n   * Returns the Infura network client with the given ID.\n   *\n   * @param infuraNetworkClientId - An Infura network client ID.\n   * @returns The Infura network client.\n   * @throws If an Infura network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    infuraNetworkClientId: BuiltInNetworkClientId,\n  ): AutoManagedNetworkClient<InfuraNetworkClientConfiguration>;\n\n  /**\n   * Returns the custom network client with the given ID.\n   *\n   * @param customNetworkClientId - A custom network client ID.\n   * @returns The custom network client.\n   * @throws If a custom network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    customNetworkClientId: CustomNetworkClientId,\n  ): AutoManagedNetworkClient<CustomNetworkClientConfiguration>;\n\n  getNetworkClientById(\n    networkClientId: NetworkClientId,\n  ): AutoManagedNetworkClient<NetworkClientConfiguration> {\n    if (!networkClientId) {\n      throw new Error('No network client ID was provided.');\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    if (isInfuraNetworkType(networkClientId)) {\n      const infuraNetworkClient =\n        autoManagedNetworkClientRegistry[NetworkClientType.Infura][\n          networkClientId\n        ];\n      if (!infuraNetworkClient) {\n        throw new Error(\n          `No Infura network client was found with the ID \"${networkClientId}\".`,\n        );\n      }\n      return infuraNetworkClient;\n    }\n\n    const customNetworkClient =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom][\n        networkClientId\n      ];\n    if (!customNetworkClient) {\n      throw new Error(\n        `No custom network client was found with the ID \"${networkClientId}\".`,\n      );\n    }\n    return customNetworkClient;\n  }\n\n  /**\n   * Executes a series of steps to apply the changes to the provider config:\n   *\n   * 1. Notifies subscribers that the network is about to change.\n   * 2. Looks up a known and preinitialized network client matching the provider\n   * config and re-points the provider and block tracker proxy to it.\n   * 3. Notifies subscribers that the network has changed.\n   */\n  async #refreshNetwork() {\n    this.messagingSystem.publish(\n      'NetworkController:networkWillChange',\n      this.state,\n    );\n    this.#applyNetworkSelection();\n    this.messagingSystem.publish(\n      'NetworkController:networkDidChange',\n      this.state,\n    );\n    await this.lookupNetwork();\n  }\n\n  /**\n   * Populates the network clients and establishes the initial network based on\n   * the provider configuration in state.\n   */\n  async initializeProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.#applyNetworkSelection();\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    // await this.lookupNetwork();\n  }\n\n  /**\n   * Refreshes the network meta with EIP-1559 support and the network status\n   * based on the given network client ID.\n   *\n   * @param networkClientId - The ID of the network client to update.\n   */\n  async lookupNetworkByClientId(networkClientId: NetworkClientId) {\n    const isInfura = isInfuraNetworkType(networkClientId);\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      updatedIsEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        networkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else if (\n        typeof Error !== 'undefined' &&\n        hasProperty(error as unknown as Error, 'message') &&\n        typeof (error as unknown as Error).message === 'string' &&\n        (error as unknown as Error).message.includes(\n          'No custom network client was found with the ID',\n        )\n      ) {\n        throw error;\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n    this.update((state) => {\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n      const meta = state.networksMetadata[networkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n  }\n\n  /**\n   * Performs side effects after switching to a network. If the network is\n   * available, updates the network state with the network ID of the network and\n   * stores whether the network supports EIP-1559; otherwise clears said\n   * information about the network that may have been previously stored.\n   *\n   * @param networkClientId - (Optional) The ID of the network client to update.\n   * If no ID is provided, uses the currently selected network.\n   * @fires infuraIsBlocked if the network is Infura-supported and is blocking\n   * requests.\n   * @fires infuraIsUnblocked if the network is Infura-supported and is not\n   * blocking requests, or if the network is not Infura-supported.\n   */\n  async lookupNetwork(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      await this.lookupNetworkByClientId(networkClientId);\n      return;\n    }\n\n    if (!this.#ethQuery) {\n      return;\n    }\n\n    const isInfura = isInfuraProviderConfig(this.state.providerConfig);\n\n    let networkChanged = false;\n    const listener = () => {\n      networkChanged = true;\n      this.messagingSystem.unsubscribe(\n        'NetworkController:networkDidChange',\n        listener,\n      );\n    };\n    this.messagingSystem.subscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        this.state.selectedNetworkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n      updatedIsEIP1559Compatible = isEIP1559Compatible;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n\n    if (networkChanged) {\n      // If the network has changed, then `lookupNetwork` either has been or is\n      // in the process of being called, so we don't need to go further.\n      return;\n    }\n    this.messagingSystem.unsubscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    this.update((state) => {\n      const meta = state.networksMetadata[state.selectedNetworkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n\n    if (isInfura) {\n      if (updatedNetworkStatus === NetworkStatus.Available) {\n        this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n      } else if (updatedNetworkStatus === NetworkStatus.Blocked) {\n        this.messagingSystem.publish('NetworkController:infuraIsBlocked');\n      }\n    } else {\n      // Always publish infuraIsUnblocked regardless of network status to\n      // prevent consumers from being stuck in a blocked state if they were\n      // previously connected to an Infura network that was blocked\n      this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n    }\n  }\n\n  /**\n   * Convenience method to update provider network type settings.\n   *\n   * @param type - Human readable network name.\n   * @deprecated This has been replaced by `setActiveNetwork`, and will be\n   * removed in a future release\n   */\n  async setProviderType(type: InfuraNetworkType) {\n    assert.notStrictEqual(\n      type,\n      NetworkType.rpc,\n      `NetworkController - cannot call \"setProviderType\" with type \"${NetworkType.rpc}\". Use \"setActiveNetwork\"`,\n    );\n    assert.ok(\n      isInfuraNetworkType(type),\n      `Unknown Infura provider type \"${type}\".`,\n    );\n\n    await this.setActiveNetwork(type);\n  }\n\n  /**\n   * Convenience method to update provider RPC settings.\n   *\n   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,\n   * or the type of a built-in network.\n   */\n  async setActiveNetwork(networkConfigurationIdOrType: string) {\n    this.#previousProviderConfig = this.state.providerConfig;\n\n    let targetNetwork: ProviderConfig;\n    if (isInfuraNetworkType(networkConfigurationIdOrType)) {\n      const ticker = NetworksTicker[networkConfigurationIdOrType];\n\n      targetNetwork = {\n        chainId: ChainId[networkConfigurationIdOrType],\n        id: undefined,\n        rpcPrefs: BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,\n        rpcUrl: undefined,\n        nickname: undefined,\n        ticker,\n        type: networkConfigurationIdOrType,\n      };\n    } else {\n      if (\n        !Object.keys(this.state.networkConfigurations).includes(\n          networkConfigurationIdOrType,\n        )\n      ) {\n        throw new Error(\n          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`,\n        );\n      }\n      targetNetwork = {\n        ...this.state.networkConfigurations[networkConfigurationIdOrType],\n        type: NetworkType.rpc,\n      };\n    }\n\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = targetNetwork;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Fetches the latest block for the network.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.\n   * @returns A promise that either resolves to the block header or null if\n   * there is no latest block, or rejects with an error.\n   */\n  #getLatestBlock(networkClientId: NetworkClientId): Promise<Block> {\n    if (networkClientId === undefined) {\n      networkClientId = this.state.selectedNetworkClientId;\n    }\n\n    const networkClient = this.getNetworkClientById(networkClientId);\n    const ethQuery = new EthQuery(networkClient.provider);\n\n    return new Promise((resolve, reject) => {\n      ethQuery.sendAsync(\n        { method: 'eth_getBlockByNumber', params: ['latest', false] },\n        (error: unknown, block?: unknown) => {\n          if (error) {\n            reject(error);\n          } else {\n            // TODO: Validate this type\n            resolve(block as Block);\n          }\n        },\n      );\n    });\n  }\n\n  /**\n   * Determines whether the network supports EIP-1559 by checking whether the\n   * latest block has a `baseFeePerGas` property, then updates state\n   * appropriately.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.\n   * @returns A promise that resolves to true if the network supports EIP-1559\n   * , false otherwise, or `undefined` if unable to determine the compatibility.\n   */\n  async getEIP1559Compatibility(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      return this.get1559CompatibilityWithNetworkClientId(networkClientId);\n    }\n    if (!this.#ethQuery) {\n      return false;\n    }\n\n    const { EIPS } =\n      this.state.networksMetadata[this.state.selectedNetworkClientId];\n\n    if (EIPS[1559] !== undefined) {\n      return EIPS[1559];\n    }\n\n    const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n      this.state.selectedNetworkClientId,\n    );\n    this.update((state) => {\n      if (isEIP1559Compatible !== undefined) {\n        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] =\n          isEIP1559Compatible;\n      }\n    });\n    return isEIP1559Compatible;\n  }\n\n  async get1559CompatibilityWithNetworkClientId(\n    networkClientId: NetworkClientId,\n  ) {\n    let metadata = this.state.networksMetadata[networkClientId];\n    if (metadata === undefined) {\n      await this.lookupNetwork(networkClientId);\n      metadata = this.state.networksMetadata[networkClientId];\n    }\n    const { EIPS } = metadata;\n\n    // may want to include some 'freshness' value - something to make sure we refetch this from time to time\n    return EIPS[1559];\n  }\n\n  /**\n   * Retrieves and checks the latest block from the currently selected\n   * network; if the block has a `baseFeePerGas` property, then we know\n   * that the network supports EIP-1559; otherwise it doesn't.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility\n   * @returns A promise that resolves to `true` if the network supports EIP-1559,\n   * `false` otherwise, or `undefined` if unable to retrieve the last block.\n   */\n  async #determineEIP1559Compatibility(\n    networkClientId: NetworkClientId,\n  ): Promise<boolean | undefined> {\n    const latestBlock = await this.#getLatestBlock(networkClientId);\n\n    if (!latestBlock) {\n      return undefined;\n    }\n\n    return latestBlock.baseFeePerGas !== undefined;\n  }\n\n  /**\n   * Re-initializes the provider and block tracker for the current network.\n   */\n  async resetConnection() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Returns a configuration object for the network identified by the given\n   * network client ID. If given an Infura network type, constructs one based on\n   * what we know about the network; otherwise attempts locates a network\n   * configuration in state that corresponds to the network client ID.\n   *\n   * @param networkClientId - The network client ID.\n   * @returns The configuration for the referenced network if one exists, or\n   * undefined otherwise.\n   */\n  getNetworkConfigurationByNetworkClientId(\n    networkClientId: NetworkClientId,\n  ): NetworkConfiguration | undefined {\n    if (isInfuraNetworkType(networkClientId)) {\n      const rpcUrl = `https://${networkClientId}.infura.io/v3/${\n        this.#infuraProjectId\n      }`;\n      return {\n        rpcUrl,\n        ...BUILT_IN_NETWORKS[networkClientId],\n      };\n    }\n\n    return this.state.networkConfigurations[networkClientId];\n  }\n\n  /**\n   * Adds a new custom network or updates the information for an existing\n   * network.\n   *\n   * This may involve updating the `networkConfigurations` property in\n   * state as well and/or adding a new network client to the network client\n   * registry. The `rpcUrl` and `chainId` of the given object are used to\n   * determine which action to take:\n   *\n   * - If the `rpcUrl` corresponds to an existing network configuration\n   * (case-insensitively), then it is overwritten with the object. Furthermore,\n   * if the `chainId` is different from the existing network configuration, then\n   * the existing network client is replaced with a new one.\n   * - If the `rpcUrl` does not correspond to an existing network configuration\n   * (case-insensitively), then the object is used to add a new network\n   * configuration along with a new network client.\n   *\n   * @param networkConfiguration - The network configuration to add or update.\n   * @param options - Additional configuration options.\n   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.\n   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).\n   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).\n   * @returns The ID for the added or updated network configuration.\n   */\n  async upsertNetworkConfiguration(\n    // Core PR: https://github.com/MetaMask/core/pull/4614\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    networkConfiguration: NetworkConfiguration & {\n      id?: NetworkConfigurationId;\n    },\n    {\n      referrer,\n      source,\n      setActive = false,\n    }: {\n      referrer: string;\n      source: string;\n      setActive?: boolean;\n    },\n  ): Promise<string> {\n    // Core PR: https://github.com/MetaMask/core/pull/4614\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    const sanitizedNetworkConfiguration: NetworkConfiguration & {\n      id?: NetworkConfigurationId;\n    } = pick(networkConfiguration, [\n      'rpcUrl',\n      'chainId',\n      'ticker',\n      'nickname',\n      'rpcPrefs',\n      'id',\n    ]);\n    const { rpcUrl, chainId, ticker, id } = sanitizedNetworkConfiguration;\n\n    assertIsStrictHexString(chainId);\n    if (!isSafeChainId(chainId)) {\n      throw new Error(\n        `Invalid chain ID \"${chainId}\": numerical value greater than max safe value.`,\n      );\n    }\n    if (!rpcUrl) {\n      throw new Error(\n        'An rpcUrl is required to add or update network configuration',\n      );\n    }\n    if (!referrer || !source) {\n      throw new Error(\n        'referrer and source are required arguments for adding or updating a network configuration',\n      );\n    }\n    try {\n      new URL(rpcUrl);\n      // TODO: Replace `any` with type\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    } catch (e: any) {\n      if (e.message.includes('Invalid URL')) {\n        throw new Error('rpcUrl must be a valid URL');\n      }\n    }\n    if (!ticker) {\n      throw new Error(\n        'A ticker is required to add or update networkConfiguration',\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    // Core PR: https://github.com/MetaMask/core/pull/4614\n    // Core Patch Branch: jl/network-controller@18.1.2-patch\n    const existingNetworkConfigurationWithId = Object.values(\n      this.state.networkConfigurations,\n    ).find((networkConfig) => networkConfig.id === id);\n    if (id && !existingNetworkConfigurationWithId) {\n      throw new Error('No network configuration matches the provided id');\n    }\n\n    const existingNetworkConfigurationWithRpcUrl = Object.values(\n      this.state.networkConfigurations,\n    ).find(\n      (networkConfig) =>\n        networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase(),\n    );\n    if (\n      id &&\n      existingNetworkConfigurationWithRpcUrl &&\n      existingNetworkConfigurationWithRpcUrl.id !== id\n    ) {\n      throw new Error(\n        'A different network configuration already exists with the provided rpcUrl',\n      );\n    }\n\n    const existingNetworkConfiguration =\n      existingNetworkConfigurationWithId ??\n      existingNetworkConfigurationWithRpcUrl;\n\n    const upsertedNetworkConfigurationId = existingNetworkConfiguration\n      ? existingNetworkConfiguration.id\n      : random();\n    const networkClientId = buildCustomNetworkClientId(\n      upsertedNetworkConfigurationId,\n    );\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    const shouldDestroyExistingNetworkClient =\n      existingAutoManagedNetworkClient &&\n      existingAutoManagedNetworkClient.configuration.chainId !== chainId;\n    if (shouldDestroyExistingNetworkClient) {\n      existingAutoManagedNetworkClient.destroy();\n    }\n    if (\n      !existingAutoManagedNetworkClient ||\n      shouldDestroyExistingNetworkClient\n    ) {\n      customNetworkClientRegistry[networkClientId] =\n        createAutoManagedNetworkClient({\n          type: NetworkClientType.Custom,\n          chainId,\n          rpcUrl,\n          ticker,\n        });\n    }\n\n    this.update((state) => {\n      state.networkConfigurations[upsertedNetworkConfigurationId] = {\n        // Core PR: https://github.com/MetaMask/core/pull/4614\n        // Core Patch Branch: jl/network-controller@18.1.2-patch\n        ...sanitizedNetworkConfiguration,\n        id: upsertedNetworkConfigurationId,\n      };\n    });\n\n    if (!existingNetworkConfiguration) {\n      this.#trackMetaMetricsEvent({\n        event: 'Custom Network Added',\n        category: 'Network',\n        referrer: {\n          url: referrer,\n        },\n        properties: {\n          chain_id: chainId,\n          symbol: ticker,\n          source,\n        },\n      });\n    }\n\n    if (setActive) {\n      await this.setActiveNetwork(upsertedNetworkConfigurationId);\n    }\n\n    return upsertedNetworkConfigurationId;\n  }\n\n  /**\n   * Removes a custom network from state.\n   *\n   * This involves updating the `networkConfigurations` property in state as\n   * well and removing the network client that corresponds to the network from\n   * the client registry.\n   *\n   * @param networkConfigurationId - The ID of an existing network\n   * configuration.\n   */\n  removeNetworkConfiguration(networkConfigurationId: string) {\n    if (!this.state.networkConfigurations[networkConfigurationId]) {\n      throw new Error(\n        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`,\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);\n\n    this.update((state) => {\n      delete state.networkConfigurations[networkConfigurationId];\n    });\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    existingAutoManagedNetworkClient.destroy();\n    delete customNetworkClientRegistry[networkClientId];\n  }\n\n  /**\n   * Switches to the previously selected network, assuming that there is one\n   * (if not and `initializeProvider` has not been previously called, then this\n   * method is equivalent to calling `resetConnection`).\n   */\n  async rollbackToPreviousProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = this.#previousProviderConfig;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Deactivates the controller, stopping any ongoing polling.\n   *\n   * In-progress requests will not be aborted.\n   */\n  async destroy() {\n    await this.#blockTrackerProxy?.destroy();\n  }\n\n  /**\n   * Updates the controller using the given backup data.\n   *\n   * @param backup - The data that has been backed up.\n   * @param backup.networkConfigurations - Network configurations in the backup.\n   */\n  loadBackup({\n    networkConfigurations,\n  }: {\n    networkConfigurations: NetworkState['networkConfigurations'];\n  }): void {\n    this.update((state) => {\n      state.networkConfigurations = {\n        ...state.networkConfigurations,\n        ...networkConfigurations,\n      };\n    });\n  }\n\n  /**\n   * Searches for a network configuration ID with the given ChainID and returns it.\n   *\n   * @param chainId - ChainId to search for\n   * @returns networkClientId of the network configuration with the given chainId\n   */\n  findNetworkClientIdByChainId(chainId: Hex): NetworkClientId {\n    const networkClients = this.getNetworkClientRegistry();\n    const networkClientEntry = Object.entries(networkClients).find(\n      ([_, networkClient]) => networkClient.configuration.chainId === chainId,\n    );\n    if (networkClientEntry === undefined) {\n      throw new Error(\"Couldn't find networkClientId for chainId\");\n    }\n    return networkClientEntry[0];\n  }\n\n  /**\n   * Before accessing or switching the network, the registry of network clients\n   * needs to be populated. Otherwise, `#applyNetworkSelection` and\n   * `getNetworkClientRegistry` will throw an error. This method checks to see if the\n   * population step has happened yet, and if not, makes it happen.\n   *\n   * @returns The populated network client registry.\n   */\n  #ensureAutoManagedNetworkClientRegistryPopulated(): AutoManagedNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#autoManagedNetworkClientRegistry ??\n      this.#createAutoManagedNetworkClientRegistry();\n    this.#autoManagedNetworkClientRegistry = autoManagedNetworkClientRegistry;\n    return autoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the registry of network clients based on the set of built-in\n   * networks as well as the custom networks in state.\n   *\n   * @returns The network clients keyed by ID.\n   */\n  #createAutoManagedNetworkClientRegistry(): AutoManagedNetworkClientRegistry {\n    return [\n      ...this.#buildIdentifiedInfuraNetworkClientConfigurations(),\n      ...this.#buildIdentifiedCustomNetworkClientConfigurations(),\n      ...this.#buildIdentifiedNetworkClientConfigurationsFromProviderConfig(),\n    ].reduce(\n      (\n        registry,\n        [networkClientType, networkClientId, networkClientConfiguration],\n      ) => {\n        const autoManagedNetworkClient = createAutoManagedNetworkClient(\n          networkClientConfiguration,\n        );\n        if (networkClientId in registry[networkClientType]) {\n          return registry;\n        }\n        return {\n          ...registry,\n          [networkClientType]: {\n            ...registry[networkClientType],\n            [networkClientId]: autoManagedNetworkClient,\n          },\n        };\n      },\n      {\n        [NetworkClientType.Infura]: {},\n        [NetworkClientType.Custom]: {},\n      },\n    ) as AutoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the list of network clients for built-in networks (that is,\n   * the subset of the networks we know Infura supports that consumers do not\n   * need to explicitly add).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedInfuraNetworkClientConfigurations(): [\n    NetworkClientType.Infura,\n    BuiltInNetworkClientId,\n    InfuraNetworkClientConfiguration,\n  ][] {\n    return knownKeysOf(InfuraNetworkType).map((network) => {\n      const networkClientId = buildInfuraNetworkClientId(network);\n      const networkClientConfiguration: InfuraNetworkClientConfiguration = {\n        type: NetworkClientType.Infura,\n        network,\n        infuraProjectId: this.#infuraProjectId,\n        chainId: BUILT_IN_NETWORKS[network].chainId,\n        ticker: BUILT_IN_NETWORKS[network].ticker,\n      };\n      return [\n        NetworkClientType.Infura,\n        networkClientId,\n        networkClientConfiguration,\n      ];\n    });\n  }\n\n  /**\n   * Constructs the list of network clients for custom networks (that is, those\n   * which consumers have added via `networkConfigurations`).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedCustomNetworkClientConfigurations(): [\n    NetworkClientType.Custom,\n    CustomNetworkClientId,\n    CustomNetworkClientConfiguration,\n  ][] {\n    return Object.entries(this.state.networkConfigurations).map(\n      ([networkConfigurationId, networkConfiguration]) => {\n        if (networkConfiguration.chainId === undefined) {\n          throw new Error('chainId must be provided for custom RPC endpoints');\n        }\n        if (networkConfiguration.rpcUrl === undefined) {\n          throw new Error('rpcUrl must be provided for custom RPC endpoints');\n        }\n        const networkClientId = buildCustomNetworkClientId(\n          networkConfigurationId,\n        );\n        const networkClientConfiguration: CustomNetworkClientConfiguration = {\n          type: NetworkClientType.Custom,\n          chainId: networkConfiguration.chainId,\n          rpcUrl: networkConfiguration.rpcUrl,\n          ticker: networkConfiguration.ticker,\n        };\n        return [\n          NetworkClientType.Custom,\n          networkClientId,\n          networkClientConfiguration,\n        ];\n      },\n    );\n  }\n\n  /**\n   * Converts the provider config object in state to a network client\n   * configuration object.\n   *\n   * @returns The network client config.\n   * @throws If the provider config is of type \"rpc\" and lacks either a\n   * `chainId` or an `rpcUrl`.\n   */\n  #buildIdentifiedNetworkClientConfigurationsFromProviderConfig():\n    | [\n        [\n          NetworkClientType.Custom,\n          CustomNetworkClientId,\n          CustomNetworkClientConfiguration,\n        ],\n      ]\n    | [] {\n    const { providerConfig } = this.state;\n\n    if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const networkClientConfiguration: CustomNetworkClientConfiguration = {\n        chainId: providerConfig.chainId,\n        rpcUrl: providerConfig.rpcUrl,\n        type: NetworkClientType.Custom,\n        ticker: providerConfig.ticker,\n      };\n      return [\n        [NetworkClientType.Custom, networkClientId, networkClientConfiguration],\n      ];\n    }\n\n    if (isInfuraProviderConfig(providerConfig)) {\n      return [];\n    }\n\n    throw new Error(`Unrecognized network type: '${providerConfig.type}'`);\n  }\n\n  /**\n   * Uses the information in the provider config object to look up a known and\n   * preinitialized network client. Once a network client is found, updates the\n   * provider and block tracker proxy to point to those from the network client,\n   * then finally creates an EthQuery that points to the provider proxy.\n   *\n   * @throws If no network client could be found matching the current provider\n   * config.\n   */\n  #applyNetworkSelection() {\n    if (!this.#autoManagedNetworkClientRegistry) {\n      throw new Error(\n        'initializeProvider must be called first in order to switch the network',\n      );\n    }\n\n    const { providerConfig } = this.state;\n\n    let autoManagedNetworkClient: AutoManagedNetworkClient<NetworkClientConfiguration>;\n\n    let networkClientId: NetworkClientId;\n    if (isInfuraProviderConfig(providerConfig)) {\n      const networkClientType = NetworkClientType.Infura;\n      networkClientId = buildInfuraNetworkClientId(providerConfig);\n      const builtInNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient =\n        builtInNetworkClientRegistry[networkClientId as BuiltInNetworkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find custom network matching ${networkClientId}`,\n        );\n      }\n    } else if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientType = NetworkClientType.Custom;\n      networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const customNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find built-in network matching ${networkClientId}`,\n        );\n      }\n    } else {\n      throw new Error('Could not determine type of provider config');\n    }\n\n    this.update((state) => {\n      state.selectedNetworkClientId = networkClientId;\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n    });\n\n    const { provider, blockTracker } = autoManagedNetworkClient;\n\n    if (this.#providerProxy) {\n      this.#providerProxy.setTarget(provider);\n    } else {\n      this.#providerProxy = createEventEmitterProxy(provider);\n    }\n\n    if (this.#blockTrackerProxy) {\n      this.#blockTrackerProxy.setTarget(blockTracker);\n    } else {\n      this.#blockTrackerProxy = createEventEmitterProxy(blockTracker, {\n        eventFilter: 'skipInternal',\n      });\n    }\n\n    this.#ethQuery = new EthQuery(this.#providerProxy);\n  }\n}\n"]}
+\ No newline at end of file
 diff --git a/dist/chunk-UG2NYGJD.mjs b/dist/chunk-UG2NYGJD.mjs
-index c39eb49a4a1d2b4ddb78aadb4fb03446b1705528..cd7ce41f31434e66b56f584c177d4952e334e212 100644
+deleted file mode 100644
+index c39eb49a4a1d2b4ddb78aadb4fb03446b1705528..0000000000000000000000000000000000000000
 --- a/dist/chunk-UG2NYGJD.mjs
-+++ b/dist/chunk-UG2NYGJD.mjs
-@@ -341,7 +341,6 @@ var NetworkController = class extends BaseController {
-   async initializeProvider() {
-     __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
-     __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
++++ /dev/null
+@@ -1,1017 +0,0 @@
+-import {
+-  INFURA_BLOCKED_KEY
+-} from "./chunk-2QJYHWIP.mjs";
+-import {
+-  createAutoManagedNetworkClient
+-} from "./chunk-G5HYTGGH.mjs";
+-import {
+-  createModuleLogger,
+-  projectLogger
+-} from "./chunk-VTLOAS2R.mjs";
+-import {
+-  __privateAdd,
+-  __privateGet,
+-  __privateMethod,
+-  __privateSet
+-} from "./chunk-XUI43LEZ.mjs";
+-
+-// src/NetworkController.ts
+-import { BaseController } from "@metamask/base-controller";
+-import {
+-  BUILT_IN_NETWORKS,
+-  NetworksTicker,
+-  ChainId,
+-  InfuraNetworkType,
+-  NetworkType,
+-  isSafeChainId,
+-  isInfuraNetworkType
+-} from "@metamask/controller-utils";
+-import EthQuery from "@metamask/eth-query";
+-import { errorCodes } from "@metamask/rpc-errors";
+-import { createEventEmitterProxy } from "@metamask/swappable-obj-proxy";
+-import {
+-  assertIsStrictHexString,
+-  hasProperty,
+-  isPlainObject
+-} from "@metamask/utils";
+-import { strict as assert } from "assert";
+-import { v4 as random } from "uuid";
+-var log = createModuleLogger(projectLogger, "NetworkController");
+-function knownKeysOf(object) {
+-  return Object.keys(object);
+-}
+-function assertOfType(value, validate, message) {
+-  assert.ok(validate(value), message);
+-}
+-function pick(object, keys) {
+-  const pickedObject = keys.reduce(
+-    (finalObject, key) => {
+-      return { ...finalObject, [key]: object[key] };
+-    },
+-    {}
+-  );
+-  assertOfType(
+-    pickedObject,
+-    () => keys.every((key) => key in pickedObject),
+-    "The reduce did not produce an object with all of the desired keys."
+-  );
+-  return pickedObject;
+-}
+-function isErrorWithCode(error) {
+-  return typeof error === "object" && error !== null && "code" in error;
+-}
+-function buildInfuraNetworkClientId(infuraNetworkOrProviderConfig) {
+-  if (typeof infuraNetworkOrProviderConfig === "string") {
+-    return infuraNetworkOrProviderConfig;
+-  }
+-  return infuraNetworkOrProviderConfig.type;
+-}
+-function buildCustomNetworkClientId(...args) {
+-  if (args.length === 1) {
+-    return args[0];
+-  }
+-  const [{ id, rpcUrl }, networkConfigurations] = args;
+-  if (id === void 0) {
+-    const matchingNetworkConfiguration = Object.values(
+-      networkConfigurations
+-    ).find((networkConfiguration) => {
+-      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();
+-    });
+-    if (matchingNetworkConfiguration) {
+-      return matchingNetworkConfiguration.id;
+-    }
+-    return rpcUrl.toLowerCase();
+-  }
+-  return id;
+-}
+-function isInfuraProviderConfig(providerConfig) {
+-  return isInfuraNetworkType(providerConfig.type);
+-}
+-function isCustomProviderConfig(providerConfig) {
+-  return providerConfig.type === NetworkType.rpc;
+-}
+-function validateCustomProviderConfig(providerConfig) {
+-  if (providerConfig.chainId === void 0) {
+-    throw new Error("chainId must be provided for custom RPC endpoints");
+-  }
+-  if (providerConfig.rpcUrl === void 0) {
+-    throw new Error("rpcUrl must be provided for custom RPC endpoints");
+-  }
+-}
+-var name = "NetworkController";
+-var defaultState = {
+-  selectedNetworkClientId: NetworkType.mainnet,
+-  providerConfig: {
+-    type: NetworkType.mainnet,
+-    chainId: ChainId.mainnet,
+-    ticker: NetworksTicker.mainnet
+-  },
+-  networksMetadata: {},
+-  networkConfigurations: {}
+-};
+-var _ethQuery, _infuraProjectId, _trackMetaMetricsEvent, _previousProviderConfig, _providerProxy, _blockTrackerProxy, _autoManagedNetworkClientRegistry, _refreshNetwork, refreshNetwork_fn, _getLatestBlock, getLatestBlock_fn, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn, _applyNetworkSelection, applyNetworkSelection_fn;
+-var NetworkController = class extends BaseController {
+-  constructor({
+-    messenger,
+-    state,
+-    infuraProjectId,
+-    trackMetaMetricsEvent
+-  }) {
+-    super({
+-      name,
+-      metadata: {
+-        selectedNetworkClientId: {
+-          persist: true,
+-          anonymous: false
+-        },
+-        networksMetadata: {
+-          persist: true,
+-          anonymous: false
+-        },
+-        providerConfig: {
+-          persist: true,
+-          anonymous: false
+-        },
+-        networkConfigurations: {
+-          persist: true,
+-          anonymous: false
+-        }
+-      },
+-      messenger,
+-      state: { ...defaultState, ...state }
+-    });
+-    /**
+-     * Executes a series of steps to apply the changes to the provider config:
+-     *
+-     * 1. Notifies subscribers that the network is about to change.
+-     * 2. Looks up a known and preinitialized network client matching the provider
+-     * config and re-points the provider and block tracker proxy to it.
+-     * 3. Notifies subscribers that the network has changed.
+-     */
+-    __privateAdd(this, _refreshNetwork);
+-    /**
+-     * Fetches the latest block for the network.
+-     *
+-     * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.
+-     * @returns A promise that either resolves to the block header or null if
+-     * there is no latest block, or rejects with an error.
+-     */
+-    __privateAdd(this, _getLatestBlock);
+-    /**
+-     * Retrieves and checks the latest block from the currently selected
+-     * network; if the block has a `baseFeePerGas` property, then we know
+-     * that the network supports EIP-1559; otherwise it doesn't.
+-     *
+-     * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility
+-     * @returns A promise that resolves to `true` if the network supports EIP-1559,
+-     * `false` otherwise, or `undefined` if unable to retrieve the last block.
+-     */
+-    __privateAdd(this, _determineEIP1559Compatibility);
+-    /**
+-     * Before accessing or switching the network, the registry of network clients
+-     * needs to be populated. Otherwise, `#applyNetworkSelection` and
+-     * `getNetworkClientRegistry` will throw an error. This method checks to see if the
+-     * population step has happened yet, and if not, makes it happen.
+-     *
+-     * @returns The populated network client registry.
+-     */
+-    __privateAdd(this, _ensureAutoManagedNetworkClientRegistryPopulated);
+-    /**
+-     * Constructs the registry of network clients based on the set of built-in
+-     * networks as well as the custom networks in state.
+-     *
+-     * @returns The network clients keyed by ID.
+-     */
+-    __privateAdd(this, _createAutoManagedNetworkClientRegistry);
+-    /**
+-     * Constructs the list of network clients for built-in networks (that is,
+-     * the subset of the networks we know Infura supports that consumers do not
+-     * need to explicitly add).
+-     *
+-     * @returns The network clients.
+-     */
+-    __privateAdd(this, _buildIdentifiedInfuraNetworkClientConfigurations);
+-    /**
+-     * Constructs the list of network clients for custom networks (that is, those
+-     * which consumers have added via `networkConfigurations`).
+-     *
+-     * @returns The network clients.
+-     */
+-    __privateAdd(this, _buildIdentifiedCustomNetworkClientConfigurations);
+-    /**
+-     * Converts the provider config object in state to a network client
+-     * configuration object.
+-     *
+-     * @returns The network client config.
+-     * @throws If the provider config is of type "rpc" and lacks either a
+-     * `chainId` or an `rpcUrl`.
+-     */
+-    __privateAdd(this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig);
+-    /**
+-     * Uses the information in the provider config object to look up a known and
+-     * preinitialized network client. Once a network client is found, updates the
+-     * provider and block tracker proxy to point to those from the network client,
+-     * then finally creates an EthQuery that points to the provider proxy.
+-     *
+-     * @throws If no network client could be found matching the current provider
+-     * config.
+-     */
+-    __privateAdd(this, _applyNetworkSelection);
+-    __privateAdd(this, _ethQuery, void 0);
+-    __privateAdd(this, _infuraProjectId, void 0);
+-    __privateAdd(this, _trackMetaMetricsEvent, void 0);
+-    __privateAdd(this, _previousProviderConfig, void 0);
+-    __privateAdd(this, _providerProxy, void 0);
+-    __privateAdd(this, _blockTrackerProxy, void 0);
+-    __privateAdd(this, _autoManagedNetworkClientRegistry, void 0);
+-    if (!infuraProjectId || typeof infuraProjectId !== "string") {
+-      throw new Error("Invalid Infura project ID");
+-    }
+-    __privateSet(this, _infuraProjectId, infuraProjectId);
+-    __privateSet(this, _trackMetaMetricsEvent, trackMetaMetricsEvent);
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getProviderConfig`,
+-      () => {
+-        return this.state.providerConfig;
+-      }
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getEthQuery`,
+-      () => {
+-        return __privateGet(this, _ethQuery);
+-      }
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getNetworkClientById`,
+-      this.getNetworkClientById.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getEIP1559Compatibility`,
+-      this.getEIP1559Compatibility.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:setActiveNetwork`,
+-      this.setActiveNetwork.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:setProviderType`,
+-      this.setProviderType.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:findNetworkClientIdByChainId`,
+-      this.findNetworkClientIdByChainId.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getNetworkConfigurationByNetworkClientId`,
+-      this.getNetworkConfigurationByNetworkClientId.bind(this)
+-    );
+-    this.messagingSystem.registerActionHandler(
+-      `${this.name}:getSelectedNetworkClient`,
+-      this.getSelectedNetworkClient.bind(this)
+-    );
+-    __privateSet(this, _previousProviderConfig, this.state.providerConfig);
+-  }
+-  /**
+-   * Accesses the provider and block tracker for the currently selected network.
+-   * @returns The proxy and block tracker proxies.
+-   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.
+-   */
+-  getProviderAndBlockTracker() {
+-    return {
+-      provider: __privateGet(this, _providerProxy),
+-      blockTracker: __privateGet(this, _blockTrackerProxy)
+-    };
+-  }
+-  /**
+-   * Accesses the provider and block tracker for the currently selected network.
+-   *
+-   * @returns an object with the provider and block tracker proxies for the currently selected network.
+-   */
+-  getSelectedNetworkClient() {
+-    if (__privateGet(this, _providerProxy) && __privateGet(this, _blockTrackerProxy)) {
+-      return {
+-        provider: __privateGet(this, _providerProxy),
+-        blockTracker: __privateGet(this, _blockTrackerProxy)
+-      };
+-    }
+-    return void 0;
+-  }
+-  /**
+-   * Returns all of the network clients that have been created so far, keyed by
+-   * their identifier in the network client registry. This collection represents
+-   * not only built-in networks but also any custom networks that consumers have
+-   * added.
+-   *
+-   * @returns The list of known network clients.
+-   */
+-  getNetworkClientRegistry() {
+-    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    return Object.assign(
+-      {},
+-      autoManagedNetworkClientRegistry["infura" /* Infura */],
+-      autoManagedNetworkClientRegistry["custom" /* Custom */]
+-    );
+-  }
+-  getNetworkClientById(networkClientId) {
+-    if (!networkClientId) {
+-      throw new Error("No network client ID was provided.");
+-    }
+-    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    if (isInfuraNetworkType(networkClientId)) {
+-      const infuraNetworkClient = autoManagedNetworkClientRegistry["infura" /* Infura */][networkClientId];
+-      if (!infuraNetworkClient) {
+-        throw new Error(
+-          `No Infura network client was found with the ID "${networkClientId}".`
+-        );
+-      }
+-      return infuraNetworkClient;
+-    }
+-    const customNetworkClient = autoManagedNetworkClientRegistry["custom" /* Custom */][networkClientId];
+-    if (!customNetworkClient) {
+-      throw new Error(
+-        `No custom network client was found with the ID "${networkClientId}".`
+-      );
+-    }
+-    return customNetworkClient;
+-  }
+-  /**
+-   * Populates the network clients and establishes the initial network based on
+-   * the provider configuration in state.
+-   */
+-  async initializeProvider() {
+-    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
 -    await this.lookupNetwork();
-   }
-   /**
-    * Refreshes the network meta with EIP-1559 support and the network status
+-  }
+-  /**
+-   * Refreshes the network meta with EIP-1559 support and the network status
+-   * based on the given network client ID.
+-   *
+-   * @param networkClientId - The ID of the network client to update.
+-   */
+-  async lookupNetworkByClientId(networkClientId) {
+-    const isInfura = isInfuraNetworkType(networkClientId);
+-    let updatedNetworkStatus;
+-    let updatedIsEIP1559Compatible;
+-    try {
+-      updatedIsEIP1559Compatible = await __privateMethod(this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, networkClientId);
+-      updatedNetworkStatus = "available" /* Available */;
+-    } catch (error) {
+-      if (isErrorWithCode(error)) {
+-        let responseBody;
+-        if (isInfura && hasProperty(error, "message") && typeof error.message === "string") {
+-          try {
+-            responseBody = JSON.parse(error.message);
+-          } catch {
+-          }
+-        }
+-        if (isPlainObject(responseBody) && responseBody.error === INFURA_BLOCKED_KEY) {
+-          updatedNetworkStatus = "blocked" /* Blocked */;
+-        } else if (error.code === errorCodes.rpc.internal) {
+-          updatedNetworkStatus = "unknown" /* Unknown */;
+-        } else {
+-          updatedNetworkStatus = "unavailable" /* Unavailable */;
+-        }
+-      } else if (typeof Error !== "undefined" && hasProperty(error, "message") && typeof error.message === "string" && error.message.includes(
+-        "No custom network client was found with the ID"
+-      )) {
+-        throw error;
+-      } else {
+-        log("NetworkController - could not determine network status", error);
+-        updatedNetworkStatus = "unknown" /* Unknown */;
+-      }
+-    }
+-    this.update((state) => {
+-      if (state.networksMetadata[networkClientId] === void 0) {
+-        state.networksMetadata[networkClientId] = {
+-          status: "unknown" /* Unknown */,
+-          EIPS: {}
+-        };
+-      }
+-      const meta = state.networksMetadata[networkClientId];
+-      meta.status = updatedNetworkStatus;
+-      if (updatedIsEIP1559Compatible === void 0) {
+-        delete meta.EIPS[1559];
+-      } else {
+-        meta.EIPS[1559] = updatedIsEIP1559Compatible;
+-      }
+-    });
+-  }
+-  /**
+-   * Performs side effects after switching to a network. If the network is
+-   * available, updates the network state with the network ID of the network and
+-   * stores whether the network supports EIP-1559; otherwise clears said
+-   * information about the network that may have been previously stored.
+-   *
+-   * @param networkClientId - (Optional) The ID of the network client to update.
+-   * If no ID is provided, uses the currently selected network.
+-   * @fires infuraIsBlocked if the network is Infura-supported and is blocking
+-   * requests.
+-   * @fires infuraIsUnblocked if the network is Infura-supported and is not
+-   * blocking requests, or if the network is not Infura-supported.
+-   */
+-  async lookupNetwork(networkClientId) {
+-    if (networkClientId) {
+-      await this.lookupNetworkByClientId(networkClientId);
+-      return;
+-    }
+-    if (!__privateGet(this, _ethQuery)) {
+-      return;
+-    }
+-    const isInfura = isInfuraProviderConfig(this.state.providerConfig);
+-    let networkChanged = false;
+-    const listener = () => {
+-      networkChanged = true;
+-      this.messagingSystem.unsubscribe(
+-        "NetworkController:networkDidChange",
+-        listener
+-      );
+-    };
+-    this.messagingSystem.subscribe(
+-      "NetworkController:networkDidChange",
+-      listener
+-    );
+-    let updatedNetworkStatus;
+-    let updatedIsEIP1559Compatible;
+-    try {
+-      const isEIP1559Compatible = await __privateMethod(this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
+-      updatedNetworkStatus = "available" /* Available */;
+-      updatedIsEIP1559Compatible = isEIP1559Compatible;
+-    } catch (error) {
+-      if (isErrorWithCode(error)) {
+-        let responseBody;
+-        if (isInfura && hasProperty(error, "message") && typeof error.message === "string") {
+-          try {
+-            responseBody = JSON.parse(error.message);
+-          } catch {
+-          }
+-        }
+-        if (isPlainObject(responseBody) && responseBody.error === INFURA_BLOCKED_KEY) {
+-          updatedNetworkStatus = "blocked" /* Blocked */;
+-        } else if (error.code === errorCodes.rpc.internal) {
+-          updatedNetworkStatus = "unknown" /* Unknown */;
+-        } else {
+-          updatedNetworkStatus = "unavailable" /* Unavailable */;
+-        }
+-      } else {
+-        log("NetworkController - could not determine network status", error);
+-        updatedNetworkStatus = "unknown" /* Unknown */;
+-      }
+-    }
+-    if (networkChanged) {
+-      return;
+-    }
+-    this.messagingSystem.unsubscribe(
+-      "NetworkController:networkDidChange",
+-      listener
+-    );
+-    this.update((state) => {
+-      const meta = state.networksMetadata[state.selectedNetworkClientId];
+-      meta.status = updatedNetworkStatus;
+-      if (updatedIsEIP1559Compatible === void 0) {
+-        delete meta.EIPS[1559];
+-      } else {
+-        meta.EIPS[1559] = updatedIsEIP1559Compatible;
+-      }
+-    });
+-    if (isInfura) {
+-      if (updatedNetworkStatus === "available" /* Available */) {
+-        this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
+-      } else if (updatedNetworkStatus === "blocked" /* Blocked */) {
+-        this.messagingSystem.publish("NetworkController:infuraIsBlocked");
+-      }
+-    } else {
+-      this.messagingSystem.publish("NetworkController:infuraIsUnblocked");
+-    }
+-  }
+-  /**
+-   * Convenience method to update provider network type settings.
+-   *
+-   * @param type - Human readable network name.
+-   * @deprecated This has been replaced by `setActiveNetwork`, and will be
+-   * removed in a future release
+-   */
+-  async setProviderType(type) {
+-    assert.notStrictEqual(
+-      type,
+-      NetworkType.rpc,
+-      `NetworkController - cannot call "setProviderType" with type "${NetworkType.rpc}". Use "setActiveNetwork"`
+-    );
+-    assert.ok(
+-      isInfuraNetworkType(type),
+-      `Unknown Infura provider type "${type}".`
+-    );
+-    await this.setActiveNetwork(type);
+-  }
+-  /**
+-   * Convenience method to update provider RPC settings.
+-   *
+-   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,
+-   * or the type of a built-in network.
+-   */
+-  async setActiveNetwork(networkConfigurationIdOrType) {
+-    __privateSet(this, _previousProviderConfig, this.state.providerConfig);
+-    let targetNetwork;
+-    if (isInfuraNetworkType(networkConfigurationIdOrType)) {
+-      const ticker = NetworksTicker[networkConfigurationIdOrType];
+-      targetNetwork = {
+-        chainId: ChainId[networkConfigurationIdOrType],
+-        id: void 0,
+-        rpcPrefs: BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,
+-        rpcUrl: void 0,
+-        nickname: void 0,
+-        ticker,
+-        type: networkConfigurationIdOrType
+-      };
+-    } else {
+-      if (!Object.keys(this.state.networkConfigurations).includes(
+-        networkConfigurationIdOrType
+-      )) {
+-        throw new Error(
+-          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`
+-        );
+-      }
+-      targetNetwork = {
+-        ...this.state.networkConfigurations[networkConfigurationIdOrType],
+-        type: NetworkType.rpc
+-      };
+-    }
+-    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    this.update((state) => {
+-      state.providerConfig = targetNetwork;
+-    });
+-    await __privateMethod(this, _refreshNetwork, refreshNetwork_fn).call(this);
+-  }
+-  /**
+-   * Determines whether the network supports EIP-1559 by checking whether the
+-   * latest block has a `baseFeePerGas` property, then updates state
+-   * appropriately.
+-   *
+-   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.
+-   * @returns A promise that resolves to true if the network supports EIP-1559
+-   * , false otherwise, or `undefined` if unable to determine the compatibility.
+-   */
+-  async getEIP1559Compatibility(networkClientId) {
+-    if (networkClientId) {
+-      return this.get1559CompatibilityWithNetworkClientId(networkClientId);
+-    }
+-    if (!__privateGet(this, _ethQuery)) {
+-      return false;
+-    }
+-    const { EIPS } = this.state.networksMetadata[this.state.selectedNetworkClientId];
+-    if (EIPS[1559] !== void 0) {
+-      return EIPS[1559];
+-    }
+-    const isEIP1559Compatible = await __privateMethod(this, _determineEIP1559Compatibility, determineEIP1559Compatibility_fn).call(this, this.state.selectedNetworkClientId);
+-    this.update((state) => {
+-      if (isEIP1559Compatible !== void 0) {
+-        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] = isEIP1559Compatible;
+-      }
+-    });
+-    return isEIP1559Compatible;
+-  }
+-  async get1559CompatibilityWithNetworkClientId(networkClientId) {
+-    let metadata = this.state.networksMetadata[networkClientId];
+-    if (metadata === void 0) {
+-      await this.lookupNetwork(networkClientId);
+-      metadata = this.state.networksMetadata[networkClientId];
+-    }
+-    const { EIPS } = metadata;
+-    return EIPS[1559];
+-  }
+-  /**
+-   * Re-initializes the provider and block tracker for the current network.
+-   */
+-  async resetConnection() {
+-    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    await __privateMethod(this, _refreshNetwork, refreshNetwork_fn).call(this);
+-  }
+-  /**
+-   * Returns a configuration object for the network identified by the given
+-   * network client ID. If given an Infura network type, constructs one based on
+-   * what we know about the network; otherwise attempts locates a network
+-   * configuration in state that corresponds to the network client ID.
+-   *
+-   * @param networkClientId - The network client ID.
+-   * @returns The configuration for the referenced network if one exists, or
+-   * undefined otherwise.
+-   */
+-  getNetworkConfigurationByNetworkClientId(networkClientId) {
+-    if (isInfuraNetworkType(networkClientId)) {
+-      const rpcUrl = `https://${networkClientId}.infura.io/v3/${__privateGet(this, _infuraProjectId)}`;
+-      return {
+-        rpcUrl,
+-        ...BUILT_IN_NETWORKS[networkClientId]
+-      };
+-    }
+-    return this.state.networkConfigurations[networkClientId];
+-  }
+-  /**
+-   * Adds a new custom network or updates the information for an existing
+-   * network.
+-   *
+-   * This may involve updating the `networkConfigurations` property in
+-   * state as well and/or adding a new network client to the network client
+-   * registry. The `rpcUrl` and `chainId` of the given object are used to
+-   * determine which action to take:
+-   *
+-   * - If the `rpcUrl` corresponds to an existing network configuration
+-   * (case-insensitively), then it is overwritten with the object. Furthermore,
+-   * if the `chainId` is different from the existing network configuration, then
+-   * the existing network client is replaced with a new one.
+-   * - If the `rpcUrl` does not correspond to an existing network configuration
+-   * (case-insensitively), then the object is used to add a new network
+-   * configuration along with a new network client.
+-   *
+-   * @param networkConfiguration - The network configuration to add or update.
+-   * @param options - Additional configuration options.
+-   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.
+-   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).
+-   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).
+-   * @returns The ID for the added or updated network configuration.
+-   */
+-  async upsertNetworkConfiguration(networkConfiguration, {
+-    referrer,
+-    source,
+-    setActive = false
+-  }) {
+-    const sanitizedNetworkConfiguration = pick(
+-      networkConfiguration,
+-      ["rpcUrl", "chainId", "ticker", "nickname", "rpcPrefs"]
+-    );
+-    const { rpcUrl, chainId, ticker } = sanitizedNetworkConfiguration;
+-    assertIsStrictHexString(chainId);
+-    if (!isSafeChainId(chainId)) {
+-      throw new Error(
+-        `Invalid chain ID "${chainId}": numerical value greater than max safe value.`
+-      );
+-    }
+-    if (!rpcUrl) {
+-      throw new Error(
+-        "An rpcUrl is required to add or update network configuration"
+-      );
+-    }
+-    if (!referrer || !source) {
+-      throw new Error(
+-        "referrer and source are required arguments for adding or updating a network configuration"
+-      );
+-    }
+-    try {
+-      new URL(rpcUrl);
+-    } catch (e) {
+-      if (e.message.includes("Invalid URL")) {
+-        throw new Error("rpcUrl must be a valid URL");
+-      }
+-    }
+-    if (!ticker) {
+-      throw new Error(
+-        "A ticker is required to add or update networkConfiguration"
+-      );
+-    }
+-    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    const existingNetworkConfiguration = Object.values(
+-      this.state.networkConfigurations
+-    ).find(
+-      (networkConfig) => networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase()
+-    );
+-    const upsertedNetworkConfigurationId = existingNetworkConfiguration ? existingNetworkConfiguration.id : random();
+-    const networkClientId = buildCustomNetworkClientId(
+-      upsertedNetworkConfigurationId
+-    );
+-    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
+-    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+-    const shouldDestroyExistingNetworkClient = existingAutoManagedNetworkClient && existingAutoManagedNetworkClient.configuration.chainId !== chainId;
+-    if (shouldDestroyExistingNetworkClient) {
+-      existingAutoManagedNetworkClient.destroy();
+-    }
+-    if (!existingAutoManagedNetworkClient || shouldDestroyExistingNetworkClient) {
+-      customNetworkClientRegistry[networkClientId] = createAutoManagedNetworkClient({
+-        type: "custom" /* Custom */,
+-        chainId,
+-        rpcUrl,
+-        ticker
+-      });
+-    }
+-    this.update((state) => {
+-      state.networkConfigurations[upsertedNetworkConfigurationId] = {
+-        id: upsertedNetworkConfigurationId,
+-        ...sanitizedNetworkConfiguration
+-      };
+-    });
+-    if (!existingNetworkConfiguration) {
+-      __privateGet(this, _trackMetaMetricsEvent).call(this, {
+-        event: "Custom Network Added",
+-        category: "Network",
+-        referrer: {
+-          url: referrer
+-        },
+-        properties: {
+-          chain_id: chainId,
+-          symbol: ticker,
+-          source
+-        }
+-      });
+-    }
+-    if (setActive) {
+-      await this.setActiveNetwork(upsertedNetworkConfigurationId);
+-    }
+-    return upsertedNetworkConfigurationId;
+-  }
+-  /**
+-   * Removes a custom network from state.
+-   *
+-   * This involves updating the `networkConfigurations` property in state as
+-   * well and removing the network client that corresponds to the network from
+-   * the client registry.
+-   *
+-   * @param networkConfigurationId - The ID of an existing network
+-   * configuration.
+-   */
+-  removeNetworkConfiguration(networkConfigurationId) {
+-    if (!this.state.networkConfigurations[networkConfigurationId]) {
+-      throw new Error(
+-        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`
+-      );
+-    }
+-    const autoManagedNetworkClientRegistry = __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);
+-    this.update((state) => {
+-      delete state.networkConfigurations[networkConfigurationId];
+-    });
+-    const customNetworkClientRegistry = autoManagedNetworkClientRegistry["custom" /* Custom */];
+-    const existingAutoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+-    existingAutoManagedNetworkClient.destroy();
+-    delete customNetworkClientRegistry[networkClientId];
+-  }
+-  /**
+-   * Switches to the previously selected network, assuming that there is one
+-   * (if not and `initializeProvider` has not been previously called, then this
+-   * method is equivalent to calling `resetConnection`).
+-   */
+-  async rollbackToPreviousProvider() {
+-    __privateMethod(this, _ensureAutoManagedNetworkClientRegistryPopulated, ensureAutoManagedNetworkClientRegistryPopulated_fn).call(this);
+-    this.update((state) => {
+-      state.providerConfig = __privateGet(this, _previousProviderConfig);
+-    });
+-    await __privateMethod(this, _refreshNetwork, refreshNetwork_fn).call(this);
+-  }
+-  /**
+-   * Deactivates the controller, stopping any ongoing polling.
+-   *
+-   * In-progress requests will not be aborted.
+-   */
+-  async destroy() {
+-    await __privateGet(this, _blockTrackerProxy)?.destroy();
+-  }
+-  /**
+-   * Updates the controller using the given backup data.
+-   *
+-   * @param backup - The data that has been backed up.
+-   * @param backup.networkConfigurations - Network configurations in the backup.
+-   */
+-  loadBackup({
+-    networkConfigurations
+-  }) {
+-    this.update((state) => {
+-      state.networkConfigurations = {
+-        ...state.networkConfigurations,
+-        ...networkConfigurations
+-      };
+-    });
+-  }
+-  /**
+-   * Searches for a network configuration ID with the given ChainID and returns it.
+-   *
+-   * @param chainId - ChainId to search for
+-   * @returns networkClientId of the network configuration with the given chainId
+-   */
+-  findNetworkClientIdByChainId(chainId) {
+-    const networkClients = this.getNetworkClientRegistry();
+-    const networkClientEntry = Object.entries(networkClients).find(
+-      ([_, networkClient]) => networkClient.configuration.chainId === chainId
+-    );
+-    if (networkClientEntry === void 0) {
+-      throw new Error("Couldn't find networkClientId for chainId");
+-    }
+-    return networkClientEntry[0];
+-  }
+-};
+-_ethQuery = new WeakMap();
+-_infuraProjectId = new WeakMap();
+-_trackMetaMetricsEvent = new WeakMap();
+-_previousProviderConfig = new WeakMap();
+-_providerProxy = new WeakMap();
+-_blockTrackerProxy = new WeakMap();
+-_autoManagedNetworkClientRegistry = new WeakMap();
+-_refreshNetwork = new WeakSet();
+-refreshNetwork_fn = async function() {
+-  this.messagingSystem.publish(
+-    "NetworkController:networkWillChange",
+-    this.state
+-  );
+-  __privateMethod(this, _applyNetworkSelection, applyNetworkSelection_fn).call(this);
+-  this.messagingSystem.publish(
+-    "NetworkController:networkDidChange",
+-    this.state
+-  );
+-  await this.lookupNetwork();
+-};
+-_getLatestBlock = new WeakSet();
+-getLatestBlock_fn = function(networkClientId) {
+-  if (networkClientId === void 0) {
+-    networkClientId = this.state.selectedNetworkClientId;
+-  }
+-  const networkClient = this.getNetworkClientById(networkClientId);
+-  const ethQuery = new EthQuery(networkClient.provider);
+-  return new Promise((resolve, reject) => {
+-    ethQuery.sendAsync(
+-      { method: "eth_getBlockByNumber", params: ["latest", false] },
+-      (error, block) => {
+-        if (error) {
+-          reject(error);
+-        } else {
+-          resolve(block);
+-        }
+-      }
+-    );
+-  });
+-};
+-_determineEIP1559Compatibility = new WeakSet();
+-determineEIP1559Compatibility_fn = async function(networkClientId) {
+-  const latestBlock = await __privateMethod(this, _getLatestBlock, getLatestBlock_fn).call(this, networkClientId);
+-  if (!latestBlock) {
+-    return void 0;
+-  }
+-  return latestBlock.baseFeePerGas !== void 0;
+-};
+-_ensureAutoManagedNetworkClientRegistryPopulated = new WeakSet();
+-ensureAutoManagedNetworkClientRegistryPopulated_fn = function() {
+-  const autoManagedNetworkClientRegistry = __privateGet(this, _autoManagedNetworkClientRegistry) ?? __privateMethod(this, _createAutoManagedNetworkClientRegistry, createAutoManagedNetworkClientRegistry_fn).call(this);
+-  __privateSet(this, _autoManagedNetworkClientRegistry, autoManagedNetworkClientRegistry);
+-  return autoManagedNetworkClientRegistry;
+-};
+-_createAutoManagedNetworkClientRegistry = new WeakSet();
+-createAutoManagedNetworkClientRegistry_fn = function() {
+-  return [
+-    ...__privateMethod(this, _buildIdentifiedInfuraNetworkClientConfigurations, buildIdentifiedInfuraNetworkClientConfigurations_fn).call(this),
+-    ...__privateMethod(this, _buildIdentifiedCustomNetworkClientConfigurations, buildIdentifiedCustomNetworkClientConfigurations_fn).call(this),
+-    ...__privateMethod(this, _buildIdentifiedNetworkClientConfigurationsFromProviderConfig, buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn).call(this)
+-  ].reduce(
+-    (registry, [networkClientType, networkClientId, networkClientConfiguration]) => {
+-      const autoManagedNetworkClient = createAutoManagedNetworkClient(
+-        networkClientConfiguration
+-      );
+-      if (networkClientId in registry[networkClientType]) {
+-        return registry;
+-      }
+-      return {
+-        ...registry,
+-        [networkClientType]: {
+-          ...registry[networkClientType],
+-          [networkClientId]: autoManagedNetworkClient
+-        }
+-      };
+-    },
+-    {
+-      ["infura" /* Infura */]: {},
+-      ["custom" /* Custom */]: {}
+-    }
+-  );
+-};
+-_buildIdentifiedInfuraNetworkClientConfigurations = new WeakSet();
+-buildIdentifiedInfuraNetworkClientConfigurations_fn = function() {
+-  return knownKeysOf(InfuraNetworkType).map((network) => {
+-    const networkClientId = buildInfuraNetworkClientId(network);
+-    const networkClientConfiguration = {
+-      type: "infura" /* Infura */,
+-      network,
+-      infuraProjectId: __privateGet(this, _infuraProjectId),
+-      chainId: BUILT_IN_NETWORKS[network].chainId,
+-      ticker: BUILT_IN_NETWORKS[network].ticker
+-    };
+-    return [
+-      "infura" /* Infura */,
+-      networkClientId,
+-      networkClientConfiguration
+-    ];
+-  });
+-};
+-_buildIdentifiedCustomNetworkClientConfigurations = new WeakSet();
+-buildIdentifiedCustomNetworkClientConfigurations_fn = function() {
+-  return Object.entries(this.state.networkConfigurations).map(
+-    ([networkConfigurationId, networkConfiguration]) => {
+-      if (networkConfiguration.chainId === void 0) {
+-        throw new Error("chainId must be provided for custom RPC endpoints");
+-      }
+-      if (networkConfiguration.rpcUrl === void 0) {
+-        throw new Error("rpcUrl must be provided for custom RPC endpoints");
+-      }
+-      const networkClientId = buildCustomNetworkClientId(
+-        networkConfigurationId
+-      );
+-      const networkClientConfiguration = {
+-        type: "custom" /* Custom */,
+-        chainId: networkConfiguration.chainId,
+-        rpcUrl: networkConfiguration.rpcUrl,
+-        ticker: networkConfiguration.ticker
+-      };
+-      return [
+-        "custom" /* Custom */,
+-        networkClientId,
+-        networkClientConfiguration
+-      ];
+-    }
+-  );
+-};
+-_buildIdentifiedNetworkClientConfigurationsFromProviderConfig = new WeakSet();
+-buildIdentifiedNetworkClientConfigurationsFromProviderConfig_fn = function() {
+-  const { providerConfig } = this.state;
+-  if (isCustomProviderConfig(providerConfig)) {
+-    validateCustomProviderConfig(providerConfig);
+-    const networkClientId = buildCustomNetworkClientId(
+-      providerConfig,
+-      this.state.networkConfigurations
+-    );
+-    const networkClientConfiguration = {
+-      chainId: providerConfig.chainId,
+-      rpcUrl: providerConfig.rpcUrl,
+-      type: "custom" /* Custom */,
+-      ticker: providerConfig.ticker
+-    };
+-    return [
+-      ["custom" /* Custom */, networkClientId, networkClientConfiguration]
+-    ];
+-  }
+-  if (isInfuraProviderConfig(providerConfig)) {
+-    return [];
+-  }
+-  throw new Error(`Unrecognized network type: '${providerConfig.type}'`);
+-};
+-_applyNetworkSelection = new WeakSet();
+-applyNetworkSelection_fn = function() {
+-  if (!__privateGet(this, _autoManagedNetworkClientRegistry)) {
+-    throw new Error(
+-      "initializeProvider must be called first in order to switch the network"
+-    );
+-  }
+-  const { providerConfig } = this.state;
+-  let autoManagedNetworkClient;
+-  let networkClientId;
+-  if (isInfuraProviderConfig(providerConfig)) {
+-    const networkClientType = "infura" /* Infura */;
+-    networkClientId = buildInfuraNetworkClientId(providerConfig);
+-    const builtInNetworkClientRegistry = __privateGet(this, _autoManagedNetworkClientRegistry)[networkClientType];
+-    autoManagedNetworkClient = builtInNetworkClientRegistry[networkClientId];
+-    if (!autoManagedNetworkClient) {
+-      throw new Error(
+-        `Could not find custom network matching ${networkClientId}`
+-      );
+-    }
+-  } else if (isCustomProviderConfig(providerConfig)) {
+-    validateCustomProviderConfig(providerConfig);
+-    const networkClientType = "custom" /* Custom */;
+-    networkClientId = buildCustomNetworkClientId(
+-      providerConfig,
+-      this.state.networkConfigurations
+-    );
+-    const customNetworkClientRegistry = __privateGet(this, _autoManagedNetworkClientRegistry)[networkClientType];
+-    autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];
+-    if (!autoManagedNetworkClient) {
+-      throw new Error(
+-        `Could not find built-in network matching ${networkClientId}`
+-      );
+-    }
+-  } else {
+-    throw new Error("Could not determine type of provider config");
+-  }
+-  this.update((state) => {
+-    state.selectedNetworkClientId = networkClientId;
+-    if (state.networksMetadata[networkClientId] === void 0) {
+-      state.networksMetadata[networkClientId] = {
+-        status: "unknown" /* Unknown */,
+-        EIPS: {}
+-      };
+-    }
+-  });
+-  const { provider, blockTracker } = autoManagedNetworkClient;
+-  if (__privateGet(this, _providerProxy)) {
+-    __privateGet(this, _providerProxy).setTarget(provider);
+-  } else {
+-    __privateSet(this, _providerProxy, createEventEmitterProxy(provider));
+-  }
+-  if (__privateGet(this, _blockTrackerProxy)) {
+-    __privateGet(this, _blockTrackerProxy).setTarget(blockTracker);
+-  } else {
+-    __privateSet(this, _blockTrackerProxy, createEventEmitterProxy(blockTracker, {
+-      eventFilter: "skipInternal"
+-    }));
+-  }
+-  __privateSet(this, _ethQuery, new EthQuery(__privateGet(this, _providerProxy)));
+-};
+-
+-export {
+-  knownKeysOf,
+-  defaultState,
+-  NetworkController
+-};
+-//# sourceMappingURL=chunk-UG2NYGJD.mjs.map
+\ No newline at end of file
+diff --git a/dist/chunk-UG2NYGJD.mjs.map b/dist/chunk-UG2NYGJD.mjs.map
+deleted file mode 100644
+index 527a5afd1e2545a26b42d139f9ce037299566a67..0000000000000000000000000000000000000000
+--- a/dist/chunk-UG2NYGJD.mjs.map
++++ /dev/null
+@@ -1 +0,0 @@
+-{"version":3,"sources":["../src/NetworkController.ts"],"sourcesContent":["import type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  RestrictedControllerMessenger,\n} from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport {\n  BUILT_IN_NETWORKS,\n  NetworksTicker,\n  ChainId,\n  InfuraNetworkType,\n  NetworkType,\n  isSafeChainId,\n  isInfuraNetworkType,\n} from '@metamask/controller-utils';\nimport EthQuery from '@metamask/eth-query';\nimport { errorCodes } from '@metamask/rpc-errors';\nimport { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';\nimport type { SwappableProxy } from '@metamask/swappable-obj-proxy';\nimport type { Hex } from '@metamask/utils';\nimport {\n  assertIsStrictHexString,\n  hasProperty,\n  isPlainObject,\n} from '@metamask/utils';\nimport { strict as assert } from 'assert';\nimport { v4 as random } from 'uuid';\n\nimport { INFURA_BLOCKED_KEY, NetworkStatus } from './constants';\nimport type {\n  AutoManagedNetworkClient,\n  ProxyWithAccessibleTarget,\n} from './create-auto-managed-network-client';\nimport { createAutoManagedNetworkClient } from './create-auto-managed-network-client';\nimport { projectLogger, createModuleLogger } from './logger';\nimport { NetworkClientType } from './types';\nimport type {\n  BlockTracker,\n  Provider,\n  CustomNetworkClientConfiguration,\n  InfuraNetworkClientConfiguration,\n  NetworkClientConfiguration,\n} from './types';\n\nconst log = createModuleLogger(projectLogger, 'NetworkController');\n\n/**\n * @type ProviderConfig\n *\n * Configuration passed to web3-provider-engine\n * @property rpcUrl - RPC target URL.\n * @property type - Human-readable network name.\n * @property chainId - Network ID as per EIP-155.\n * @property ticker - Currency ticker.\n * @property nickname - Personalized network name.\n * @property id - Network Configuration Id.\n */\nexport type ProviderConfig = {\n  rpcUrl?: string;\n  type: NetworkType;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: { blockExplorerUrl?: string };\n  id?: NetworkConfigurationId;\n};\n\nexport type Block = {\n  baseFeePerGas?: string;\n};\n\n/**\n * Information about a network not held by any other part of state.\n */\nexport type NetworkMetadata = {\n  /**\n   * EIPs supported by the network.\n   */\n  EIPS: {\n    [eipNumber: number]: boolean;\n  };\n  /**\n   * Indicates the availability of the network\n   */\n  status: NetworkStatus;\n};\n\n/**\n * Custom RPC network information\n *\n * @property rpcUrl - RPC target URL.\n * @property chainId - Network ID as per EIP-155\n * @property nickname - Personalized network name.\n * @property ticker - Currency ticker.\n * @property rpcPrefs - Personalized preferences.\n */\nexport type NetworkConfiguration = {\n  rpcUrl: string;\n  chainId: Hex;\n  ticker: string;\n  nickname?: string;\n  rpcPrefs?: {\n    blockExplorerUrl: string;\n  };\n};\n\n/**\n * The collection of network configurations in state.\n */\ntype NetworkConfigurations = Record<\n  NetworkConfigurationId,\n  NetworkConfiguration & { id: NetworkConfigurationId }\n>;\n\n/**\n * `Object.keys()` is intentionally generic: it returns the keys of an object,\n * but it cannot make guarantees about the contents of that object, so the type\n * of the keys is merely `string[]`. While this is technically accurate, it is\n * also unnecessary if we have an object that we own and whose contents are\n * known exactly.\n *\n * TODO: Move to @metamask/utils.\n *\n * @param object - The object.\n * @returns The keys of an object, typed according to the type of the object\n * itself.\n */\nexport function knownKeysOf<K extends PropertyKey>(\n  // TODO: Replace `any` with type\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  object: Partial<Record<K, any>>,\n) {\n  return Object.keys(object) as K[];\n}\n\n/**\n * Asserts that the given value is of the given type if the given validation\n * function returns a truthy result.\n *\n * @param value - The value to validate.\n * @param validate - A function used to validate that the value is of the given\n * type. Takes the `value` as an argument and is expected to return true or\n * false.\n * @param message - The message to throw if the function does not return a\n * truthy result.\n * @throws if the function does not return a truthy result.\n */\nfunction assertOfType<Type>(\n  value: unknown,\n  validate: (value: unknown) => boolean,\n  message: string,\n): asserts value is Type {\n  assert.ok(validate(value), message);\n}\n\n/**\n * Returns a portion of the given object with only the given keys.\n *\n * @param object - An object.\n * @param keys - The keys to pick from the object.\n * @returns the portion of the object.\n */\n// TODO: Replace `any` with type\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nfunction pick<Obj extends Record<any, any>, Keys extends keyof Obj>(\n  object: Obj,\n  keys: Keys[],\n): Pick<Obj, Keys> {\n  const pickedObject = keys.reduce<Partial<Pick<Obj, Keys>>>(\n    (finalObject, key) => {\n      return { ...finalObject, [key]: object[key] };\n    },\n    {},\n  );\n  assertOfType<Pick<Obj, Keys>>(\n    pickedObject,\n    () => keys.every((key) => key in pickedObject),\n    'The reduce did not produce an object with all of the desired keys.',\n  );\n  return pickedObject;\n}\n\n/**\n * Type guard for determining whether the given value is an error object with a\n * `code` property, such as an instance of Error.\n *\n * TODO: Move this to @metamask/utils.\n *\n * @param error - The object to check.\n * @returns True if `error` has a `code`, false otherwise.\n */\nfunction isErrorWithCode(error: unknown): error is { code: string | number } {\n  return typeof error === 'object' && error !== null && 'code' in error;\n}\n\n/**\n * Builds an identifier for an Infura network client for lookup purposes.\n *\n * @param infuraNetworkOrProviderConfig - The name of an Infura network or a\n * provider config.\n * @returns The built identifier.\n */\nfunction buildInfuraNetworkClientId(\n  infuraNetworkOrProviderConfig:\n    | InfuraNetworkType\n    | (ProviderConfig & { type: InfuraNetworkType }),\n): BuiltInNetworkClientId {\n  if (typeof infuraNetworkOrProviderConfig === 'string') {\n    return infuraNetworkOrProviderConfig;\n  }\n  return infuraNetworkOrProviderConfig.type;\n}\n\n/**\n * Builds an identifier for a custom network client for lookup purposes.\n *\n * @param args - This function can be called two ways:\n * 1. The ID of a network configuration.\n * 2. A provider config and a set of network configurations.\n * @returns The built identifier.\n */\nfunction buildCustomNetworkClientId(\n  ...args:\n    | [NetworkConfigurationId]\n    | [\n        ProviderConfig & { type: typeof NetworkType.rpc; rpcUrl: string },\n        NetworkConfigurations,\n      ]\n): CustomNetworkClientId {\n  if (args.length === 1) {\n    return args[0];\n  }\n  const [{ id, rpcUrl }, networkConfigurations] = args;\n  if (id === undefined) {\n    const matchingNetworkConfiguration = Object.values(\n      networkConfigurations,\n    ).find((networkConfiguration) => {\n      return networkConfiguration.rpcUrl === rpcUrl.toLowerCase();\n    });\n    if (matchingNetworkConfiguration) {\n      return matchingNetworkConfiguration.id;\n    }\n    return rpcUrl.toLowerCase();\n  }\n  return id;\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isInfuraProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: InfuraNetworkType } {\n  return isInfuraNetworkType(providerConfig.type);\n}\n\n/**\n * Returns whether the given provider config refers to an Infura network.\n *\n * @param providerConfig - The provider config.\n * @returns True if the provider config refers to an Infura network, false\n * otherwise.\n */\nfunction isCustomProviderConfig(\n  providerConfig: ProviderConfig,\n): providerConfig is ProviderConfig & { type: typeof NetworkType.rpc } {\n  return providerConfig.type === NetworkType.rpc;\n}\n\n/**\n * As a provider config represents the settings that are used to interface with\n * an RPC endpoint, it must have both a chain ID and an RPC URL if it represents\n * a custom network. These properties _should_ be set as they are validated in\n * the UI when a user adds a custom network, but just to be safe we validate\n * them here.\n *\n * In addition, historically the `rpcUrl` property on the ProviderConfig type\n * has been optional, even though it should not be. Making this non-optional\n * would be a breaking change, so this function types the provider config\n * correctly so that we don't have to check `rpcUrl` in other places.\n *\n * @param providerConfig - A provider config.\n * @throws if the provider config does not have a chain ID or an RPC URL.\n */\nfunction validateCustomProviderConfig(\n  providerConfig: ProviderConfig & { type: typeof NetworkType.rpc },\n): asserts providerConfig is typeof providerConfig & { rpcUrl: string } {\n  if (providerConfig.chainId === undefined) {\n    throw new Error('chainId must be provided for custom RPC endpoints');\n  }\n  if (providerConfig.rpcUrl === undefined) {\n    throw new Error('rpcUrl must be provided for custom RPC endpoints');\n  }\n}\n/**\n * The string that uniquely identifies an Infura network client.\n */\nexport type BuiltInNetworkClientId = InfuraNetworkType;\n\n/**\n * The string that uniquely identifies a custom network client.\n */\nexport type CustomNetworkClientId = string;\n\n/**\n * The string that uniquely identifies a network client.\n */\nexport type NetworkClientId = BuiltInNetworkClientId | CustomNetworkClientId;\n\n/**\n * Information about networks not held by any other part of state.\n */\nexport type NetworksMetadata = {\n  [networkClientId: NetworkClientId]: NetworkMetadata;\n};\n\n/**\n * @type NetworkState\n *\n * Network controller state\n * @property providerConfig - RPC URL and network name provider settings of the currently connected network\n * @property properties - an additional set of network properties for the currently connected network\n * @property networkConfigurations - the full list of configured networks either preloaded or added by the user.\n */\nexport type NetworkState = {\n  selectedNetworkClientId: NetworkClientId;\n  providerConfig: ProviderConfig;\n  networkConfigurations: NetworkConfigurations;\n  networksMetadata: NetworksMetadata;\n};\n\nconst name = 'NetworkController';\n\n/**\n * Represents the block tracker for the currently selected network. (Note that\n * this is a proxy around a proxy: the inner one exists so that the block\n * tracker doesn't have to exist until it's used, and the outer one exists so\n * that the currently selected network can change without consumers needing to\n * refresh the object reference to that network.)\n */\nexport type BlockTrackerProxy = SwappableProxy<\n  ProxyWithAccessibleTarget<BlockTracker>\n>;\n\n/**\n * Represents the provider for the currently selected network. (Note that this\n * is a proxy around a proxy: the inner one exists so that the provider doesn't\n * have to exist until it's used, and the outer one exists so that the currently\n * selected network can change without consumers needing to refresh the object\n * reference to that network.)\n */\nexport type ProviderProxy = SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n\nexport type NetworkControllerStateChangeEvent = ControllerStateChangeEvent<\n  typeof name,\n  NetworkState\n>;\n\n/**\n * `networkWillChange` is published when the current network is about to be\n * switched, but the new provider has not been created and no state changes have\n * occurred yet.\n */\nexport type NetworkControllerNetworkWillChangeEvent = {\n  type: 'NetworkController:networkWillChange';\n  payload: [NetworkState];\n};\n\n/**\n * `networkDidChange` is published after a provider has been created for a newly\n * switched network (but before the network has been confirmed to be available).\n */\nexport type NetworkControllerNetworkDidChangeEvent = {\n  type: 'NetworkController:networkDidChange';\n  payload: [NetworkState];\n};\n\n/**\n * `infuraIsBlocked` is published after the network is switched to an Infura\n * network, but when Infura returns an error blocking the user based on their\n * location.\n */\nexport type NetworkControllerInfuraIsBlockedEvent = {\n  type: 'NetworkController:infuraIsBlocked';\n  payload: [];\n};\n\n/**\n * `infuraIsBlocked` is published either after the network is switched to an\n * Infura network and Infura does not return an error blocking the user based on\n * their location, or the network is switched to a non-Infura network.\n */\nexport type NetworkControllerInfuraIsUnblockedEvent = {\n  type: 'NetworkController:infuraIsUnblocked';\n  payload: [];\n};\n\nexport type NetworkControllerEvents =\n  | NetworkControllerStateChangeEvent\n  | NetworkControllerNetworkWillChangeEvent\n  | NetworkControllerNetworkDidChangeEvent\n  | NetworkControllerInfuraIsBlockedEvent\n  | NetworkControllerInfuraIsUnblockedEvent;\n\nexport type NetworkControllerGetStateAction = ControllerGetStateAction<\n  typeof name,\n  NetworkState\n>;\n\nexport type NetworkControllerGetProviderConfigAction = {\n  type: `NetworkController:getProviderConfig`;\n  handler: () => ProviderConfig;\n};\n\nexport type NetworkControllerGetEthQueryAction = {\n  type: `NetworkController:getEthQuery`;\n  handler: () => EthQuery | undefined;\n};\n\nexport type NetworkControllerGetNetworkClientByIdAction = {\n  type: `NetworkController:getNetworkClientById`;\n  handler: NetworkController['getNetworkClientById'];\n};\n\nexport type NetworkControllerGetSelectedNetworkClientAction = {\n  type: `NetworkController:getSelectedNetworkClient`;\n  handler: NetworkController['getSelectedNetworkClient'];\n};\n\nexport type NetworkControllerGetEIP1559CompatibilityAction = {\n  type: `NetworkController:getEIP1559Compatibility`;\n  handler: NetworkController['getEIP1559Compatibility'];\n};\n\nexport type NetworkControllerFindNetworkClientIdByChainIdAction = {\n  type: `NetworkController:findNetworkClientIdByChainId`;\n  handler: NetworkController['findNetworkClientIdByChainId'];\n};\n\n/**\n * Change the currently selected network to the given built-in network type.\n *\n * @deprecated This action has been replaced by `setActiveNetwork`, and will be\n * removed in a future release.\n */\nexport type NetworkControllerSetProviderTypeAction = {\n  type: `NetworkController:setProviderType`;\n  handler: NetworkController['setProviderType'];\n};\n\nexport type NetworkControllerSetActiveNetworkAction = {\n  type: `NetworkController:setActiveNetwork`;\n  handler: NetworkController['setActiveNetwork'];\n};\n\nexport type NetworkControllerGetNetworkConfigurationByNetworkClientId = {\n  type: `NetworkController:getNetworkConfigurationByNetworkClientId`;\n  handler: NetworkController['getNetworkConfigurationByNetworkClientId'];\n};\n\nexport type NetworkControllerActions =\n  | NetworkControllerGetStateAction\n  | NetworkControllerGetProviderConfigAction\n  | NetworkControllerGetEthQueryAction\n  | NetworkControllerGetNetworkClientByIdAction\n  | NetworkControllerGetSelectedNetworkClientAction\n  | NetworkControllerGetEIP1559CompatibilityAction\n  | NetworkControllerFindNetworkClientIdByChainIdAction\n  | NetworkControllerSetActiveNetworkAction\n  | NetworkControllerSetProviderTypeAction\n  | NetworkControllerGetNetworkConfigurationByNetworkClientId;\n\nexport type NetworkControllerMessenger = RestrictedControllerMessenger<\n  typeof name,\n  NetworkControllerActions,\n  NetworkControllerEvents,\n  never,\n  never\n>;\n\nexport type NetworkControllerOptions = {\n  messenger: NetworkControllerMessenger;\n  trackMetaMetricsEvent: () => void;\n  infuraProjectId: string;\n  state?: Partial<NetworkState>;\n};\n\nexport const defaultState: NetworkState = {\n  selectedNetworkClientId: NetworkType.mainnet,\n  providerConfig: {\n    type: NetworkType.mainnet,\n    chainId: ChainId.mainnet,\n    ticker: NetworksTicker.mainnet,\n  },\n  networksMetadata: {},\n  networkConfigurations: {},\n};\n\ntype MetaMetricsEventPayload = {\n  event: string;\n  category: string;\n  referrer?: { url: string };\n  actionId?: number;\n  environmentType?: string;\n  properties?: unknown;\n  sensitiveProperties?: unknown;\n  revenue?: number;\n  currency?: string;\n  value?: number;\n};\n\ntype NetworkConfigurationId = string;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedBuiltInNetworkClientRegistry = Record<\n  BuiltInNetworkClientId,\n  AutoManagedNetworkClient<InfuraNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks.\n */\ntype AutoManagedCustomNetworkClientRegistry = Record<\n  CustomNetworkClientId,\n  AutoManagedNetworkClient<CustomNetworkClientConfiguration>\n>;\n\n/**\n * The collection of auto-managed network clients that map to Infura networks\n * as well as custom networks that users have added.\n */\ntype AutoManagedNetworkClientRegistry = {\n  [NetworkClientType.Infura]: AutoManagedBuiltInNetworkClientRegistry;\n  [NetworkClientType.Custom]: AutoManagedCustomNetworkClientRegistry;\n};\n\n/**\n * Controller that creates and manages an Ethereum network provider.\n */\nexport class NetworkController extends BaseController<\n  typeof name,\n  NetworkState,\n  NetworkControllerMessenger\n> {\n  #ethQuery?: EthQuery;\n\n  #infuraProjectId: string;\n\n  #trackMetaMetricsEvent: (event: MetaMetricsEventPayload) => void;\n\n  #previousProviderConfig: ProviderConfig;\n\n  #providerProxy: ProviderProxy | undefined;\n\n  #blockTrackerProxy: BlockTrackerProxy | undefined;\n\n  #autoManagedNetworkClientRegistry?: AutoManagedNetworkClientRegistry;\n\n  constructor({\n    messenger,\n    state,\n    infuraProjectId,\n    trackMetaMetricsEvent,\n  }: NetworkControllerOptions) {\n    super({\n      name,\n      metadata: {\n        selectedNetworkClientId: {\n          persist: true,\n          anonymous: false,\n        },\n        networksMetadata: {\n          persist: true,\n          anonymous: false,\n        },\n        providerConfig: {\n          persist: true,\n          anonymous: false,\n        },\n        networkConfigurations: {\n          persist: true,\n          anonymous: false,\n        },\n      },\n      messenger,\n      state: { ...defaultState, ...state },\n    });\n    if (!infuraProjectId || typeof infuraProjectId !== 'string') {\n      throw new Error('Invalid Infura project ID');\n    }\n    this.#infuraProjectId = infuraProjectId;\n    this.#trackMetaMetricsEvent = trackMetaMetricsEvent;\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getProviderConfig`,\n      () => {\n        return this.state.providerConfig;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEthQuery`,\n      () => {\n        return this.#ethQuery;\n      },\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkClientById`,\n      this.getNetworkClientById.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getEIP1559Compatibility`,\n      this.getEIP1559Compatibility.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setActiveNetwork`,\n      this.setActiveNetwork.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:setProviderType`,\n      this.setProviderType.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:findNetworkClientIdByChainId`,\n      this.findNetworkClientIdByChainId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getNetworkConfigurationByNetworkClientId`,\n      this.getNetworkConfigurationByNetworkClientId.bind(this),\n    );\n\n    this.messagingSystem.registerActionHandler(\n      `${this.name}:getSelectedNetworkClient`,\n      this.getSelectedNetworkClient.bind(this),\n    );\n\n    this.#previousProviderConfig = this.state.providerConfig;\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   * @returns The proxy and block tracker proxies.\n   * @deprecated This method has been replaced by `getSelectedNetworkClient` (which has a more easily used return type) and will be removed in a future release.\n   */\n  getProviderAndBlockTracker(): {\n    provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>> | undefined;\n    blockTracker:\n      | SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>\n      | undefined;\n  } {\n    return {\n      provider: this.#providerProxy,\n      blockTracker: this.#blockTrackerProxy,\n    };\n  }\n\n  /**\n   * Accesses the provider and block tracker for the currently selected network.\n   *\n   * @returns an object with the provider and block tracker proxies for the currently selected network.\n   */\n  getSelectedNetworkClient():\n    | {\n        provider: SwappableProxy<ProxyWithAccessibleTarget<Provider>>;\n        blockTracker: SwappableProxy<ProxyWithAccessibleTarget<BlockTracker>>;\n      }\n    | undefined {\n    if (this.#providerProxy && this.#blockTrackerProxy) {\n      return {\n        provider: this.#providerProxy,\n        blockTracker: this.#blockTrackerProxy,\n      };\n    }\n    return undefined;\n  }\n\n  /**\n   * Returns all of the network clients that have been created so far, keyed by\n   * their identifier in the network client registry. This collection represents\n   * not only built-in networks but also any custom networks that consumers have\n   * added.\n   *\n   * @returns The list of known network clients.\n   */\n  getNetworkClientRegistry(): AutoManagedBuiltInNetworkClientRegistry &\n    AutoManagedCustomNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    return Object.assign(\n      {},\n      autoManagedNetworkClientRegistry[NetworkClientType.Infura],\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom],\n    );\n  }\n\n  /**\n   * Returns the Infura network client with the given ID.\n   *\n   * @param infuraNetworkClientId - An Infura network client ID.\n   * @returns The Infura network client.\n   * @throws If an Infura network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    infuraNetworkClientId: BuiltInNetworkClientId,\n  ): AutoManagedNetworkClient<InfuraNetworkClientConfiguration>;\n\n  /**\n   * Returns the custom network client with the given ID.\n   *\n   * @param customNetworkClientId - A custom network client ID.\n   * @returns The custom network client.\n   * @throws If a custom network client does not exist with the given ID.\n   */\n  getNetworkClientById(\n    customNetworkClientId: CustomNetworkClientId,\n  ): AutoManagedNetworkClient<CustomNetworkClientConfiguration>;\n\n  getNetworkClientById(\n    networkClientId: NetworkClientId,\n  ): AutoManagedNetworkClient<NetworkClientConfiguration> {\n    if (!networkClientId) {\n      throw new Error('No network client ID was provided.');\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    if (isInfuraNetworkType(networkClientId)) {\n      const infuraNetworkClient =\n        autoManagedNetworkClientRegistry[NetworkClientType.Infura][\n          networkClientId\n        ];\n      if (!infuraNetworkClient) {\n        throw new Error(\n          `No Infura network client was found with the ID \"${networkClientId}\".`,\n        );\n      }\n      return infuraNetworkClient;\n    }\n\n    const customNetworkClient =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom][\n        networkClientId\n      ];\n    if (!customNetworkClient) {\n      throw new Error(\n        `No custom network client was found with the ID \"${networkClientId}\".`,\n      );\n    }\n    return customNetworkClient;\n  }\n\n  /**\n   * Executes a series of steps to apply the changes to the provider config:\n   *\n   * 1. Notifies subscribers that the network is about to change.\n   * 2. Looks up a known and preinitialized network client matching the provider\n   * config and re-points the provider and block tracker proxy to it.\n   * 3. Notifies subscribers that the network has changed.\n   */\n  async #refreshNetwork() {\n    this.messagingSystem.publish(\n      'NetworkController:networkWillChange',\n      this.state,\n    );\n    this.#applyNetworkSelection();\n    this.messagingSystem.publish(\n      'NetworkController:networkDidChange',\n      this.state,\n    );\n    await this.lookupNetwork();\n  }\n\n  /**\n   * Populates the network clients and establishes the initial network based on\n   * the provider configuration in state.\n   */\n  async initializeProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.#applyNetworkSelection();\n    await this.lookupNetwork();\n  }\n\n  /**\n   * Refreshes the network meta with EIP-1559 support and the network status\n   * based on the given network client ID.\n   *\n   * @param networkClientId - The ID of the network client to update.\n   */\n  async lookupNetworkByClientId(networkClientId: NetworkClientId) {\n    const isInfura = isInfuraNetworkType(networkClientId);\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      updatedIsEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        networkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else if (\n        typeof Error !== 'undefined' &&\n        hasProperty(error as unknown as Error, 'message') &&\n        typeof (error as unknown as Error).message === 'string' &&\n        (error as unknown as Error).message.includes(\n          'No custom network client was found with the ID',\n        )\n      ) {\n        throw error;\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n    this.update((state) => {\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n      const meta = state.networksMetadata[networkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n  }\n\n  /**\n   * Performs side effects after switching to a network. If the network is\n   * available, updates the network state with the network ID of the network and\n   * stores whether the network supports EIP-1559; otherwise clears said\n   * information about the network that may have been previously stored.\n   *\n   * @param networkClientId - (Optional) The ID of the network client to update.\n   * If no ID is provided, uses the currently selected network.\n   * @fires infuraIsBlocked if the network is Infura-supported and is blocking\n   * requests.\n   * @fires infuraIsUnblocked if the network is Infura-supported and is not\n   * blocking requests, or if the network is not Infura-supported.\n   */\n  async lookupNetwork(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      await this.lookupNetworkByClientId(networkClientId);\n      return;\n    }\n\n    if (!this.#ethQuery) {\n      return;\n    }\n\n    const isInfura = isInfuraProviderConfig(this.state.providerConfig);\n\n    let networkChanged = false;\n    const listener = () => {\n      networkChanged = true;\n      this.messagingSystem.unsubscribe(\n        'NetworkController:networkDidChange',\n        listener,\n      );\n    };\n    this.messagingSystem.subscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    let updatedNetworkStatus: NetworkStatus;\n    let updatedIsEIP1559Compatible: boolean | undefined;\n\n    try {\n      const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n        this.state.selectedNetworkClientId,\n      );\n      updatedNetworkStatus = NetworkStatus.Available;\n      updatedIsEIP1559Compatible = isEIP1559Compatible;\n    } catch (error) {\n      if (isErrorWithCode(error)) {\n        let responseBody;\n        if (\n          isInfura &&\n          hasProperty(error, 'message') &&\n          typeof error.message === 'string'\n        ) {\n          try {\n            responseBody = JSON.parse(error.message);\n          } catch {\n            // error.message must not be JSON\n          }\n        }\n\n        if (\n          isPlainObject(responseBody) &&\n          responseBody.error === INFURA_BLOCKED_KEY\n        ) {\n          updatedNetworkStatus = NetworkStatus.Blocked;\n        } else if (error.code === errorCodes.rpc.internal) {\n          updatedNetworkStatus = NetworkStatus.Unknown;\n        } else {\n          updatedNetworkStatus = NetworkStatus.Unavailable;\n        }\n      } else {\n        log('NetworkController - could not determine network status', error);\n        updatedNetworkStatus = NetworkStatus.Unknown;\n      }\n    }\n\n    if (networkChanged) {\n      // If the network has changed, then `lookupNetwork` either has been or is\n      // in the process of being called, so we don't need to go further.\n      return;\n    }\n    this.messagingSystem.unsubscribe(\n      'NetworkController:networkDidChange',\n      listener,\n    );\n\n    this.update((state) => {\n      const meta = state.networksMetadata[state.selectedNetworkClientId];\n      meta.status = updatedNetworkStatus;\n      if (updatedIsEIP1559Compatible === undefined) {\n        delete meta.EIPS[1559];\n      } else {\n        meta.EIPS[1559] = updatedIsEIP1559Compatible;\n      }\n    });\n\n    if (isInfura) {\n      if (updatedNetworkStatus === NetworkStatus.Available) {\n        this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n      } else if (updatedNetworkStatus === NetworkStatus.Blocked) {\n        this.messagingSystem.publish('NetworkController:infuraIsBlocked');\n      }\n    } else {\n      // Always publish infuraIsUnblocked regardless of network status to\n      // prevent consumers from being stuck in a blocked state if they were\n      // previously connected to an Infura network that was blocked\n      this.messagingSystem.publish('NetworkController:infuraIsUnblocked');\n    }\n  }\n\n  /**\n   * Convenience method to update provider network type settings.\n   *\n   * @param type - Human readable network name.\n   * @deprecated This has been replaced by `setActiveNetwork`, and will be\n   * removed in a future release\n   */\n  async setProviderType(type: InfuraNetworkType) {\n    assert.notStrictEqual(\n      type,\n      NetworkType.rpc,\n      `NetworkController - cannot call \"setProviderType\" with type \"${NetworkType.rpc}\". Use \"setActiveNetwork\"`,\n    );\n    assert.ok(\n      isInfuraNetworkType(type),\n      `Unknown Infura provider type \"${type}\".`,\n    );\n\n    await this.setActiveNetwork(type);\n  }\n\n  /**\n   * Convenience method to update provider RPC settings.\n   *\n   * @param networkConfigurationIdOrType - The unique id for the network configuration to set as the active provider,\n   * or the type of a built-in network.\n   */\n  async setActiveNetwork(networkConfigurationIdOrType: string) {\n    this.#previousProviderConfig = this.state.providerConfig;\n\n    let targetNetwork: ProviderConfig;\n    if (isInfuraNetworkType(networkConfigurationIdOrType)) {\n      const ticker = NetworksTicker[networkConfigurationIdOrType];\n\n      targetNetwork = {\n        chainId: ChainId[networkConfigurationIdOrType],\n        id: undefined,\n        rpcPrefs: BUILT_IN_NETWORKS[networkConfigurationIdOrType].rpcPrefs,\n        rpcUrl: undefined,\n        nickname: undefined,\n        ticker,\n        type: networkConfigurationIdOrType,\n      };\n    } else {\n      if (\n        !Object.keys(this.state.networkConfigurations).includes(\n          networkConfigurationIdOrType,\n        )\n      ) {\n        throw new Error(\n          `networkConfigurationId ${networkConfigurationIdOrType} does not match a configured networkConfiguration or built-in network type`,\n        );\n      }\n      targetNetwork = {\n        ...this.state.networkConfigurations[networkConfigurationIdOrType],\n        type: NetworkType.rpc,\n      };\n    }\n\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = targetNetwork;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Fetches the latest block for the network.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check the latest block. Defaults to the selectedNetworkClientId.\n   * @returns A promise that either resolves to the block header or null if\n   * there is no latest block, or rejects with an error.\n   */\n  #getLatestBlock(networkClientId: NetworkClientId): Promise<Block> {\n    if (networkClientId === undefined) {\n      networkClientId = this.state.selectedNetworkClientId;\n    }\n\n    const networkClient = this.getNetworkClientById(networkClientId);\n    const ethQuery = new EthQuery(networkClient.provider);\n\n    return new Promise((resolve, reject) => {\n      ethQuery.sendAsync(\n        { method: 'eth_getBlockByNumber', params: ['latest', false] },\n        (error: unknown, block?: unknown) => {\n          if (error) {\n            reject(error);\n          } else {\n            // TODO: Validate this type\n            resolve(block as Block);\n          }\n        },\n      );\n    });\n  }\n\n  /**\n   * Determines whether the network supports EIP-1559 by checking whether the\n   * latest block has a `baseFeePerGas` property, then updates state\n   * appropriately.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility.\n   * @returns A promise that resolves to true if the network supports EIP-1559\n   * , false otherwise, or `undefined` if unable to determine the compatibility.\n   */\n  async getEIP1559Compatibility(networkClientId?: NetworkClientId) {\n    if (networkClientId) {\n      return this.get1559CompatibilityWithNetworkClientId(networkClientId);\n    }\n    if (!this.#ethQuery) {\n      return false;\n    }\n\n    const { EIPS } =\n      this.state.networksMetadata[this.state.selectedNetworkClientId];\n\n    if (EIPS[1559] !== undefined) {\n      return EIPS[1559];\n    }\n\n    const isEIP1559Compatible = await this.#determineEIP1559Compatibility(\n      this.state.selectedNetworkClientId,\n    );\n    this.update((state) => {\n      if (isEIP1559Compatible !== undefined) {\n        state.networksMetadata[state.selectedNetworkClientId].EIPS[1559] =\n          isEIP1559Compatible;\n      }\n    });\n    return isEIP1559Compatible;\n  }\n\n  async get1559CompatibilityWithNetworkClientId(\n    networkClientId: NetworkClientId,\n  ) {\n    let metadata = this.state.networksMetadata[networkClientId];\n    if (metadata === undefined) {\n      await this.lookupNetwork(networkClientId);\n      metadata = this.state.networksMetadata[networkClientId];\n    }\n    const { EIPS } = metadata;\n\n    // may want to include some 'freshness' value - something to make sure we refetch this from time to time\n    return EIPS[1559];\n  }\n\n  /**\n   * Retrieves and checks the latest block from the currently selected\n   * network; if the block has a `baseFeePerGas` property, then we know\n   * that the network supports EIP-1559; otherwise it doesn't.\n   *\n   * @param networkClientId - The networkClientId to fetch the correct provider against which to check 1559 compatibility\n   * @returns A promise that resolves to `true` if the network supports EIP-1559,\n   * `false` otherwise, or `undefined` if unable to retrieve the last block.\n   */\n  async #determineEIP1559Compatibility(\n    networkClientId: NetworkClientId,\n  ): Promise<boolean | undefined> {\n    const latestBlock = await this.#getLatestBlock(networkClientId);\n\n    if (!latestBlock) {\n      return undefined;\n    }\n\n    return latestBlock.baseFeePerGas !== undefined;\n  }\n\n  /**\n   * Re-initializes the provider and block tracker for the current network.\n   */\n  async resetConnection() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Returns a configuration object for the network identified by the given\n   * network client ID. If given an Infura network type, constructs one based on\n   * what we know about the network; otherwise attempts locates a network\n   * configuration in state that corresponds to the network client ID.\n   *\n   * @param networkClientId - The network client ID.\n   * @returns The configuration for the referenced network if one exists, or\n   * undefined otherwise.\n   */\n  getNetworkConfigurationByNetworkClientId(\n    networkClientId: NetworkClientId,\n  ): NetworkConfiguration | undefined {\n    if (isInfuraNetworkType(networkClientId)) {\n      const rpcUrl = `https://${networkClientId}.infura.io/v3/${\n        this.#infuraProjectId\n      }`;\n      return {\n        rpcUrl,\n        ...BUILT_IN_NETWORKS[networkClientId],\n      };\n    }\n\n    return this.state.networkConfigurations[networkClientId];\n  }\n\n  /**\n   * Adds a new custom network or updates the information for an existing\n   * network.\n   *\n   * This may involve updating the `networkConfigurations` property in\n   * state as well and/or adding a new network client to the network client\n   * registry. The `rpcUrl` and `chainId` of the given object are used to\n   * determine which action to take:\n   *\n   * - If the `rpcUrl` corresponds to an existing network configuration\n   * (case-insensitively), then it is overwritten with the object. Furthermore,\n   * if the `chainId` is different from the existing network configuration, then\n   * the existing network client is replaced with a new one.\n   * - If the `rpcUrl` does not correspond to an existing network configuration\n   * (case-insensitively), then the object is used to add a new network\n   * configuration along with a new network client.\n   *\n   * @param networkConfiguration - The network configuration to add or update.\n   * @param options - Additional configuration options.\n   * @param options.referrer - Used to create a metrics event; the site from which the call originated, or 'metamask' for internal calls.\n   * @param options.source - Used to create a metrics event; where the event originated (i.e. from a dapp or from the network form).\n   * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).\n   * @returns The ID for the added or updated network configuration.\n   */\n  async upsertNetworkConfiguration(\n    networkConfiguration: NetworkConfiguration,\n    {\n      referrer,\n      source,\n      setActive = false,\n    }: {\n      referrer: string;\n      source: string;\n      setActive?: boolean;\n    },\n  ): Promise<string> {\n    const sanitizedNetworkConfiguration: NetworkConfiguration = pick(\n      networkConfiguration,\n      ['rpcUrl', 'chainId', 'ticker', 'nickname', 'rpcPrefs'],\n    );\n    const { rpcUrl, chainId, ticker } = sanitizedNetworkConfiguration;\n\n    assertIsStrictHexString(chainId);\n    if (!isSafeChainId(chainId)) {\n      throw new Error(\n        `Invalid chain ID \"${chainId}\": numerical value greater than max safe value.`,\n      );\n    }\n    if (!rpcUrl) {\n      throw new Error(\n        'An rpcUrl is required to add or update network configuration',\n      );\n    }\n    if (!referrer || !source) {\n      throw new Error(\n        'referrer and source are required arguments for adding or updating a network configuration',\n      );\n    }\n    try {\n      new URL(rpcUrl);\n      // TODO: Replace `any` with type\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    } catch (e: any) {\n      if (e.message.includes('Invalid URL')) {\n        throw new Error('rpcUrl must be a valid URL');\n      }\n    }\n    if (!ticker) {\n      throw new Error(\n        'A ticker is required to add or update networkConfiguration',\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    const existingNetworkConfiguration = Object.values(\n      this.state.networkConfigurations,\n    ).find(\n      (networkConfig) =>\n        networkConfig.rpcUrl.toLowerCase() === rpcUrl.toLowerCase(),\n    );\n    const upsertedNetworkConfigurationId = existingNetworkConfiguration\n      ? existingNetworkConfiguration.id\n      : random();\n    const networkClientId = buildCustomNetworkClientId(\n      upsertedNetworkConfigurationId,\n    );\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    const shouldDestroyExistingNetworkClient =\n      existingAutoManagedNetworkClient &&\n      existingAutoManagedNetworkClient.configuration.chainId !== chainId;\n    if (shouldDestroyExistingNetworkClient) {\n      existingAutoManagedNetworkClient.destroy();\n    }\n    if (\n      !existingAutoManagedNetworkClient ||\n      shouldDestroyExistingNetworkClient\n    ) {\n      customNetworkClientRegistry[networkClientId] =\n        createAutoManagedNetworkClient({\n          type: NetworkClientType.Custom,\n          chainId,\n          rpcUrl,\n          ticker,\n        });\n    }\n\n    this.update((state) => {\n      state.networkConfigurations[upsertedNetworkConfigurationId] = {\n        id: upsertedNetworkConfigurationId,\n        ...sanitizedNetworkConfiguration,\n      };\n    });\n\n    if (!existingNetworkConfiguration) {\n      this.#trackMetaMetricsEvent({\n        event: 'Custom Network Added',\n        category: 'Network',\n        referrer: {\n          url: referrer,\n        },\n        properties: {\n          chain_id: chainId,\n          symbol: ticker,\n          source,\n        },\n      });\n    }\n\n    if (setActive) {\n      await this.setActiveNetwork(upsertedNetworkConfigurationId);\n    }\n\n    return upsertedNetworkConfigurationId;\n  }\n\n  /**\n   * Removes a custom network from state.\n   *\n   * This involves updating the `networkConfigurations` property in state as\n   * well and removing the network client that corresponds to the network from\n   * the client registry.\n   *\n   * @param networkConfigurationId - The ID of an existing network\n   * configuration.\n   */\n  removeNetworkConfiguration(networkConfigurationId: string) {\n    if (!this.state.networkConfigurations[networkConfigurationId]) {\n      throw new Error(\n        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`,\n      );\n    }\n\n    const autoManagedNetworkClientRegistry =\n      this.#ensureAutoManagedNetworkClientRegistryPopulated();\n    const networkClientId = buildCustomNetworkClientId(networkConfigurationId);\n\n    this.update((state) => {\n      delete state.networkConfigurations[networkConfigurationId];\n    });\n\n    const customNetworkClientRegistry =\n      autoManagedNetworkClientRegistry[NetworkClientType.Custom];\n    const existingAutoManagedNetworkClient =\n      customNetworkClientRegistry[networkClientId];\n    existingAutoManagedNetworkClient.destroy();\n    delete customNetworkClientRegistry[networkClientId];\n  }\n\n  /**\n   * Switches to the previously selected network, assuming that there is one\n   * (if not and `initializeProvider` has not been previously called, then this\n   * method is equivalent to calling `resetConnection`).\n   */\n  async rollbackToPreviousProvider() {\n    this.#ensureAutoManagedNetworkClientRegistryPopulated();\n\n    this.update((state) => {\n      state.providerConfig = this.#previousProviderConfig;\n    });\n\n    await this.#refreshNetwork();\n  }\n\n  /**\n   * Deactivates the controller, stopping any ongoing polling.\n   *\n   * In-progress requests will not be aborted.\n   */\n  async destroy() {\n    await this.#blockTrackerProxy?.destroy();\n  }\n\n  /**\n   * Updates the controller using the given backup data.\n   *\n   * @param backup - The data that has been backed up.\n   * @param backup.networkConfigurations - Network configurations in the backup.\n   */\n  loadBackup({\n    networkConfigurations,\n  }: {\n    networkConfigurations: NetworkState['networkConfigurations'];\n  }): void {\n    this.update((state) => {\n      state.networkConfigurations = {\n        ...state.networkConfigurations,\n        ...networkConfigurations,\n      };\n    });\n  }\n\n  /**\n   * Searches for a network configuration ID with the given ChainID and returns it.\n   *\n   * @param chainId - ChainId to search for\n   * @returns networkClientId of the network configuration with the given chainId\n   */\n  findNetworkClientIdByChainId(chainId: Hex): NetworkClientId {\n    const networkClients = this.getNetworkClientRegistry();\n    const networkClientEntry = Object.entries(networkClients).find(\n      ([_, networkClient]) => networkClient.configuration.chainId === chainId,\n    );\n    if (networkClientEntry === undefined) {\n      throw new Error(\"Couldn't find networkClientId for chainId\");\n    }\n    return networkClientEntry[0];\n  }\n\n  /**\n   * Before accessing or switching the network, the registry of network clients\n   * needs to be populated. Otherwise, `#applyNetworkSelection` and\n   * `getNetworkClientRegistry` will throw an error. This method checks to see if the\n   * population step has happened yet, and if not, makes it happen.\n   *\n   * @returns The populated network client registry.\n   */\n  #ensureAutoManagedNetworkClientRegistryPopulated(): AutoManagedNetworkClientRegistry {\n    const autoManagedNetworkClientRegistry =\n      this.#autoManagedNetworkClientRegistry ??\n      this.#createAutoManagedNetworkClientRegistry();\n    this.#autoManagedNetworkClientRegistry = autoManagedNetworkClientRegistry;\n    return autoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the registry of network clients based on the set of built-in\n   * networks as well as the custom networks in state.\n   *\n   * @returns The network clients keyed by ID.\n   */\n  #createAutoManagedNetworkClientRegistry(): AutoManagedNetworkClientRegistry {\n    return [\n      ...this.#buildIdentifiedInfuraNetworkClientConfigurations(),\n      ...this.#buildIdentifiedCustomNetworkClientConfigurations(),\n      ...this.#buildIdentifiedNetworkClientConfigurationsFromProviderConfig(),\n    ].reduce(\n      (\n        registry,\n        [networkClientType, networkClientId, networkClientConfiguration],\n      ) => {\n        const autoManagedNetworkClient = createAutoManagedNetworkClient(\n          networkClientConfiguration,\n        );\n        if (networkClientId in registry[networkClientType]) {\n          return registry;\n        }\n        return {\n          ...registry,\n          [networkClientType]: {\n            ...registry[networkClientType],\n            [networkClientId]: autoManagedNetworkClient,\n          },\n        };\n      },\n      {\n        [NetworkClientType.Infura]: {},\n        [NetworkClientType.Custom]: {},\n      },\n    ) as AutoManagedNetworkClientRegistry;\n  }\n\n  /**\n   * Constructs the list of network clients for built-in networks (that is,\n   * the subset of the networks we know Infura supports that consumers do not\n   * need to explicitly add).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedInfuraNetworkClientConfigurations(): [\n    NetworkClientType.Infura,\n    BuiltInNetworkClientId,\n    InfuraNetworkClientConfiguration,\n  ][] {\n    return knownKeysOf(InfuraNetworkType).map((network) => {\n      const networkClientId = buildInfuraNetworkClientId(network);\n      const networkClientConfiguration: InfuraNetworkClientConfiguration = {\n        type: NetworkClientType.Infura,\n        network,\n        infuraProjectId: this.#infuraProjectId,\n        chainId: BUILT_IN_NETWORKS[network].chainId,\n        ticker: BUILT_IN_NETWORKS[network].ticker,\n      };\n      return [\n        NetworkClientType.Infura,\n        networkClientId,\n        networkClientConfiguration,\n      ];\n    });\n  }\n\n  /**\n   * Constructs the list of network clients for custom networks (that is, those\n   * which consumers have added via `networkConfigurations`).\n   *\n   * @returns The network clients.\n   */\n  #buildIdentifiedCustomNetworkClientConfigurations(): [\n    NetworkClientType.Custom,\n    CustomNetworkClientId,\n    CustomNetworkClientConfiguration,\n  ][] {\n    return Object.entries(this.state.networkConfigurations).map(\n      ([networkConfigurationId, networkConfiguration]) => {\n        if (networkConfiguration.chainId === undefined) {\n          throw new Error('chainId must be provided for custom RPC endpoints');\n        }\n        if (networkConfiguration.rpcUrl === undefined) {\n          throw new Error('rpcUrl must be provided for custom RPC endpoints');\n        }\n        const networkClientId = buildCustomNetworkClientId(\n          networkConfigurationId,\n        );\n        const networkClientConfiguration: CustomNetworkClientConfiguration = {\n          type: NetworkClientType.Custom,\n          chainId: networkConfiguration.chainId,\n          rpcUrl: networkConfiguration.rpcUrl,\n          ticker: networkConfiguration.ticker,\n        };\n        return [\n          NetworkClientType.Custom,\n          networkClientId,\n          networkClientConfiguration,\n        ];\n      },\n    );\n  }\n\n  /**\n   * Converts the provider config object in state to a network client\n   * configuration object.\n   *\n   * @returns The network client config.\n   * @throws If the provider config is of type \"rpc\" and lacks either a\n   * `chainId` or an `rpcUrl`.\n   */\n  #buildIdentifiedNetworkClientConfigurationsFromProviderConfig():\n    | [\n        [\n          NetworkClientType.Custom,\n          CustomNetworkClientId,\n          CustomNetworkClientConfiguration,\n        ],\n      ]\n    | [] {\n    const { providerConfig } = this.state;\n\n    if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const networkClientConfiguration: CustomNetworkClientConfiguration = {\n        chainId: providerConfig.chainId,\n        rpcUrl: providerConfig.rpcUrl,\n        type: NetworkClientType.Custom,\n        ticker: providerConfig.ticker,\n      };\n      return [\n        [NetworkClientType.Custom, networkClientId, networkClientConfiguration],\n      ];\n    }\n\n    if (isInfuraProviderConfig(providerConfig)) {\n      return [];\n    }\n\n    throw new Error(`Unrecognized network type: '${providerConfig.type}'`);\n  }\n\n  /**\n   * Uses the information in the provider config object to look up a known and\n   * preinitialized network client. Once a network client is found, updates the\n   * provider and block tracker proxy to point to those from the network client,\n   * then finally creates an EthQuery that points to the provider proxy.\n   *\n   * @throws If no network client could be found matching the current provider\n   * config.\n   */\n  #applyNetworkSelection() {\n    if (!this.#autoManagedNetworkClientRegistry) {\n      throw new Error(\n        'initializeProvider must be called first in order to switch the network',\n      );\n    }\n\n    const { providerConfig } = this.state;\n\n    let autoManagedNetworkClient: AutoManagedNetworkClient<NetworkClientConfiguration>;\n\n    let networkClientId: NetworkClientId;\n    if (isInfuraProviderConfig(providerConfig)) {\n      const networkClientType = NetworkClientType.Infura;\n      networkClientId = buildInfuraNetworkClientId(providerConfig);\n      const builtInNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient =\n        builtInNetworkClientRegistry[networkClientId as BuiltInNetworkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find custom network matching ${networkClientId}`,\n        );\n      }\n    } else if (isCustomProviderConfig(providerConfig)) {\n      validateCustomProviderConfig(providerConfig);\n      const networkClientType = NetworkClientType.Custom;\n      networkClientId = buildCustomNetworkClientId(\n        providerConfig,\n        this.state.networkConfigurations,\n      );\n      const customNetworkClientRegistry =\n        this.#autoManagedNetworkClientRegistry[networkClientType];\n      autoManagedNetworkClient = customNetworkClientRegistry[networkClientId];\n      if (!autoManagedNetworkClient) {\n        throw new Error(\n          `Could not find built-in network matching ${networkClientId}`,\n        );\n      }\n    } else {\n      throw new Error('Could not determine type of provider config');\n    }\n\n    this.update((state) => {\n      state.selectedNetworkClientId = networkClientId;\n      if (state.networksMetadata[networkClientId] === undefined) {\n        state.networksMetadata[networkClientId] = {\n          status: NetworkStatus.Unknown,\n          EIPS: {},\n        };\n      }\n    });\n\n    const { provider, blockTracker } = autoManagedNetworkClient;\n\n    if (this.#providerProxy) {\n      this.#providerProxy.setTarget(provider);\n    } else {\n      this.#providerProxy = createEventEmitterProxy(provider);\n    }\n\n    if (this.#blockTrackerProxy) {\n      this.#blockTrackerProxy.setTarget(blockTracker);\n    } else {\n      this.#blockTrackerProxy = createEventEmitterProxy(blockTracker, {\n        eventFilter: 'skipInternal',\n      });\n    }\n\n    this.#ethQuery = new EthQuery(this.#providerProxy);\n  }\n}\n"],"mappings":"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","names":[]}
+\ No newline at end of file
+diff --git a/dist/index.js b/dist/index.js
+index 0b9f596a1c5578661119cde327659b34b74098bf..5357e67b57eb23e7188c7bace55799b88a680433 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -2,7 +2,7 @@
+ 
+ 
+ 
+-var _chunk4ZD3DTQ7js = require('./chunk-4ZD3DTQ7.js');
++var _chunkRSKJC2QZjs = require('./chunk-RSKJC2QZ.js');
+ 
+ 
+ 
+@@ -21,5 +21,5 @@ require('./chunk-Z4BLTVTB.js');
+ 
+ 
+ 
+-exports.INFURA_BLOCKED_KEY = _chunkZKNI7MD3js.INFURA_BLOCKED_KEY; exports.NetworkClientType = _chunkKHZTS7TFjs.NetworkClientType; exports.NetworkController = _chunk4ZD3DTQ7js.NetworkController; exports.NetworkStatus = _chunkZKNI7MD3js.NetworkStatus; exports.defaultState = _chunk4ZD3DTQ7js.defaultState; exports.knownKeysOf = _chunk4ZD3DTQ7js.knownKeysOf;
++exports.INFURA_BLOCKED_KEY = _chunkZKNI7MD3js.INFURA_BLOCKED_KEY; exports.NetworkClientType = _chunkKHZTS7TFjs.NetworkClientType; exports.NetworkController = _chunkRSKJC2QZjs.NetworkController; exports.NetworkStatus = _chunkZKNI7MD3js.NetworkStatus; exports.defaultState = _chunkRSKJC2QZjs.defaultState; exports.knownKeysOf = _chunkRSKJC2QZjs.knownKeysOf;
+ //# sourceMappingURL=index.js.map
+\ No newline at end of file
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 6ffee6a778d284fa495ccae61fb85d1bb0cec078..c2f420dcab2755536e0e9b957acea9acf102b816 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -2,7 +2,7 @@ import {
+   NetworkController,
+   defaultState,
+   knownKeysOf
+-} from "./chunk-UG2NYGJD.mjs";
++} from "./chunk-PQBSOEJ3.mjs";
+ import {
+   INFURA_BLOCKED_KEY,
+   NetworkStatus
+diff --git a/dist/tsconfig.build.tsbuildinfo b/dist/tsconfig.build.tsbuildinfo
+index 10a36831e1d3787fb74e70bc2613b0969e1ff4f7..b384d5d7422d49e2ee615223c2ecef077dbfdad9 100644
+--- a/dist/tsconfig.build.tsbuildinfo
++++ b/dist/tsconfig.build.tsbuildinfo
+@@ -1 +1 @@
+-{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createProvider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/BaseControllerV1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/assert.d.ts","../../../node_modules/@types/node/assert/strict.d.ts","../../../node_modules/@types/node/globals.d.ts","../../../node_modules/@types/node/async_hooks.d.ts","../../../node_modules/@types/node/buffer.d.ts","../../../node_modules/@types/node/child_process.d.ts","../../../node_modules/@types/node/cluster.d.ts","../../../node_modules/@types/node/console.d.ts","../../../node_modules/@types/node/constants.d.ts","../../../node_modules/@types/node/crypto.d.ts","../../../node_modules/@types/node/dgram.d.ts","../../../node_modules/@types/node/diagnostics_channel.d.ts","../../../node_modules/@types/node/dns.d.ts","../../../node_modules/@types/node/dns/promises.d.ts","../../../node_modules/@types/node/dom-events.d.ts","../../../node_modules/@types/node/domain.d.ts","../../../node_modules/@types/node/events.d.ts","../../../node_modules/@types/node/fs.d.ts","../../../node_modules/@types/node/fs/promises.d.ts","../../../node_modules/@types/node/http.d.ts","../../../node_modules/@types/node/http2.d.ts","../../../node_modules/@types/node/https.d.ts","../../../node_modules/@types/node/inspector.d.ts","../../../node_modules/@types/node/module.d.ts","../../../node_modules/@types/node/net.d.ts","../../../node_modules/@types/node/os.d.ts","../../../node_modules/@types/node/path.d.ts","../../../node_modules/@types/node/perf_hooks.d.ts","../../../node_modules/@types/node/process.d.ts","../../../node_modules/@types/node/punycode.d.ts","../../../node_modules/@types/node/querystring.d.ts","../../../node_modules/@types/node/readline.d.ts","../../../node_modules/@types/node/repl.d.ts","../../../node_modules/@types/node/stream.d.ts","../../../node_modules/@types/node/stream/promises.d.ts","../../../node_modules/@types/node/stream/consumers.d.ts","../../../node_modules/@types/node/stream/web.d.ts","../../../node_modules/@types/node/string_decoder.d.ts","../../../node_modules/@types/node/test.d.ts","../../../node_modules/@types/node/timers.d.ts","../../../node_modules/@types/node/timers/promises.d.ts","../../../node_modules/@types/node/tls.d.ts","../../../node_modules/@types/node/trace_events.d.ts","../../../node_modules/@types/node/tty.d.ts","../../../node_modules/@types/node/url.d.ts","../../../node_modules/@types/node/util.d.ts","../../../node_modules/@types/node/v8.d.ts","../../../node_modules/@types/node/vm.d.ts","../../../node_modules/@types/node/wasi.d.ts","../../../node_modules/@types/node/worker_threads.d.ts","../../../node_modules/@types/node/zlib.d.ts","../../../node_modules/@types/node/globals.global.d.ts","../../../node_modules/@types/node/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asyncEventEmitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacyTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/baseTransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559Transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionFactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerClass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/RestrictedControllerMessenger.d.ts","../../base-controller/dist/types/ControllerMessenger.d.ts","../../base-controller/dist/types/BaseControllerV2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/utils.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/utils.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/classes.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/errors.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/error-constants.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createEventEmitterProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createSwappableProxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../src/constants.ts","../../../node_modules/@metamask/safe-event-emitter/dist/cjs/index.d.ts","../../json-rpc-engine/dist/types/JsonRpcEngine.d.ts","../../json-rpc-engine/dist/types/createAsyncMiddleware.d.ts","../../json-rpc-engine/dist/types/createScaffoldMiddleware.d.ts","../../json-rpc-engine/dist/types/getUniqueId.d.ts","../../json-rpc-engine/dist/types/idRemapMiddleware.d.ts","../../json-rpc-engine/dist/types/mergeMiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/BlockTracker.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/PollingBlockTracker.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/SubscribeBlockTracker.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/index.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/types.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/create-infura-middleware.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/fetch-config-from-req.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/create-provider.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/index.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/types.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-cache.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-ref-rewrite.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-ref.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-tracker-inspector.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/fetch.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/inflight-cache.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/providerAsMiddleware.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/retryOnEmpty.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/wallet.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/index.d.ts","../src/types.ts","../src/create-network-client.ts","../src/create-auto-managed-network-client.ts","../src/logger.ts","../src/NetworkController.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupSemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/diffLines.d.ts","../../../node_modules/jest-diff/build/printDiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","75b22c74010ba649de1a1676a4c4b8b5bb4294fecd05089e2094429b16d7840c","5615ccf831db2ffc82145243081ebdb60ea8e1005ee8f975d1c0c1401a9c894e","38682ed3630bb6ecdace80d5a9adc811fc20a419f1940446e306c3a020d083b9","cc182e6e4f691cd6f7bf7cb491247a4c7818f9f1cb2db1d45c65ff906e3f741b","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","e0eda929c6b9b628cdeb0e54cd3582cb97e64f28aab34612fc1431c545899584","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","b3d48529ae61dc27d0bfbfa2cb3e0dff8189644bd155bdf5df1e8e14669f7043","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","5b3cd03ae354ea96eff1f74d7c410fe4852e6382227e8b0ecf87ab5e3a5bbcd4","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"056097110efd16869ec118cedb44ecbac9a019576eee808d61304ca6d5cb2cbe","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"6fb8358e10ed92a7f515b7d79da3904c955a3ffd4e14aa9df6f0ea113041f1cf","affectsGlobalScope":true},"45c831238c6dac21c72da5f335747736a56a3847192bf03c84b958a7e9ec93e2","661a11d16ad2e3543a77c53bcd4017ee9a450f47ab7def3ab493a86eae4d550c",{"version":"8cdc646cec7819581ef343b83855b1bfe4fe674f2c84f4fb8dc90d82fb56bd3a","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","9dd56225cc2d8cb8fe5ceb0043ff386987637e12fecc6078896058a99deae284","2375ed4b439215aa3b6d0c6fd175c78a4384b30cb43cbadaecbf0a18954c98cb","7693b90b3075deaccafd5efb467bf9f2b747a3075be888652ef73e64396d8628","41231da15bb5e3e806a8395bd15c7befd2ec90f9f4e3c9d0ae1356bccb76dbb0","fccfef201d057cb407fa515311bd608549bab6c7b8adcf8f2df31f5d3b796478",{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true},"5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"464762c6213566d072f1ced5e8e9a954785ec5e53883b7397198abb5ef5b8f71","affectsGlobalScope":true},"6387920dc3e18927335b086deec75bf8e50f879a5e273d32ee7bb7a55ba50572","9bba37424094688c4663c177a1379b229f919b8912889a472f32fdc5f08ddb4d","29a4be13b3a30d3e66667b75c58ec61fb2df8fa0422534fdee3cfb30c5dbf450","83366d901beda79d6eb37aaaf6ca248dcd88946302b2a7d975590783be51e88e","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","43ec77c369473e92e2ecebf0554a0fdaa9c256644a6070f28228dfcceec77351",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"95ed02bacb4502c985b69742ec82a4576d4ff4a6620ecc91593f611d502ae546","bf755525c4e6f85a970b98c4755d98e8aa1b6dbd83a5d8fcc57d3d497351b936","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"28084e15b63e6211769db2fe646d8bc5c4c6776321e0deffe2d12eefd52cb6b9","affectsGlobalScope":true},{"version":"aed37dabf86c99d6c8508700576ecede86688397bc12523541858705a0c737c2","affectsGlobalScope":true},"cc6ef5733d4ea6d2e06310a32dffd2c16418b467c5033d49cecc4f3a25de7497","94768454c3348b6ebe48e45fbad8c92e2bb7af4a35243edbe2b90823d0bd7f9a","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","84da3c28344e621fd1d591f2c09e9595292d2b70018da28a553268ac122597d4","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","6e191fea1db6e9e4fa828259cf489e820ec9170effff57fb081a2f3295db4722","aed943465fbce1efe49ee16b5ea409050f15cd8eaf116f6fadb64ef0772e7d95","70d08483a67bf7050dbedace398ef3fee9f436fcd60517c97c4c1e22e3c6f3e8","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"e933de8143e1d12dd51d89b398760fd5a9081896be366dad88a922d0b29f3c69","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b38d55d08708c2410a3039687db70b4a5bfa69fc4845617c313b5a10d9c5c637","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"a05e2d784c9be7051c4ac87a407c66d2106e23490c18c038bbd0712bde7602fd","affectsGlobalScope":true},{"version":"df90b9d0e9980762da8daf8adf6ffa0c853e76bfd269c377be0d07a9ad87acd2","affectsGlobalScope":true},"cf434b5c04792f62d6f4bdd5e2c8673f36e638e910333c172614d5def9b17f98","1d65d4798df9c2df008884035c41d3e67731f29db5ecb64cd7378797c7c53a2f","0faee6b555890a1cb106e2adc5d3ffd89545b1da894d474e9d436596d654998f","c6c01ea1c42508edf11a36d13b70f6e35774f74355ba5d358354d4a77cc67ea1","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"b0297b09e607bec9698cac7cf55463d6731406efb1161ee4d448293b47397c84","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","68cc8d6fcc2f270d7108f02f3ebc59480a54615be3e09a47e14527f349e9d53e","3eb11dbf3489064a47a2e1cf9d261b1f100ef0b3b50ffca6c44dd99d6dd81ac1","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","277983d414aa99d78655186c3ee1e1c38c302e336aff1d77b47fcdc39d8273fe","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","ca3353cc82b1981f0d25d71d7432d583a6ef882ccdea82d65fbe49af37be51cb","50679a8e27aacf72f8c40bcab15d7ef5e83494089b4726b83eec4554344d5cdc","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","5d697a4b315cc5bb3042ae869abffd10c3b0d7b182cda0e4c45d8819937e5796","7528af2ed74464d2c0ae92025f14c1f11691deb07812bc66afbe6f87c3669f1f","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","299567f84bfedd1468dca2755a829cb19e607a6811673788807dc8921e211bc9","795d9fb85aad92221504db74dd179b506bd189bba0c104426f7e7bb8a66ffee5","1311bc194e0a69fe61031e852c1c0b439e2a2a3d1d5e2d8ff795499b9f283459","4b7ce19369d7e7fae76720c2c6c7f671bf3fa0f7093edb864f1ac358ca7c456c","c972ef44deca1fa8fab465915ffa00f82e126aacf3dfc8979c03b1b066ce5bb6","30285a1011c6d6b52f3ba3abb0a984be8148c05cdefb8eb6eb562335a3991f35","9f9e5bae412fa5909fae636d6733aee27a108cc2ed5b13980611016336774d3c","662fe197bba64bd3f17ee118058cd2d0d2dbe33d7c0c865fd6365d90bfc44e1e","030519c351f800551cac2658038804969ca4584d2c0175a710602ac234ca1340","0278a6939ca83cd040b08ff8c5fc7838b6693ddc52f22526bf158e6b10e0246c","c2d6206e5ba4fd3063b01218c2b3b997afc1cfbeb49fcee991fa8595842ce53d","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e",{"version":"12accaad8d0630e27afcee6db467be3587027b92d8a78a5ea40d98ce879db790","signature":"e3539189d512442af177f3c8c49e9cc56834ae05f3ed125491baae619d4c526f"},"fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","d6e6620a30d582182acc3f0a992a0c311adc589f111096aea11ab83fc09a5ccc","6213b8f686f56beab22b59a0f468590fd3a4c5fa931236a017efeca91d7c9584","c451cec9a588b1f105a5ea2c6063d4fca112b9d70105cacdadda0e1ef67e9379","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","03460a54d0e0481d1e11097f66ad43f054bc95efdafe5f81bbc7a82be181af75","ded24ddc7157689a5aa14bd651272ab8cd6e7812da2196a65d8c5e63131cfb23","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","9f99927996dec2b673c7dcf314ad3fc2d96b3097016d99e28ca25314e19df2c1","accf5b0acb7a341cf9699960157059c95c40842b7b3312ab19053c610cbde977","8d27ef959532cab3f4313ba2f1e66d9c1c159539faa653c3cef848a457939726","a4fcdbc70e4d139fb80f8c99789aea5ad42e18c8ffd034bfe44ab63644471cc7","81859dcda72b45168a93fefe8bf6d62a4eb4032694def53a3c2ccb7f07326d8f","827abdfc5e85e0d5b1959167928bd2f9ca5a684a2b64e054d291571f7e632d4c","84605b003c9b842f5d4d5d068f7d92f382d3b5c1565375eef3136ed5f03d7ee4","1679f0a7b02d9f185ac1ea0ef4c9197d4c6d299de3e433ce4b8679a58e34c9e5","66ee590a1a296344449ac904bf56c03b3075c4f3c2479db655cc1ce9407eb58b","d067e051d72e0d79389c52cb28bb23d11b97c2bd7dfaba12083ea544d924ab7a","1d44112639c6691d697eaa88c1bf738a4438063f1ecbfbc1208b6d3040d39eb7","f957b018293727b85e13d0a0c8f15556e97cf6fa6cd6b3c5c47a18d9173155b1","0763c0248d05cfd5fea25f97aa10d51084a36a8893985e0537c48e4ab1376326","b4608db340ab2c69bc4d426d06c3bf4f8a04f4e2c40fa30905581336bf3f242c","a55ab6e38e964b1000ab2fbab89e41996375c83c9d1c79d2f243c5df901289b9","4f07dc7f29a2f794c62996d32f148e973ba146ce59a16d4ad3e01c5e3018891f",{"version":"9eb6c0f28550944f99f6d1fc1985f29ac121ba0b57a399db12a59f53e0d327d8","signature":"689e53365e2e5af801be2af3fad66936b989c4fffa9dfd94f91885f11afa05d2"},{"version":"86ee1535397ec5bc983ffe847ed6ea66c704084745fafc0b81ef2e2b9ea0a6c4","signature":"2901396d9707d63ee1d6dcd60cfe70fe64bdd78b13696cddefd8872393d1b96a"},{"version":"3d42a9b4218d715d9909898927a2f6ab7f1738178e7eb81ddd3d7f7b1392e8e9","signature":"e10b1f5cd5b943bdffdfa8165d796837e13b58718a1faee5485652a0fbedde58"},{"version":"ddfd4bd8fb8f640b88a39262cde2d22c73b0149b3cbe1574bc2da48a176f612c","signature":"7bd3844e77367d48f1f9ea69d39b92ff9d086dc499da91fe8df78406b2e3f1fc"},{"version":"c6d0c102c423c94e7fe1efef045e7e0cb056c3acea9508ed2e9c45d9568ce199","signature":"2c72440feb99d0bdbb94a41fce555c92a8eb25aa4f3ef48fa7de55897ce24ad7"},"d68cb13e3cde9d7fc02ecc3f258de77f5e7da54b6f5513ae075f2fd8e1f0d5d9","4489c6a9fde8934733aa7df6f7911461ee6e9e4ad092736bd416f6b2cc20b2c6","2c8e55457aaf4902941dfdba4061935922e8ee6e120539c9801cd7b400fae050","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","670a76db379b27c8ff42f1ba927828a22862e2ab0b0908e38b671f0e912cc5ed","9d38964b57191567a14b396422c87488cecd48f405c642daa734159875ee81d9","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","8c95f96ccd4be0674944077aec1e4f2cccd515ca06d4327562dd017250e7d3fc",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","bc3cba7b0af2d52e7425299aee518db479d44004eff6fbbd206d1ee7e5ec3fb5","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","035a5df183489c2e22f3cf59fc1ed2b043d27f357eecc0eb8d8e840059d44245","a4809f4d92317535e6b22b01019437030077a76fec1d93b9881c9ed4738fcc54","5f53fa0bd22096d2a78533f94e02c899143b8f0f9891a46965294ee8b91a9434","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","b8442e9db28157344d1bc5d8a5a256f1692de213f0c0ddeb84359834015a008c","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","da2b6356b84a40111aaecb18304ea4e4fcb43d70efb1c13ca7d7a906445ee0d3","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","6f294731b495c65ecf46a5694f0082954b961cf05463bea823f8014098eaffa0","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","68a0d0c508e1b6d8d23a519a8a0a3303dc5baa4849ca049f21e5bad41945e3fc","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","b03afe4bec768ae333582915146f48b161e567a81b5ebc31c4d78af089770ac9","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9","4f6a12044ee6f458db11964153830abbc499e73d065c51c329ec97407f4b13dd","8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","916be7d770b0ae0406be9486ac12eb9825f21514961dd050594c4b250617d5a8","254d9fb8c872d73d34594be8a200fd7311dbfa10a4116bfc465fba408052f2b3","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","2ccea88888048bbfcacbc9531a5596ea48a3e7dcd0a25f531a81bb717903ba4f","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","d8f7109e14f20eb735225a62fd3f8366da1a8349e90331cdad57f4b04caf6c5a","cf3d384d082b933d987c4e2fe7bfb8710adfd9dc8155190056ed6695a25a559e","9871b7ee672bc16c78833bdab3052615834b08375cb144e4d2cba74473f4a589","c863198dae89420f3c552b5a03da6ed6d0acfa3807a64772b895db624b0de707","8b03a5e327d7db67112ebbc93b4f744133eda2c1743dbb0a990c61a8007823ef","86c73f2ee1752bac8eeeece234fd05dfcf0637a4fbd8032e4f5f43102faa8eec","42fad1f540271e35ca37cecda12c4ce2eef27f0f5cf0f8dd761d723c744d3159","ff3743a5de32bee10906aff63d1de726f6a7fd6ee2da4b8229054dfa69de2c34","83acd370f7f84f203e71ebba33ba61b7f1291ca027d7f9a662c6307d74e4ac22","1445cec898f90bdd18b2949b9590b3c012f5b7e1804e6e329fb0fe053946d5ec","0e5318ec2275d8da858b541920d9306650ae6ac8012f0e872fe66eb50321a669","cf530297c3fb3a92ec9591dd4fa229d58b5981e45fe6702a0bd2bea53a5e59be","c1f6f7d08d42148ddfe164d36d7aba91f467dbcb3caa715966ff95f55048b3a4","f4e9bf9103191ef3b3612d3ec0044ca4044ca5be27711fe648ada06fad4bcc85","0c1ee27b8f6a00097c2d6d91a21ee4d096ab52c1e28350f6362542b55380059a","7677d5b0db9e020d3017720f853ba18f415219fb3a9597343b1b1012cfd699f7","bc1c6bc119c1784b1a2be6d9c47addec0d83ef0d52c8fbe1f14a51b4dfffc675","52cf2ce99c2a23de70225e252e9822a22b4e0adb82643ab0b710858810e00bf1","770625067bb27a20b9826255a8d47b6b5b0a2d3dfcbd21f89904c731f671ba77","d1ed6765f4d7906a05968fb5cd6d1db8afa14dbe512a4884e8ea5c0f5e142c80","799c0f1b07c092626cf1efd71d459997635911bb5f7fc1196efe449bba87e965","2a184e4462b9914a30b1b5c41cf80c6d3428f17b20d3afb711fff3f0644001fd","9eabde32a3aa5d80de34af2c2206cdc3ee094c6504a8d0c2d6d20c7c179503cc","397c8051b6cfcb48aa22656f0faca2553c5f56187262135162ee79d2b2f6c966","a8ead142e0c87dcd5dc130eba1f8eeed506b08952d905c47621dc2f583b1bff9","a02f10ea5f73130efca046429254a4e3c06b5475baecc8f7b99a0014731be8b3","c2576a4083232b0e2d9bd06875dd43d371dee2e090325a9eac0133fd5650c1cb","4c9a0564bb317349de6a24eb4efea8bb79898fa72ad63a1809165f5bd42970dd","f40ac11d8859092d20f953aae14ba967282c3bb056431a37fced1866ec7a2681","cc11e9e79d4746cc59e0e17473a59d6f104692fd0eeea1bdb2e206eabed83b03","b444a410d34fb5e98aa5ee2b381362044f4884652e8bc8a11c8fe14bbd85518e","c35808c1f5e16d2c571aa65067e3cb95afeff843b259ecfa2fc107a9519b5392","14d5dc055143e941c8743c6a21fa459f961cbc3deedf1bfe47b11587ca4b3ef5","a3ad4e1fc542751005267d50a6298e6765928c0c3a8dce1572f2ba6ca518661c","f237e7c97a3a89f4591afd49ecb3bd8d14f51a1c4adc8fcae3430febedff5eb6","3ffdfbec93b7aed71082af62b8c3e0cc71261cc68d796665faa1e91604fbae8f","662201f943ed45b1ad600d03a90dffe20841e725203ced8b708c91fcd7f9379a","c9ef74c64ed051ea5b958621e7fb853fe3b56e8787c1587aefc6ea988b3c7e79","2462ccfac5f3375794b861abaa81da380f1bbd9401de59ffa43119a0b644253d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","7d8ddf0f021c53099e34ee831a06c394d50371816caa98684812f089b4c6b3d4","7d2a0ba1297be385a89b5515b88cd31b4a1eeef5236f710166dc1b36b1741e1b","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","ab82804a14454734010dcdcd43f564ff7b0389bee4c5692eec76ff5b30d4cf66","bae8d023ef6b23df7da26f51cea44321f95817c190342a36882e93b80d07a960","ae271d475b632ce7b03fea6d9cf6da72439e57a109672671cbc79f54e1386938"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[248],[92,128,129,130,145],[129,130,146,147],[128,129],[128,145,148,151],[128,148,151,152],[149,150,151,153,154],[128,151],[128,145,148,149,150,153],[128,136],[128],[92,128],[80,128],[132,133,134,135,136,137,138,139,140,141,142,143,144],[128,134,135],[128,134,136],[210],[210,221,222],[222,223,224],[167,217,226],[221,227],[167,226],[227,228,229],[167],[167,225,231],[167,217,225],[167,217,221,225],[167,217],[232,233,234,235,236,237,238,239,240],[167,231],[167,217,221],[167,217,231],[167,199],[199,200],[199,200,201,202],[204],[204,205,206],[64],[67],[64,67],[65,66,67,68,69,70,71,72,73,74,75,156,159,160,161,162,163,164,165,166],[58,64,65],[67,73,75,155],[158],[67,68],[64,162],[194,195],[248,249,250,251,252],[248,250],[157],[255,256,257],[93,128],[260],[261],[272],[266,271],[275,277,278,279,280,281,282,283,284,285,286,287],[275,276,278,279,280,281,282,283,284,285,286,287],[276,277,278,279,280,281,282,283,284,285,286,287],[275,276,277,279,280,281,282,283,284,285,286,287],[275,276,277,278,280,281,282,283,284,285,286,287],[275,276,277,278,279,281,282,283,284,285,286,287],[275,276,277,278,279,280,282,283,284,285,286,287],[275,276,277,278,279,280,281,283,284,285,286,287],[275,276,277,278,279,280,281,282,284,285,286,287],[275,276,277,278,279,280,281,282,283,285,286,287],[275,276,277,278,279,280,281,282,283,284,286,287],[275,276,277,278,279,280,281,282,283,284,285,287],[275,276,277,278,279,280,281,282,283,284,285,286],[76],[79],[80,85,112],[81,92,93,100,109,120],[81,82,92,100],[83,121],[84,85,93,101],[85,109,117],[86,88,92,100],[87],[88,89],[92],[91,92],[79,92],[92,93,94,109,120],[92,93,94,109],[92,95,100,109,120],[92,93,95,96,100,109,117,120],[95,97,109,117,120],[76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127],[92,98],[99,120,125],[88,92,100,109],[101],[102],[79,103],[104,119,125],[105],[106],[92,107],[107,108,121,123],[80,92,109,110,111],[80,109,111],[109,110],[112],[113],[92,115,116],[115,116],[85,100,109,117],[118],[100,119],[80,95,106,120],[85,121],[109,122],[123],[124],[80,85,92,94,103,109,120,123,125],[109,126],[128,293],[296,335],[296,320,335],[335],[296],[296,321,335],[296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334],[321,335],[336],[339],[179],[179,180,181,182,183],[168,169,170,171,172,173,174,175,176,177,178],[264,267],[264,267,268,269],[266],[263,270],[265],[57,59,60,61,62,63],[57,58],[59],[58,59],[57,59],[167,184,185,186],[185],[186],[56,185,186,187],[189],[189,190,193,197],[196],[167,191,192],[218,219,220],[217,218],[167,217,218],[167,210,217],[167,210],[167,211],[211,212,213,214,215,216],[76,167,188,191,198,203,207,208,209,242,244,245],[242,243],[167,198,217,221,225,230,241,242],[209,242,243,246],[167,198,221,225],[167,188,191,198,207,209,242,244],[242],[158,167]],"referencedMap":[[250,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[222,17],[223,18],[224,18],[225,19],[227,20],[229,21],[228,22],[230,23],[226,24],[232,25],[233,26],[234,27],[235,26],[236,28],[241,29],[237,30],[238,31],[239,27],[231,28],[240,32],[200,33],[201,34],[203,35],[199,24],[210,12],[205,36],[206,36],[207,37],[65,38],[66,38],[68,39],[69,38],[70,38],[71,40],[67,38],[167,41],[75,42],[156,43],[159,44],[165,45],[166,46],[196,47],[253,48],[249,1],[251,49],[252,1],[192,11],[158,50],[258,51],[259,52],[261,53],[262,54],[273,55],[272,56],[276,57],[277,58],[275,59],[278,60],[279,61],[280,62],[281,63],[282,64],[283,65],[284,66],[285,67],[286,68],[287,69],[76,70],[77,70],[79,71],[80,72],[81,73],[82,74],[83,75],[84,76],[85,77],[86,78],[87,79],[88,80],[89,80],[90,81],[91,82],[92,83],[93,84],[94,85],[95,86],[96,87],[97,88],[128,89],[98,90],[99,91],[100,92],[101,93],[102,94],[103,95],[104,96],[105,97],[106,98],[107,99],[108,100],[109,101],[111,102],[110,103],[112,104],[113,105],[115,106],[116,107],[117,108],[118,109],[119,110],[120,111],[121,112],[122,113],[123,114],[124,115],[125,116],[126,117],[290,11],[294,118],[295,11],[320,119],[321,120],[296,121],[299,121],[318,119],[319,119],[309,119],[308,122],[306,119],[301,119],[314,119],[312,119],[316,119],[300,119],[313,119],[317,119],[302,119],[303,119],[315,119],[297,119],[304,119],[305,119],[307,119],[311,119],[322,123],[310,119],[298,119],[335,124],[329,123],[331,125],[330,123],[323,123],[324,123],[326,123],[328,123],[332,125],[333,125],[325,125],[327,125],[337,126],[340,127],[175,128],[177,128],[176,128],[174,128],[184,129],[179,130],[170,128],[171,128],[172,128],[173,128],[268,131],[270,132],[269,131],[267,133],[271,134],[266,135],[64,136],[59,137],[60,138],[61,138],[62,139],[63,139],[58,140],[187,141],[186,142],[185,143],[188,144],[190,145],[198,146],[197,147],[193,148],[221,149],[219,150],[220,151],[218,152],[211,153],[212,154],[213,154],[215,154],[217,155],[216,154],[246,156],[244,157],[243,158],[247,159],[245,24],[242,160]],"exportedModulesMap":[[250,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[222,17],[223,18],[224,18],[225,19],[227,20],[229,21],[228,22],[230,23],[226,24],[232,25],[233,26],[234,27],[235,26],[236,28],[241,29],[237,30],[238,31],[239,27],[231,28],[240,32],[200,33],[201,34],[203,35],[199,24],[210,12],[205,36],[206,36],[207,37],[65,38],[66,38],[68,39],[69,38],[70,38],[71,40],[67,38],[167,41],[75,42],[156,43],[159,44],[165,45],[166,46],[196,47],[253,48],[249,1],[251,49],[252,1],[192,11],[158,50],[258,51],[259,52],[261,53],[262,54],[273,55],[272,56],[276,57],[277,58],[275,59],[278,60],[279,61],[280,62],[281,63],[282,64],[283,65],[284,66],[285,67],[286,68],[287,69],[76,70],[77,70],[79,71],[80,72],[81,73],[82,74],[83,75],[84,76],[85,77],[86,78],[87,79],[88,80],[89,80],[90,81],[91,82],[92,83],[93,84],[94,85],[95,86],[96,87],[97,88],[128,89],[98,90],[99,91],[100,92],[101,93],[102,94],[103,95],[104,96],[105,97],[106,98],[107,99],[108,100],[109,101],[111,102],[110,103],[112,104],[113,105],[115,106],[116,107],[117,108],[118,109],[119,110],[120,111],[121,112],[122,113],[123,114],[124,115],[125,116],[126,117],[290,11],[294,118],[295,11],[320,119],[321,120],[296,121],[299,121],[318,119],[319,119],[309,119],[308,122],[306,119],[301,119],[314,119],[312,119],[316,119],[300,119],[313,119],[317,119],[302,119],[303,119],[315,119],[297,119],[304,119],[305,119],[307,119],[311,119],[322,123],[310,119],[298,119],[335,124],[329,123],[331,125],[330,123],[323,123],[324,123],[326,123],[328,123],[332,125],[333,125],[325,125],[327,125],[337,126],[340,127],[175,128],[177,128],[176,128],[174,128],[184,129],[179,130],[170,128],[171,128],[172,128],[173,128],[268,131],[270,132],[269,131],[267,133],[271,134],[266,135],[64,136],[59,137],[60,138],[61,138],[62,139],[63,139],[58,140],[187,141],[186,142],[185,143],[188,144],[190,145],[198,146],[197,147],[193,148],[221,149],[219,150],[220,151],[218,152],[211,153],[212,154],[213,154],[215,154],[217,155],[216,154],[246,161],[244,162],[243,162],[247,159],[245,163],[242,160]],"semanticDiagnosticsPerFile":[250,248,146,129,148,130,147,152,153,149,155,150,154,151,137,134,141,135,132,140,145,142,143,144,139,136,133,138,222,223,224,225,227,229,228,230,226,232,233,234,235,236,241,237,238,239,231,240,191,200,202,201,203,199,210,205,206,207,204,65,66,68,69,70,71,72,73,74,67,167,75,156,159,160,161,162,163,164,165,166,194,196,195,253,249,251,252,192,158,254,255,258,256,259,260,261,262,273,272,257,274,276,277,275,278,279,280,281,282,283,284,285,286,287,288,157,76,77,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,78,127,95,96,97,128,98,99,100,101,102,103,104,105,106,107,108,109,111,110,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,289,290,291,292,294,293,295,320,321,296,299,318,319,309,308,306,301,314,312,316,300,313,317,302,303,315,297,304,305,307,311,322,310,298,335,334,329,331,330,323,324,326,328,332,333,325,327,337,336,338,208,339,340,131,263,178,175,177,176,174,184,179,183,180,182,181,170,171,172,168,169,173,264,268,270,269,267,271,266,265,57,64,59,60,61,62,63,58,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,33,30,31,32,34,7,35,40,41,36,37,38,39,1,42,56,187,186,185,188,190,198,197,189,193,221,219,220,218,211,212,213,214,215,217,216,246,209,244,243,247,245,242,47,48,49,50,51,52,43,53,54,55,44,45,46],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.9.5"}
+\ No newline at end of file
++{"program":{"fileNames":["../../../node_modules/typescript/lib/lib.es5.d.ts","../../../node_modules/typescript/lib/lib.es2015.d.ts","../../../node_modules/typescript/lib/lib.es2016.d.ts","../../../node_modules/typescript/lib/lib.es2017.d.ts","../../../node_modules/typescript/lib/lib.es2018.d.ts","../../../node_modules/typescript/lib/lib.es2019.d.ts","../../../node_modules/typescript/lib/lib.es2020.d.ts","../../../node_modules/typescript/lib/lib.dom.d.ts","../../../node_modules/typescript/lib/lib.es2015.core.d.ts","../../../node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../node_modules/typescript/lib/lib.es2017.object.d.ts","../../../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2017.string.d.ts","../../../node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../node_modules/typescript/lib/lib.es2019.array.d.ts","../../../node_modules/typescript/lib/lib.es2019.object.d.ts","../../../node_modules/typescript/lib/lib.es2019.string.d.ts","../../../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../node_modules/typescript/lib/lib.es2020.date.d.ts","../../../node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../node_modules/typescript/lib/lib.es2020.string.d.ts","../../../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../node_modules/typescript/lib/lib.es2020.number.d.ts","../../../node_modules/typescript/lib/lib.esnext.intl.d.ts","../../../types/eth-ens-namehash.d.ts","../../../types/ethereum-ens-network-map.d.ts","../../../types/global.d.ts","../../../types/single-call-balance-checker-abi.d.ts","../../../types/@metamask/contract-metadata.d.ts","../../../types/@metamask/eth-hd-keyring.d.ts","../../../types/@metamask/eth-simple-keyring.d.ts","../../../types/@metamask/ethjs-provider-http.d.ts","../../../types/@metamask/ethjs-unit.d.ts","../../../types/@metamask/metamask-eth-abis.d.ts","../../../types/eth-json-rpc-infura/src/createprovider.d.ts","../../../types/eth-phishing-detect/src/config.json.d.ts","../../../types/eth-phishing-detect/src/detector.d.ts","../../base-controller/dist/types/basecontrollerv1.d.ts","../../../node_modules/superstruct/dist/error.d.ts","../../../node_modules/superstruct/dist/utils.d.ts","../../../node_modules/superstruct/dist/struct.d.ts","../../../node_modules/superstruct/dist/structs/coercions.d.ts","../../../node_modules/superstruct/dist/structs/refinements.d.ts","../../../node_modules/superstruct/dist/structs/types.d.ts","../../../node_modules/superstruct/dist/structs/utilities.d.ts","../../../node_modules/superstruct/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/assert.d.ts","../../../node_modules/@metamask/utils/dist/types/base64.d.ts","../../../node_modules/@metamask/utils/dist/types/hex.d.ts","../../../node_modules/@metamask/utils/dist/types/bytes.d.ts","../../../node_modules/@metamask/utils/dist/types/caip-types.d.ts","../../../node_modules/@metamask/utils/dist/types/checksum.d.ts","../../../node_modules/@metamask/utils/dist/types/coercers.d.ts","../../../node_modules/@metamask/utils/dist/types/collections.d.ts","../../../node_modules/@metamask/utils/dist/types/encryption-types.d.ts","../../../node_modules/@metamask/utils/dist/types/errors.d.ts","../../../node_modules/@metamask/utils/dist/types/json.d.ts","../../../node_modules/@types/node/assert.d.ts","../../../node_modules/@types/node/assert/strict.d.ts","../../../node_modules/@types/node/globals.d.ts","../../../node_modules/@types/node/async_hooks.d.ts","../../../node_modules/@types/node/buffer.d.ts","../../../node_modules/@types/node/child_process.d.ts","../../../node_modules/@types/node/cluster.d.ts","../../../node_modules/@types/node/console.d.ts","../../../node_modules/@types/node/constants.d.ts","../../../node_modules/@types/node/crypto.d.ts","../../../node_modules/@types/node/dgram.d.ts","../../../node_modules/@types/node/diagnostics_channel.d.ts","../../../node_modules/@types/node/dns.d.ts","../../../node_modules/@types/node/dns/promises.d.ts","../../../node_modules/@types/node/dom-events.d.ts","../../../node_modules/@types/node/domain.d.ts","../../../node_modules/@types/node/events.d.ts","../../../node_modules/@types/node/fs.d.ts","../../../node_modules/@types/node/fs/promises.d.ts","../../../node_modules/@types/node/http.d.ts","../../../node_modules/@types/node/http2.d.ts","../../../node_modules/@types/node/https.d.ts","../../../node_modules/@types/node/inspector.d.ts","../../../node_modules/@types/node/module.d.ts","../../../node_modules/@types/node/net.d.ts","../../../node_modules/@types/node/os.d.ts","../../../node_modules/@types/node/path.d.ts","../../../node_modules/@types/node/perf_hooks.d.ts","../../../node_modules/@types/node/process.d.ts","../../../node_modules/@types/node/punycode.d.ts","../../../node_modules/@types/node/querystring.d.ts","../../../node_modules/@types/node/readline.d.ts","../../../node_modules/@types/node/repl.d.ts","../../../node_modules/@types/node/stream.d.ts","../../../node_modules/@types/node/stream/promises.d.ts","../../../node_modules/@types/node/stream/consumers.d.ts","../../../node_modules/@types/node/stream/web.d.ts","../../../node_modules/@types/node/string_decoder.d.ts","../../../node_modules/@types/node/test.d.ts","../../../node_modules/@types/node/timers.d.ts","../../../node_modules/@types/node/timers/promises.d.ts","../../../node_modules/@types/node/tls.d.ts","../../../node_modules/@types/node/trace_events.d.ts","../../../node_modules/@types/node/tty.d.ts","../../../node_modules/@types/node/url.d.ts","../../../node_modules/@types/node/util.d.ts","../../../node_modules/@types/node/v8.d.ts","../../../node_modules/@types/node/vm.d.ts","../../../node_modules/@types/node/wasi.d.ts","../../../node_modules/@types/node/worker_threads.d.ts","../../../node_modules/@types/node/zlib.d.ts","../../../node_modules/@types/node/globals.global.d.ts","../../../node_modules/@types/node/index.d.ts","../../../node_modules/@ethereumjs/common/dist/enums.d.ts","../../../node_modules/@ethereumjs/common/dist/types.d.ts","../../../node_modules/buffer/index.d.ts","../../../node_modules/@ethereumjs/util/dist/constants.d.ts","../../../node_modules/@ethereumjs/util/dist/units.d.ts","../../../node_modules/@ethereumjs/util/dist/address.d.ts","../../../node_modules/@ethereumjs/util/dist/bytes.d.ts","../../../node_modules/@ethereumjs/util/dist/types.d.ts","../../../node_modules/@ethereumjs/util/dist/account.d.ts","../../../node_modules/@ethereumjs/util/dist/withdrawal.d.ts","../../../node_modules/@ethereumjs/util/dist/signature.d.ts","../../../node_modules/@ethereumjs/util/dist/encoding.d.ts","../../../node_modules/@ethereumjs/util/dist/asynceventemitter.d.ts","../../../node_modules/@ethereumjs/util/dist/internal.d.ts","../../../node_modules/@ethereumjs/util/dist/lock.d.ts","../../../node_modules/@ethereumjs/util/dist/provider.d.ts","../../../node_modules/@ethereumjs/util/dist/index.d.ts","../../../node_modules/@ethereumjs/common/dist/common.d.ts","../../../node_modules/@ethereumjs/common/dist/utils.d.ts","../../../node_modules/@ethereumjs/common/dist/index.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip2930transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/legacytransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/types.d.ts","../../../node_modules/@ethereumjs/tx/dist/basetransaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/eip1559transaction.d.ts","../../../node_modules/@ethereumjs/tx/dist/transactionfactory.d.ts","../../../node_modules/@ethereumjs/tx/dist/index.d.ts","../../../node_modules/@metamask/utils/dist/types/keyring.d.ts","../../../node_modules/@types/ms/index.d.ts","../../../node_modules/@types/debug/index.d.ts","../../../node_modules/@metamask/utils/dist/types/logging.d.ts","../../../node_modules/@metamask/utils/dist/types/misc.d.ts","../../../node_modules/@metamask/utils/dist/types/number.d.ts","../../../node_modules/@metamask/utils/dist/types/opaque.d.ts","../../../node_modules/@metamask/utils/dist/types/promise.d.ts","../../../node_modules/@metamask/utils/dist/types/time.d.ts","../../../node_modules/@metamask/utils/dist/types/transaction-types.d.ts","../../../node_modules/@metamask/utils/dist/types/versions.d.ts","../../../node_modules/@metamask/utils/dist/types/index.d.ts","../../../node_modules/immer/dist/utils/env.d.ts","../../../node_modules/immer/dist/utils/errors.d.ts","../../../node_modules/immer/dist/types/types-external.d.ts","../../../node_modules/immer/dist/types/types-internal.d.ts","../../../node_modules/immer/dist/utils/common.d.ts","../../../node_modules/immer/dist/utils/plugins.d.ts","../../../node_modules/immer/dist/core/scope.d.ts","../../../node_modules/immer/dist/core/finalize.d.ts","../../../node_modules/immer/dist/core/proxy.d.ts","../../../node_modules/immer/dist/core/immerclass.d.ts","../../../node_modules/immer/dist/core/current.d.ts","../../../node_modules/immer/dist/internal.d.ts","../../../node_modules/immer/dist/plugins/es5.d.ts","../../../node_modules/immer/dist/plugins/patches.d.ts","../../../node_modules/immer/dist/plugins/mapset.d.ts","../../../node_modules/immer/dist/plugins/all.d.ts","../../../node_modules/immer/dist/immer.d.ts","../../base-controller/dist/types/restrictedcontrollermessenger.d.ts","../../base-controller/dist/types/controllermessenger.d.ts","../../base-controller/dist/types/basecontrollerv2.d.ts","../../base-controller/dist/types/index.d.ts","../../controller-utils/dist/types/types.d.ts","../../controller-utils/dist/types/constants.d.ts","../../../node_modules/@metamask/eth-query/index.d.ts","../../../node_modules/@types/bn.js/index.d.ts","../../controller-utils/dist/types/util.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/abnf.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/utils.d.ts","../../../node_modules/@spruceid/siwe-parser/dist/parsers.d.ts","../../controller-utils/dist/types/siwe.d.ts","../../controller-utils/dist/types/index.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/utils.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/classes.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/errors.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/error-constants.d.ts","../../../node_modules/@metamask/rpc-errors/dist/types/index.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/types.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createeventemitterproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/createswappableproxy.d.ts","../../../node_modules/@metamask/swappable-obj-proxy/dist/index.d.ts","../../../node_modules/@types/uuid/index.d.ts","../src/constants.ts","../../../node_modules/@metamask/safe-event-emitter/dist/cjs/index.d.ts","../../json-rpc-engine/dist/types/jsonrpcengine.d.ts","../../json-rpc-engine/dist/types/createasyncmiddleware.d.ts","../../json-rpc-engine/dist/types/createscaffoldmiddleware.d.ts","../../json-rpc-engine/dist/types/getuniqueid.d.ts","../../json-rpc-engine/dist/types/idremapmiddleware.d.ts","../../json-rpc-engine/dist/types/mergemiddleware.d.ts","../../json-rpc-engine/dist/types/index.d.ts","../../eth-json-rpc-provider/dist/types/safe-event-emitter-provider.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-engine.d.ts","../../eth-json-rpc-provider/dist/types/provider-from-middleware.d.ts","../../eth-json-rpc-provider/dist/types/index.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/blocktracker.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/pollingblocktracker.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/subscribeblocktracker.d.ts","../../../node_modules/@metamask/eth-block-tracker/dist/index.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/types.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/create-infura-middleware.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/fetch-config-from-req.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/create-provider.d.ts","../../../node_modules/@metamask/eth-json-rpc-infura/dist/index.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/types.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-cache.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-ref-rewrite.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-ref.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/block-tracker-inspector.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/fetch.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/inflight-cache.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/providerasmiddleware.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/retryonempty.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/wallet.d.ts","../../../node_modules/@metamask/eth-json-rpc-middleware/dist/index.d.ts","../src/types.ts","../src/create-network-client.ts","../src/create-auto-managed-network-client.ts","../src/logger.ts","../src/networkcontroller.ts","../src/index.ts","../../../node_modules/@babel/types/lib/index.d.ts","../../../node_modules/@types/babel__generator/index.d.ts","../../../node_modules/@babel/parser/typings/babel-parser.d.ts","../../../node_modules/@types/babel__template/index.d.ts","../../../node_modules/@types/babel__traverse/index.d.ts","../../../node_modules/@types/babel__core/index.d.ts","../../../node_modules/@types/deep-freeze-strict/index.d.ts","../../../node_modules/@types/eslint/helpers.d.ts","../../../node_modules/@types/estree/index.d.ts","../../../node_modules/@types/json-schema/index.d.ts","../../../node_modules/@types/eslint/index.d.ts","../../../node_modules/@types/graceful-fs/index.d.ts","../../../node_modules/@types/istanbul-lib-coverage/index.d.ts","../../../node_modules/@types/istanbul-lib-report/index.d.ts","../../../node_modules/@types/istanbul-reports/index.d.ts","../../../node_modules/chalk/index.d.ts","../../../node_modules/jest-diff/build/cleanupsemantic.d.ts","../../../node_modules/pretty-format/build/types.d.ts","../../../node_modules/pretty-format/build/index.d.ts","../../../node_modules/jest-diff/build/types.d.ts","../../../node_modules/jest-diff/build/difflines.d.ts","../../../node_modules/jest-diff/build/printdiffs.d.ts","../../../node_modules/jest-diff/build/index.d.ts","../../../node_modules/jest-matcher-utils/build/index.d.ts","../../../node_modules/@types/jest/index.d.ts","../../../node_modules/@types/jest-when/index.d.ts","../../../node_modules/@types/json5/index.d.ts","../../../node_modules/@types/lodash/common/common.d.ts","../../../node_modules/@types/lodash/common/array.d.ts","../../../node_modules/@types/lodash/common/collection.d.ts","../../../node_modules/@types/lodash/common/date.d.ts","../../../node_modules/@types/lodash/common/function.d.ts","../../../node_modules/@types/lodash/common/lang.d.ts","../../../node_modules/@types/lodash/common/math.d.ts","../../../node_modules/@types/lodash/common/number.d.ts","../../../node_modules/@types/lodash/common/object.d.ts","../../../node_modules/@types/lodash/common/seq.d.ts","../../../node_modules/@types/lodash/common/string.d.ts","../../../node_modules/@types/lodash/common/util.d.ts","../../../node_modules/@types/lodash/index.d.ts","../../../node_modules/@types/minimatch/index.d.ts","../../../node_modules/@types/parse-json/index.d.ts","../../../node_modules/@types/pbkdf2/index.d.ts","../../../node_modules/@types/prettier/index.d.ts","../../../node_modules/@types/punycode/index.d.ts","../../../node_modules/@types/readable-stream/node_modules/safe-buffer/index.d.ts","../../../node_modules/@types/readable-stream/index.d.ts","../../../node_modules/@types/secp256k1/index.d.ts","../../../node_modules/@types/semver/classes/semver.d.ts","../../../node_modules/@types/semver/functions/parse.d.ts","../../../node_modules/@types/semver/functions/valid.d.ts","../../../node_modules/@types/semver/functions/clean.d.ts","../../../node_modules/@types/semver/functions/inc.d.ts","../../../node_modules/@types/semver/functions/diff.d.ts","../../../node_modules/@types/semver/functions/major.d.ts","../../../node_modules/@types/semver/functions/minor.d.ts","../../../node_modules/@types/semver/functions/patch.d.ts","../../../node_modules/@types/semver/functions/prerelease.d.ts","../../../node_modules/@types/semver/functions/compare.d.ts","../../../node_modules/@types/semver/functions/rcompare.d.ts","../../../node_modules/@types/semver/functions/compare-loose.d.ts","../../../node_modules/@types/semver/functions/compare-build.d.ts","../../../node_modules/@types/semver/functions/sort.d.ts","../../../node_modules/@types/semver/functions/rsort.d.ts","../../../node_modules/@types/semver/functions/gt.d.ts","../../../node_modules/@types/semver/functions/lt.d.ts","../../../node_modules/@types/semver/functions/eq.d.ts","../../../node_modules/@types/semver/functions/neq.d.ts","../../../node_modules/@types/semver/functions/gte.d.ts","../../../node_modules/@types/semver/functions/lte.d.ts","../../../node_modules/@types/semver/functions/cmp.d.ts","../../../node_modules/@types/semver/functions/coerce.d.ts","../../../node_modules/@types/semver/classes/comparator.d.ts","../../../node_modules/@types/semver/classes/range.d.ts","../../../node_modules/@types/semver/functions/satisfies.d.ts","../../../node_modules/@types/semver/ranges/max-satisfying.d.ts","../../../node_modules/@types/semver/ranges/min-satisfying.d.ts","../../../node_modules/@types/semver/ranges/to-comparators.d.ts","../../../node_modules/@types/semver/ranges/min-version.d.ts","../../../node_modules/@types/semver/ranges/valid.d.ts","../../../node_modules/@types/semver/ranges/outside.d.ts","../../../node_modules/@types/semver/ranges/gtr.d.ts","../../../node_modules/@types/semver/ranges/ltr.d.ts","../../../node_modules/@types/semver/ranges/intersects.d.ts","../../../node_modules/@types/semver/ranges/simplify.d.ts","../../../node_modules/@types/semver/ranges/subset.d.ts","../../../node_modules/@types/semver/internals/identifiers.d.ts","../../../node_modules/@types/semver/index.d.ts","../../../node_modules/@types/sinonjs__fake-timers/index.d.ts","../../../node_modules/@types/sinon/index.d.ts","../../../node_modules/@types/stack-utils/index.d.ts","../../../node_modules/@types/yargs-parser/index.d.ts","../../../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true},"70bbfaec021ac4a0c805374225b55d70887f987df8b8dd7711d79464bb7b4385","869089d60b67219f63e6aca810284c89bae1b384b5cbc7ce64e53d82ad223ed5",{"version":"18338b6a4b920ec7d49b4ffafcbf0fa8a86b4bfd432966efd722dab611157cf4","affectsGlobalScope":true},"62a0875a0397b35a2364f1d401c0ce17975dfa4d47bf6844de858ae04da349f9","ee7491d0318d1fafcba97d5b72b450eb52671570f7a4ecd9e8898d40eaae9472","e3e7d217d89b380c1f34395eadc9289542851b0f0a64007dfe1fb7cf7423d24e","fd79909e93b4d50fd0ed9f3d39ddf8ba0653290bac25c295aac49f6befbd081b","345a9cc2945406f53051cd0e9b51f82e1e53929848eab046fdda91ee8aa7da31","9debe2de883da37a914e5e784a7be54c201b8f1d783822ad6f443ff409a5ea21","dee5d5c5440cda1f3668f11809a5503c30db0476ad117dd450f7ba5a45300e8f","f5e396c1424c391078c866d6f84afe0b4d2f7f85a160b9c756cd63b5b1775d93","5caa6f4fff16066d377d4e254f6c34c16540da3809cd66cd626a303bc33c419f","730d055528bdf12c8524870bb33d237991be9084c57634e56e5d8075f6605e02","75b22c74010ba649de1a1676a4c4b8b5bb4294fecd05089e2094429b16d7840c","5615ccf831db2ffc82145243081ebdb60ea8e1005ee8f975d1c0c1401a9c894e","38682ed3630bb6ecdace80d5a9adc811fc20a419f1940446e306c3a020d083b9","cc182e6e4f691cd6f7bf7cb491247a4c7818f9f1cb2db1d45c65ff906e3f741b","a50599c08934a62f11657bdbe0dc929ab66da1b1f09974408fd9a33ec1bb8060","5a20e7d6c630b91be15e9b837853173829d00273197481dc8d3e94df61105a71","8d478048d71cc16f806d4b71b252ecb67c7444ccf4f4b09b29a312712184f859","e0eda929c6b9b628cdeb0e54cd3582cb97e64f28aab34612fc1431c545899584","9df4662ca3dbc2522bc115833ee04faa1afbb4e249a85ef4a0a09c621346bd08","b25d9065cf1c1f537a140bbc508e953ed2262f77134574c432d206ff36f4bdbf","1b103313097041aa9cd705a682c652f08613cb5cf8663321061c0902f845e81c","68ccec8662818911d8a12b8ed028bc5729fb4f1d34793c4701265ba60bc73cf4","5f85b8b79dc4d36af672c035b2beb71545de63a5d60bccbeee64c260941672ab","b3d48529ae61dc27d0bfbfa2cb3e0dff8189644bd155bdf5df1e8e14669f7043","40fe4b689225816b31fe5794c0fbf3534568819709e40295ead998a2bc1ab237","f65b5e33b9ad545a1eebbd6afe857314725ad42aaf069913e33f928ab3e4990a","fb6f2a87beb7fb1f4c2b762d0c76a9459fc91f557231569b0ee21399e22aa13d","31c858dc85996fac4b7fa944e1016d5c72f514930a72357ab5001097bf6511c7","3de30a871b3340be8b679c52aa12f90dd1c8c60874517be58968fdbcc4d79445","6fd985bd31eaf77542625306fb0404d32bff978990f0a06428e5f0b9a3b58109","5b3cd03ae354ea96eff1f74d7c410fe4852e6382227e8b0ecf87ab5e3a5bbcd4","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419",{"version":"056097110efd16869ec118cedb44ecbac9a019576eee808d61304ca6d5cb2cbe","affectsGlobalScope":true},"f51b4042a3ac86f1f707500a9768f88d0b0c1fc3f3e45a73333283dea720cdc6",{"version":"6fb8358e10ed92a7f515b7d79da3904c955a3ffd4e14aa9df6f0ea113041f1cf","affectsGlobalScope":true},"45c831238c6dac21c72da5f335747736a56a3847192bf03c84b958a7e9ec93e2","661a11d16ad2e3543a77c53bcd4017ee9a450f47ab7def3ab493a86eae4d550c",{"version":"8cdc646cec7819581ef343b83855b1bfe4fe674f2c84f4fb8dc90d82fb56bd3a","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","9dd56225cc2d8cb8fe5ceb0043ff386987637e12fecc6078896058a99deae284","2375ed4b439215aa3b6d0c6fd175c78a4384b30cb43cbadaecbf0a18954c98cb","7693b90b3075deaccafd5efb467bf9f2b747a3075be888652ef73e64396d8628","41231da15bb5e3e806a8395bd15c7befd2ec90f9f4e3c9d0ae1356bccb76dbb0","fccfef201d057cb407fa515311bd608549bab6c7b8adcf8f2df31f5d3b796478",{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true},"5f20d20b7607174caf1a6da9141aeb9f2142159ae2410ca30c7a0fccd1d19c99",{"version":"464762c6213566d072f1ced5e8e9a954785ec5e53883b7397198abb5ef5b8f71","affectsGlobalScope":true},"6387920dc3e18927335b086deec75bf8e50f879a5e273d32ee7bb7a55ba50572","9bba37424094688c4663c177a1379b229f919b8912889a472f32fdc5f08ddb4d","29a4be13b3a30d3e66667b75c58ec61fb2df8fa0422534fdee3cfb30c5dbf450","83366d901beda79d6eb37aaaf6ca248dcd88946302b2a7d975590783be51e88e","bf268a0aea37ad4ae3b7a9b58559190b6fc01ea16a31e35cd05817a0a60f895a","43ec77c369473e92e2ecebf0554a0fdaa9c256644a6070f28228dfcceec77351",{"version":"d7dad6db394a3d9f7b49755e4b610fbf8ed6eb0c9810ae5f1a119f6b5d76de45","affectsGlobalScope":true},"95ed02bacb4502c985b69742ec82a4576d4ff4a6620ecc91593f611d502ae546","bf755525c4e6f85a970b98c4755d98e8aa1b6dbd83a5d8fcc57d3d497351b936","dd67d2b5e4e8a182a38de8e69fb736945eaa4588e0909c14e01a14bd3cc1fd1e",{"version":"28084e15b63e6211769db2fe646d8bc5c4c6776321e0deffe2d12eefd52cb6b9","affectsGlobalScope":true},{"version":"aed37dabf86c99d6c8508700576ecede86688397bc12523541858705a0c737c2","affectsGlobalScope":true},"cc6ef5733d4ea6d2e06310a32dffd2c16418b467c5033d49cecc4f3a25de7497","94768454c3348b6ebe48e45fbad8c92e2bb7af4a35243edbe2b90823d0bd7f9a","0be79b3ff0f16b6c2f9bc8c4cc7097ea417d8d67f8267f7e1eec8e32b548c2ff","1c61ffa3a71b77363b30d19832c269ef62fba787f5610cac7254728d3b69ab2e","84da3c28344e621fd1d591f2c09e9595292d2b70018da28a553268ac122597d4","269929a24b2816343a178008ac9ae9248304d92a8ba8e233055e0ed6dbe6ef71","6e191fea1db6e9e4fa828259cf489e820ec9170effff57fb081a2f3295db4722","aed943465fbce1efe49ee16b5ea409050f15cd8eaf116f6fadb64ef0772e7d95","70d08483a67bf7050dbedace398ef3fee9f436fcd60517c97c4c1e22e3c6f3e8","c40fdf7b2e18df49ce0568e37f0292c12807a0748be79e272745e7216bed2606",{"version":"e933de8143e1d12dd51d89b398760fd5a9081896be366dad88a922d0b29f3c69","affectsGlobalScope":true},"4e228e78c1e9b0a75c70588d59288f63a6258e8b1fe4a67b0c53fe03461421d9","b38d55d08708c2410a3039687db70b4a5bfa69fc4845617c313b5a10d9c5c637","205d50c24359ead003dc537b9b65d2a64208dfdffe368f403cf9e0357831db9e","1265fddcd0c68be9d2a3b29805d0280484c961264dd95e0b675f7bd91f777e78",{"version":"a05e2d784c9be7051c4ac87a407c66d2106e23490c18c038bbd0712bde7602fd","affectsGlobalScope":true},{"version":"df90b9d0e9980762da8daf8adf6ffa0c853e76bfd269c377be0d07a9ad87acd2","affectsGlobalScope":true},"cf434b5c04792f62d6f4bdd5e2c8673f36e638e910333c172614d5def9b17f98","1d65d4798df9c2df008884035c41d3e67731f29db5ecb64cd7378797c7c53a2f","0faee6b555890a1cb106e2adc5d3ffd89545b1da894d474e9d436596d654998f","c6c01ea1c42508edf11a36d13b70f6e35774f74355ba5d358354d4a77cc67ea1","867f95abf1df444aab146b19847391fc2f922a55f6a970a27ed8226766cee29f",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"b0297b09e607bec9698cac7cf55463d6731406efb1161ee4d448293b47397c84","175323e2a79a6076e0bada8a390d535a3ea817158bf1b1f46e31efca9028a0a2","7a10053aadc19335532a4d02756db4865974fd69bea5439ddcc5bfdf062d9476","4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","aed9e712a9b168345362e8f3a949f16c99ca1e05d21328f05735dfdbb24414ef","b04fe6922ed3db93afdbd49cdda8576aa75f744592fceea96fb0d5f32158c4f5","ed8d6c8de90fc2a4faaebc28e91f2469928738efd5208fb75ade0fa607e892b7","d7c52b198d680fe65b1a8d1b001f0173ffa2536ca2e7082431d726ce1f6714cd","c07f251e1c4e415a838e5498380b55cfea94f3513229de292d2aa85ae52fc3e9","0ed401424892d6bf294a5374efe512d6951b54a71e5dd0290c55b6d0d915f6f7","b945be6da6a3616ef3a250bfe223362b1c7c6872e775b0c4d82a1bf7a28ff902","beea49237dd7c7110fabf3c7509919c9cb9da841d847c53cac162dc3479e2f87","0f45f8a529c450d8f394106cc622bff79e44a1716e1ac9c3cc68b43f7ecf65ee","c624ce90b04c27ce4f318ba6330d39bde3d4e306f0f497ce78d4bda5ab8e22ca","9b8253aa5cb2c82d505f72afdbf96e83b15cc6b9a6f4fadbbbab46210d5f1977","86a8f52e4b1ac49155e889376bcfa8528a634c90c27fec65aa0e949f77b740c5","aab5dd41c1e2316cc0b42a7dd15684f8582d5a1d16c0516276a2a8a7d0fecd9c","59948226626ee210045296ba1fc6cb0fe748d1ff613204e08e7157ab6862dee7","ec3e54d8b713c170fdc8110a7e4a6a97513a7ab6b05ac9e1100cb064d2bb7349","43beb30ecb39a603fde4376554887310b0699f25f7f39c5c91e3147b51bb3a26","666b77d7f06f49da114b090a399abbfa66d5b6c01a3fd9dc4f063a52ace28507","31997714a93fbc570f52d47d6a8ebfb021a34a68ea9ba58bbb69cdec9565657e","6032e4262822160128e644de3fc4410bcd7517c2f137525fd2623d2bb23cb0d3","8bd5c9b1016629c144fd228983395b9dbf0676a576716bc3d316cab612c33cd5","2ed90bd3925b23aed8f859ffd0e885250be0424ca2b57e9866dabef152e1d6b7","93f6bd17d92dab9db7897e1430a5aeaa03bcf51623156213d8397710367a76ce","3f62b770a42e8c47c7008726f95aa383e69d97e85e680d237b99fcb0ee601dd8","5b84cfe78028c35c3bb89c042f18bf08d09da11e82d275c378ae4d07d8477e6c","980d21b0081cbf81774083b1e3a46f4bbdcd2b68858df0f66d7fad9c82bc34bc","68cc8d6fcc2f270d7108f02f3ebc59480a54615be3e09a47e14527f349e9d53e","3eb11dbf3489064a47a2e1cf9d261b1f100ef0b3b50ffca6c44dd99d6dd81ac1","b17f3bb7d8333479c7e45e5f3d876761b9bca58f97594eca3f6a944fd825e632","3c1f1236cce6d6e0c4e2c1b4371e6f72d7c14842ecd76a98ed0748ee5730c8f3","6d7f58d5ea72d7834946fd7104a734dc7d40661be8b2e1eaced1ddce3268ebaf","4c26222991e6c97d5a8f541d4f2c67585eda9e8b33cf9f52931b098045236e88","277983d414aa99d78655186c3ee1e1c38c302e336aff1d77b47fcdc39d8273fe","47383b45796d525a4039cd22d2840ac55a1ff03a43d027f7f867ba7314a9cf53","6548773b3abbc18de29176c2141f766d4e437e40596ee480447abf83575445ad","6ddd27af0436ce59dd4c1896e2bfdb2bdb2529847d078b83ce67a144dff05491","816264799aef3fd5a09a3b6c25217d5ec26a9dfc7465eac7d6073bcdc7d88f3f","4df0891b133884cd9ed752d31c7d0ec0a09234e9ed5394abffd3c660761598db","b603b62d3dcd31ef757dc7339b4fa8acdbca318b0fb9ac485f9a1351955615f9","e642bd47b75ad6b53cbf0dfd7ddfa0f120bd10193f0c58ec37d87b59bf604aca","be90b24d2ee6f875ce3aaa482e7c41a54278856b03d04212681c4032df62baf9","78f5ff400b3cb37e7b90eef1ff311253ed31c8cb66505e9828fad099bffde021","372c47090e1131305d163469a895ff2938f33fa73aad988df31cd31743f9efb6","71c67dc6987bdbd5599353f90009ff825dd7db0450ef9a0aee5bb0c574d18512","6f12403b5eca6ae7ca8e3efe3eeb9c683b06ce3e3844ccfd04098d83cd7e4957","282c535df88175d64d9df4550d2fd1176fd940c1c6822f1e7584003237f179d3","c3a4752cf103e4c6034d5bd449c8f9d5e7b352d22a5f8f9a41a8efb11646f9c2","11a9e38611ac3c77c74240c58b6bd64a0032128b29354e999650f1de1e034b1c","4ed103ca6fff9cb244f7c4b86d1eb28ce8069c32db720784329946731badb5bb","d738f282842970e058672663311c6875482ee36607c88b98ffb6604fba99cb2a","ec859cd8226aa623e41bbb47c249a55ee16dc1b8647359585244d57d3a5ed0c7","8891c6e959d253a66434ff5dc9ae46058fb3493e84b4ca39f710ef2d350656b1","c4463cf02535444dcbc3e67ecd29f1972490f74e49957d6fd4282a1013796ba6","0cb0a957ff02de0b25fd0f3f37130ca7f22d1e0dea256569c714c1f73c6791f8","2f5075dc512d51786b1ba3b1696565641dfaae3ac854f5f13d61fa12ef81a47e","ca3353cc82b1981f0d25d71d7432d583a6ef882ccdea82d65fbe49af37be51cb","50679a8e27aacf72f8c40bcab15d7ef5e83494089b4726b83eec4554344d5cdc","45351e0d51780b6f4088277a4457b9879506ee2720a887de232df0f1efcb33d8","5d697a4b315cc5bb3042ae869abffd10c3b0d7b182cda0e4c45d8819937e5796","7528af2ed74464d2c0ae92025f14c1f11691deb07812bc66afbe6f87c3669f1f","6ee58aa536dabb19b09bc036f1abe83feb51e13d63b23d30b2d0631a2de99b8f","8aceb205dcc6f814ad99635baf1e40b6e01d06d3fe27b72fd766c6d0b8c0c600","299567f84bfedd1468dca2755a829cb19e607a6811673788807dc8921e211bc9","795d9fb85aad92221504db74dd179b506bd189bba0c104426f7e7bb8a66ffee5","1311bc194e0a69fe61031e852c1c0b439e2a2a3d1d5e2d8ff795499b9f283459","4b7ce19369d7e7fae76720c2c6c7f671bf3fa0f7093edb864f1ac358ca7c456c","c972ef44deca1fa8fab465915ffa00f82e126aacf3dfc8979c03b1b066ce5bb6","30285a1011c6d6b52f3ba3abb0a984be8148c05cdefb8eb6eb562335a3991f35","9f9e5bae412fa5909fae636d6733aee27a108cc2ed5b13980611016336774d3c","662fe197bba64bd3f17ee118058cd2d0d2dbe33d7c0c865fd6365d90bfc44e1e","030519c351f800551cac2658038804969ca4584d2c0175a710602ac234ca1340","0278a6939ca83cd040b08ff8c5fc7838b6693ddc52f22526bf158e6b10e0246c","c2d6206e5ba4fd3063b01218c2b3b997afc1cfbeb49fcee991fa8595842ce53d","8e7adb22c0adecf7464861fc58ae3fc617b41ffbd70c97aa8493dc0966a82273","755f3cd1d9c1b564cff090e3b0e29200ae55690a91b87cb9e7a64c2dbeb314d3","d6bb7e0a6877b7856c183bff13d09dd9ae599ea43c6f6b33d3d5f72a830ed460","f1b51ae93c762d7c43f559933cd4842dd870367e8d92e90704ffa685dd5b29a3","fab58e600970e66547644a44bc9918e3223aa2cbd9e8763cec004b2cfb48827e",{"version":"12accaad8d0630e27afcee6db467be3587027b92d8a78a5ea40d98ce879db790","signature":"e3539189d512442af177f3c8c49e9cc56834ae05f3ed125491baae619d4c526f"},"fcc8beef29f39f09b1d9c9f99c42f9fed605ab1c28d2a630185f732b9ba53763","d6e6620a30d582182acc3f0a992a0c311adc589f111096aea11ab83fc09a5ccc","6213b8f686f56beab22b59a0f468590fd3a4c5fa931236a017efeca91d7c9584","c451cec9a588b1f105a5ea2c6063d4fca112b9d70105cacdadda0e1ef67e9379","cb047832dc68f5a2c41c62c5e95ddcacbae3a8b034d40cd15319a8cb7f25104a","980336ccdfc3c08f3c3b201aa6662e6016e20f15847f8465b68f3e8e67b4665c","5a3493939995f46ff3d9073cd534fb8961c3bf4e08c71db27066ff03d906dea8","bb5a2ac327605ebebf831c469b05bd34a33a6a46ee8c1edd9f3310aad32cf6a1","bf5d041f2440b4a9391e2b5eb3b8d94cbf1e3b8ff4703b6539d4e65e758c8f37","8516469eb90e723b0eb03df1be098f7e6a4709f6f48fd4532868d20a0a934f6e","d60e9ab369a72d234aac49adbe2900d8ef1408a6ea4db552cf2a48c9d8d6a1bc","0ebb4698803f01e2e7df6acce572fff068f4a20c47221721dafd70a27e372831","03460a54d0e0481d1e11097f66ad43f054bc95efdafe5f81bbc7a82be181af75","ded24ddc7157689a5aa14bd651272ab8cd6e7812da2196a65d8c5e63131cfb23","2cea9689efa8591732096235abe7f084fc29c92badd5b0897a5e876b77e71887","4ed4e504126014fee13aaef5e3fc140f2ff7031ff3a8b5386717905820ea2d09","9f99927996dec2b673c7dcf314ad3fc2d96b3097016d99e28ca25314e19df2c1","accf5b0acb7a341cf9699960157059c95c40842b7b3312ab19053c610cbde977","8d27ef959532cab3f4313ba2f1e66d9c1c159539faa653c3cef848a457939726","a4fcdbc70e4d139fb80f8c99789aea5ad42e18c8ffd034bfe44ab63644471cc7","81859dcda72b45168a93fefe8bf6d62a4eb4032694def53a3c2ccb7f07326d8f","827abdfc5e85e0d5b1959167928bd2f9ca5a684a2b64e054d291571f7e632d4c","84605b003c9b842f5d4d5d068f7d92f382d3b5c1565375eef3136ed5f03d7ee4","1679f0a7b02d9f185ac1ea0ef4c9197d4c6d299de3e433ce4b8679a58e34c9e5","66ee590a1a296344449ac904bf56c03b3075c4f3c2479db655cc1ce9407eb58b","d067e051d72e0d79389c52cb28bb23d11b97c2bd7dfaba12083ea544d924ab7a","1d44112639c6691d697eaa88c1bf738a4438063f1ecbfbc1208b6d3040d39eb7","f957b018293727b85e13d0a0c8f15556e97cf6fa6cd6b3c5c47a18d9173155b1","0763c0248d05cfd5fea25f97aa10d51084a36a8893985e0537c48e4ab1376326","b4608db340ab2c69bc4d426d06c3bf4f8a04f4e2c40fa30905581336bf3f242c","a55ab6e38e964b1000ab2fbab89e41996375c83c9d1c79d2f243c5df901289b9","4f07dc7f29a2f794c62996d32f148e973ba146ce59a16d4ad3e01c5e3018891f",{"version":"9eb6c0f28550944f99f6d1fc1985f29ac121ba0b57a399db12a59f53e0d327d8","signature":"689e53365e2e5af801be2af3fad66936b989c4fffa9dfd94f91885f11afa05d2"},{"version":"86ee1535397ec5bc983ffe847ed6ea66c704084745fafc0b81ef2e2b9ea0a6c4","signature":"2901396d9707d63ee1d6dcd60cfe70fe64bdd78b13696cddefd8872393d1b96a"},{"version":"3d42a9b4218d715d9909898927a2f6ab7f1738178e7eb81ddd3d7f7b1392e8e9","signature":"e10b1f5cd5b943bdffdfa8165d796837e13b58718a1faee5485652a0fbedde58"},{"version":"ddfd4bd8fb8f640b88a39262cde2d22c73b0149b3cbe1574bc2da48a176f612c","signature":"7bd3844e77367d48f1f9ea69d39b92ff9d086dc499da91fe8df78406b2e3f1fc"},{"version":"0d4457a9e09b1b99ae3ebdeeca3170c29579d1c54e68915bd05832de43157551","signature":"f68ac7de59127ba50080e323e1e16606b761939cc3b82079f2db9170592fa997"},"d68cb13e3cde9d7fc02ecc3f258de77f5e7da54b6f5513ae075f2fd8e1f0d5d9","4489c6a9fde8934733aa7df6f7911461ee6e9e4ad092736bd416f6b2cc20b2c6","2c8e55457aaf4902941dfdba4061935922e8ee6e120539c9801cd7b400fae050","8041cfce439ff29d339742389de04c136e3029d6b1817f07b2d7fcbfb7534990","670a76db379b27c8ff42f1ba927828a22862e2ab0b0908e38b671f0e912cc5ed","9d38964b57191567a14b396422c87488cecd48f405c642daa734159875ee81d9","069bebfee29864e3955378107e243508b163e77ab10de6a5ee03ae06939f0bb9","8c95f96ccd4be0674944077aec1e4f2cccd515ca06d4327562dd017250e7d3fc",{"version":"64d4b35c5456adf258d2cf56c341e203a073253f229ef3208fc0d5020253b241","affectsGlobalScope":true},"ee7d8894904b465b072be0d2e4b45cf6b887cdba16a467645c4e200982ece7ea","f3d8c757e148ad968f0d98697987db363070abada5f503da3c06aefd9d4248c1","bc3cba7b0af2d52e7425299aee518db479d44004eff6fbbd206d1ee7e5ec3fb5","afe73051ff6a03a9565cbd8ebb0e956ee3df5e913ad5c1ded64218aabfa3dcb5","035a5df183489c2e22f3cf59fc1ed2b043d27f357eecc0eb8d8e840059d44245","a4809f4d92317535e6b22b01019437030077a76fec1d93b9881c9ed4738fcc54","5f53fa0bd22096d2a78533f94e02c899143b8f0f9891a46965294ee8b91a9434","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","d8aab31ba8e618cc3eea10b0945de81cb93b7e8150a013a482332263b9305322","462bccdf75fcafc1ae8c30400c9425e1a4681db5d605d1a0edb4f990a54d8094","5923d8facbac6ecf7c84739a5c701a57af94a6f6648d6229a6c768cf28f0f8cb","7adecb2c3238794c378d336a8182d4c3dd2c4fa6fa1785e2797a3db550edea62","dc12dc0e5aa06f4e1a7692149b78f89116af823b9e1f1e4eae140cd3e0e674e6","1bfc6565b90c8771615cd8cfcf9b36efc0275e5e83ac7d9181307e96eb495161","8a8a96898906f065f296665e411f51010b51372fa260d5373bf9f64356703190","7f82ef88bdb67d9a850dd1c7cd2d690f33e0f0acd208e3c9eba086f3670d4f73",{"version":"ccfd8774cd9b929f63ff7dcf657977eb0652e3547f1fcac1b3a1dc5db22d4d58","affectsGlobalScope":true},"d92dc90fecd2552db74d8dc3c6fb4db9145b2aa0efe2c127236ba035969068d4","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","b8442e9db28157344d1bc5d8a5a256f1692de213f0c0ddeb84359834015a008c","458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","da2b6356b84a40111aaecb18304ea4e4fcb43d70efb1c13ca7d7a906445ee0d3","187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","6f294731b495c65ecf46a5694f0082954b961cf05463bea823f8014098eaffa0","0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","68a0d0c508e1b6d8d23a519a8a0a3303dc5baa4849ca049f21e5bad41945e3fc","3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","b03afe4bec768ae333582915146f48b161e567a81b5ebc31c4d78af089770ac9","df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9","4f6a12044ee6f458db11964153830abbc499e73d065c51c329ec97407f4b13dd","8841e2aa774b89bd23302dede20663306dc1b9902431ac64b24be8b8d0e3f649","916be7d770b0ae0406be9486ac12eb9825f21514961dd050594c4b250617d5a8","254d9fb8c872d73d34594be8a200fd7311dbfa10a4116bfc465fba408052f2b3","d88a5e779faf033be3d52142a04fbe1cb96009868e3bbdd296b2bc6c59e06c0e","2ccea88888048bbfcacbc9531a5596ea48a3e7dcd0a25f531a81bb717903ba4f","5e379df3d61561c2ed7789b5995b9ba2143bbba21a905e2381e16efe7d1fa424","f07a137bbe2de7a122c37bfea00e761975fb264c49f18003d398d71b3fb35a5f","d8f7109e14f20eb735225a62fd3f8366da1a8349e90331cdad57f4b04caf6c5a","cf3d384d082b933d987c4e2fe7bfb8710adfd9dc8155190056ed6695a25a559e","9871b7ee672bc16c78833bdab3052615834b08375cb144e4d2cba74473f4a589","c863198dae89420f3c552b5a03da6ed6d0acfa3807a64772b895db624b0de707","8b03a5e327d7db67112ebbc93b4f744133eda2c1743dbb0a990c61a8007823ef","86c73f2ee1752bac8eeeece234fd05dfcf0637a4fbd8032e4f5f43102faa8eec","42fad1f540271e35ca37cecda12c4ce2eef27f0f5cf0f8dd761d723c744d3159","ff3743a5de32bee10906aff63d1de726f6a7fd6ee2da4b8229054dfa69de2c34","83acd370f7f84f203e71ebba33ba61b7f1291ca027d7f9a662c6307d74e4ac22","1445cec898f90bdd18b2949b9590b3c012f5b7e1804e6e329fb0fe053946d5ec","0e5318ec2275d8da858b541920d9306650ae6ac8012f0e872fe66eb50321a669","cf530297c3fb3a92ec9591dd4fa229d58b5981e45fe6702a0bd2bea53a5e59be","c1f6f7d08d42148ddfe164d36d7aba91f467dbcb3caa715966ff95f55048b3a4","f4e9bf9103191ef3b3612d3ec0044ca4044ca5be27711fe648ada06fad4bcc85","0c1ee27b8f6a00097c2d6d91a21ee4d096ab52c1e28350f6362542b55380059a","7677d5b0db9e020d3017720f853ba18f415219fb3a9597343b1b1012cfd699f7","bc1c6bc119c1784b1a2be6d9c47addec0d83ef0d52c8fbe1f14a51b4dfffc675","52cf2ce99c2a23de70225e252e9822a22b4e0adb82643ab0b710858810e00bf1","770625067bb27a20b9826255a8d47b6b5b0a2d3dfcbd21f89904c731f671ba77","d1ed6765f4d7906a05968fb5cd6d1db8afa14dbe512a4884e8ea5c0f5e142c80","799c0f1b07c092626cf1efd71d459997635911bb5f7fc1196efe449bba87e965","2a184e4462b9914a30b1b5c41cf80c6d3428f17b20d3afb711fff3f0644001fd","9eabde32a3aa5d80de34af2c2206cdc3ee094c6504a8d0c2d6d20c7c179503cc","397c8051b6cfcb48aa22656f0faca2553c5f56187262135162ee79d2b2f6c966","a8ead142e0c87dcd5dc130eba1f8eeed506b08952d905c47621dc2f583b1bff9","a02f10ea5f73130efca046429254a4e3c06b5475baecc8f7b99a0014731be8b3","c2576a4083232b0e2d9bd06875dd43d371dee2e090325a9eac0133fd5650c1cb","4c9a0564bb317349de6a24eb4efea8bb79898fa72ad63a1809165f5bd42970dd","f40ac11d8859092d20f953aae14ba967282c3bb056431a37fced1866ec7a2681","cc11e9e79d4746cc59e0e17473a59d6f104692fd0eeea1bdb2e206eabed83b03","b444a410d34fb5e98aa5ee2b381362044f4884652e8bc8a11c8fe14bbd85518e","c35808c1f5e16d2c571aa65067e3cb95afeff843b259ecfa2fc107a9519b5392","14d5dc055143e941c8743c6a21fa459f961cbc3deedf1bfe47b11587ca4b3ef5","a3ad4e1fc542751005267d50a6298e6765928c0c3a8dce1572f2ba6ca518661c","f237e7c97a3a89f4591afd49ecb3bd8d14f51a1c4adc8fcae3430febedff5eb6","3ffdfbec93b7aed71082af62b8c3e0cc71261cc68d796665faa1e91604fbae8f","662201f943ed45b1ad600d03a90dffe20841e725203ced8b708c91fcd7f9379a","c9ef74c64ed051ea5b958621e7fb853fe3b56e8787c1587aefc6ea988b3c7e79","2462ccfac5f3375794b861abaa81da380f1bbd9401de59ffa43119a0b644253d","34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","7d8ddf0f021c53099e34ee831a06c394d50371816caa98684812f089b4c6b3d4","7d2a0ba1297be385a89b5515b88cd31b4a1eeef5236f710166dc1b36b1741e1b","9d92b037978bb9525bc4b673ebddd443277542e010c0aef019c03a170ccdaa73","ab82804a14454734010dcdcd43f564ff7b0389bee4c5692eec76ff5b30d4cf66","bae8d023ef6b23df7da26f51cea44321f95817c190342a36882e93b80d07a960","ae271d475b632ce7b03fea6d9cf6da72439e57a109672671cbc79f54e1386938"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"inlineSources":true,"module":1,"outDir":"./types","rootDir":"../src","sourceMap":true,"strict":true,"target":7},"fileIdsList":[[248],[92,128,129,130,145],[129,130,146,147],[128,129],[128,145,148,151],[128,148,151,152],[149,150,151,153,154],[128,151],[128,145,148,149,150,153],[128,136],[128],[92,128],[80,128],[132,133,134,135,136,137,138,139,140,141,142,143,144],[128,134,135],[128,134,136],[210],[222,223,224],[210,221,222],[167,217,226],[221,227],[167,226],[227,228,229],[167],[167,225,231],[167,217,225],[167,217,221,225],[167,217],[232,233,234,235,236,237,238,239,240],[167,231],[167,217,221],[167,217,231],[167,199],[199,200],[199,200,201,202],[204],[204,205,206],[64],[67],[64,67],[65,66,67,68,69,70,71,72,73,74,75,156,159,160,161,162,163,164,165,166],[58,64,65],[67,73,75,155],[158],[67,68],[64,162],[194,195],[248,249,250,251,252],[248,250],[157],[255,256,257],[93,128],[260],[261],[272],[266,271],[275,277,278,279,280,281,282,283,284,285,286,287],[275,276,278,279,280,281,282,283,284,285,286,287],[276,277,278,279,280,281,282,283,284,285,286,287],[275,276,277,279,280,281,282,283,284,285,286,287],[275,276,277,278,280,281,282,283,284,285,286,287],[275,276,277,278,279,281,282,283,284,285,286,287],[275,276,277,278,279,280,282,283,284,285,286,287],[275,276,277,278,279,280,281,283,284,285,286,287],[275,276,277,278,279,280,281,282,284,285,286,287],[275,276,277,278,279,280,281,282,283,285,286,287],[275,276,277,278,279,280,281,282,283,284,286,287],[275,276,277,278,279,280,281,282,283,284,285,287],[275,276,277,278,279,280,281,282,283,284,285,286],[76],[79],[80,85,112],[81,92,93,100,109,120],[81,82,92,100],[83,121],[84,85,93,101],[85,109,117],[86,88,92,100],[87],[88,89],[92],[91,92],[79,92],[92,93,94,109,120],[92,93,94,109],[92,95,100,109,120],[92,93,95,96,100,109,117,120],[95,97,109,117,120],[76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127],[92,98],[99,120,125],[88,92,100,109],[101],[102],[79,103],[104,119,125],[105],[106],[92,107],[107,108,121,123],[80,92,109,110,111],[80,109,111],[109,110],[112],[113],[92,115,116],[115,116],[85,100,109,117],[118],[100,119],[80,95,106,120],[85,121],[109,122],[123],[124],[80,85,92,94,103,109,120,123,125],[109,126],[128,293],[296,335],[296,320,335],[335],[296],[296,321,335],[296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334],[321,335],[336],[339],[179],[179,180,181,182,183],[168,169,170,171,172,173,174,175,176,177,178],[264,267],[264,267,268,269],[266],[263,270],[265],[57,59,60,61,62,63],[57,58],[59],[58,59],[57,59],[167,184,185,186],[185],[56,185,186,187],[186],[189],[189,190,193,197],[196],[167,191,192],[218,219,220],[217,218],[167,217,218],[167,210,217],[167,211],[211,212,213,214,215,216],[167,210],[242,243],[167,198,217,221,225,230,241,242],[209,242,243,246],[76,167,188,191,198,203,207,208,209,242,244,245],[167,198,221,225],[242],[158,167],[167,188,191,198,207,209,242,244]],"referencedMap":[[250,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[222,17],[225,18],[223,19],[224,19],[227,20],[229,21],[228,22],[230,23],[226,24],[232,25],[233,26],[234,27],[235,26],[236,28],[241,29],[237,30],[238,31],[239,27],[231,28],[240,32],[200,33],[201,34],[203,35],[199,24],[210,12],[205,36],[206,36],[207,37],[65,38],[66,38],[68,39],[69,38],[70,38],[71,40],[67,38],[167,41],[75,42],[156,43],[159,44],[165,45],[166,46],[196,47],[253,48],[249,1],[251,49],[252,1],[192,11],[158,50],[258,51],[259,52],[261,53],[262,54],[273,55],[272,56],[276,57],[277,58],[275,59],[278,60],[279,61],[280,62],[281,63],[282,64],[283,65],[284,66],[285,67],[286,68],[287,69],[76,70],[77,70],[79,71],[80,72],[81,73],[82,74],[83,75],[84,76],[85,77],[86,78],[87,79],[88,80],[89,80],[90,81],[91,82],[92,83],[93,84],[94,85],[95,86],[96,87],[97,88],[128,89],[98,90],[99,91],[100,92],[101,93],[102,94],[103,95],[104,96],[105,97],[106,98],[107,99],[108,100],[109,101],[111,102],[110,103],[112,104],[113,105],[115,106],[116,107],[117,108],[118,109],[119,110],[120,111],[121,112],[122,113],[123,114],[124,115],[125,116],[126,117],[290,11],[294,118],[295,11],[320,119],[321,120],[296,121],[299,121],[318,119],[319,119],[309,119],[308,122],[306,119],[301,119],[314,119],[312,119],[316,119],[300,119],[313,119],[317,119],[302,119],[303,119],[315,119],[297,119],[304,119],[305,119],[307,119],[311,119],[322,123],[310,119],[298,119],[335,124],[329,123],[331,125],[330,123],[323,123],[324,123],[326,123],[328,123],[332,125],[333,125],[325,125],[327,125],[337,126],[340,127],[175,128],[177,128],[176,128],[174,128],[184,129],[179,130],[170,128],[171,128],[172,128],[173,128],[268,131],[270,132],[269,131],[267,133],[271,134],[266,135],[64,136],[59,137],[60,138],[61,138],[62,139],[63,139],[58,140],[187,141],[186,142],[188,143],[185,144],[190,145],[198,146],[197,147],[193,148],[221,149],[219,150],[220,151],[218,152],[212,153],[213,153],[215,153],[217,154],[211,155],[216,153],[244,156],[243,157],[247,158],[245,24],[246,159],[242,160]],"exportedModulesMap":[[250,1],[146,2],[148,3],[130,4],[152,5],[153,6],[149,6],[155,7],[150,6],[154,8],[151,9],[137,10],[134,11],[141,12],[135,10],[132,13],[145,14],[139,11],[136,15],[138,16],[222,17],[225,18],[223,19],[224,19],[227,20],[229,21],[228,22],[230,23],[226,24],[232,25],[233,26],[234,27],[235,26],[236,28],[241,29],[237,30],[238,31],[239,27],[231,28],[240,32],[200,33],[201,34],[203,35],[199,24],[210,12],[205,36],[206,36],[207,37],[65,38],[66,38],[68,39],[69,38],[70,38],[71,40],[67,38],[167,41],[75,42],[156,43],[159,44],[165,45],[166,46],[196,47],[253,48],[249,1],[251,49],[252,1],[192,11],[158,50],[258,51],[259,52],[261,53],[262,54],[273,55],[272,56],[276,57],[277,58],[275,59],[278,60],[279,61],[280,62],[281,63],[282,64],[283,65],[284,66],[285,67],[286,68],[287,69],[76,70],[77,70],[79,71],[80,72],[81,73],[82,74],[83,75],[84,76],[85,77],[86,78],[87,79],[88,80],[89,80],[90,81],[91,82],[92,83],[93,84],[94,85],[95,86],[96,87],[97,88],[128,89],[98,90],[99,91],[100,92],[101,93],[102,94],[103,95],[104,96],[105,97],[106,98],[107,99],[108,100],[109,101],[111,102],[110,103],[112,104],[113,105],[115,106],[116,107],[117,108],[118,109],[119,110],[120,111],[121,112],[122,113],[123,114],[124,115],[125,116],[126,117],[290,11],[294,118],[295,11],[320,119],[321,120],[296,121],[299,121],[318,119],[319,119],[309,119],[308,122],[306,119],[301,119],[314,119],[312,119],[316,119],[300,119],[313,119],[317,119],[302,119],[303,119],[315,119],[297,119],[304,119],[305,119],[307,119],[311,119],[322,123],[310,119],[298,119],[335,124],[329,123],[331,125],[330,123],[323,123],[324,123],[326,123],[328,123],[332,125],[333,125],[325,125],[327,125],[337,126],[340,127],[175,128],[177,128],[176,128],[174,128],[184,129],[179,130],[170,128],[171,128],[172,128],[173,128],[268,131],[270,132],[269,131],[267,133],[271,134],[266,135],[64,136],[59,137],[60,138],[61,138],[62,139],[63,139],[58,140],[187,141],[186,142],[188,143],[185,144],[190,145],[198,146],[197,147],[193,148],[221,149],[219,150],[220,151],[218,152],[212,153],[213,153],[215,153],[217,154],[211,155],[216,153],[244,161],[243,161],[247,158],[245,162],[246,163],[242,160]],"semanticDiagnosticsPerFile":[250,248,146,129,148,130,147,152,153,149,155,150,154,151,137,134,141,135,132,140,145,142,143,144,139,136,133,138,222,225,223,224,227,229,228,230,226,232,233,234,235,236,241,237,238,239,231,240,191,200,202,201,203,199,210,205,206,207,204,65,66,68,69,70,71,72,73,74,67,167,75,156,159,160,161,162,163,164,165,166,194,196,195,253,249,251,252,192,158,254,255,258,256,259,260,261,262,273,272,257,274,276,277,275,278,279,280,281,282,283,284,285,286,287,288,157,76,77,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,78,127,95,96,97,128,98,99,100,101,102,103,104,105,106,107,108,109,111,110,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,289,290,291,292,294,293,295,320,321,296,299,318,319,309,308,306,301,314,312,316,300,313,317,302,303,315,297,304,305,307,311,322,310,298,335,334,329,331,330,323,324,326,328,332,333,325,327,337,336,338,208,339,340,131,263,178,175,177,176,174,184,179,183,180,182,181,170,171,172,168,169,173,264,268,270,269,267,271,266,265,57,64,59,60,61,62,63,58,8,10,9,2,11,12,13,14,15,16,17,18,3,4,22,19,20,21,23,24,25,5,26,27,28,29,6,33,30,31,32,34,7,35,40,41,36,37,38,39,1,42,56,187,186,188,185,190,198,197,189,193,221,219,220,218,212,213,214,215,217,211,216,209,244,243,247,245,246,242,47,48,49,50,51,52,43,53,54,55,44,45,46],"latestChangedDtsFile":"./types/index.d.ts"},"version":"4.9.5"}
+\ No newline at end of file
+diff --git a/dist/types/NetworkController.d.ts b/dist/types/NetworkController.d.ts
+index 216d1acbf39dd8c0b8d393f2f65fd9b370a2b9a6..34e756dd2f950b4c1eb095821ae039f0bf962d9e 100644
+--- a/dist/types/NetworkController.d.ts
++++ b/dist/types/NetworkController.d.ts
+@@ -372,7 +372,9 @@ export declare class NetworkController extends BaseController<typeof name, Netwo
+      * @param options.setActive - If true, switches to the network upon adding or updating it (default: false).
+      * @returns The ID for the added or updated network configuration.
+      */
+-    upsertNetworkConfiguration(networkConfiguration: NetworkConfiguration, { referrer, source, setActive, }: {
++    upsertNetworkConfiguration(networkConfiguration: NetworkConfiguration & {
++        id?: NetworkConfigurationId;
++    }, { referrer, source, setActive, }: {
+         referrer: string;
+         source: string;
+         setActive?: boolean;
+diff --git a/dist/types/NetworkController.d.ts.map b/dist/types/NetworkController.d.ts.map
+index 07d5aa4db918e193d38d65966322de2b4967c8d3..ba094f2735d31cc4fa4e48fe504f55d30da005ad 100644
+--- a/dist/types/NetworkController.d.ts.map
++++ b/dist/types/NetworkController.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"NetworkController.d.ts","sourceRoot":"","sources":["../../src/NetworkController.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
++{"version":3,"file":"NetworkController.d.ts","sourceRoot":"","sources":["../../src/NetworkController.ts"],"names":[],"mappings":"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"}
+\ No newline at end of file
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index a397129c8636..018a13de7253 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -135,6 +135,7 @@ const migrations = [
   require('./120.2'),
   require('./120.3'),
   require('./120.4'),
+  require('./120.5'),
 ];
 
 export default migrations;
diff --git a/ui/components/ui/deprecated-networks/deprecated-networks.js b/ui/components/ui/deprecated-networks/deprecated-networks.js
index 3d596709f934..a67f8258317e 100644
--- a/ui/components/ui/deprecated-networks/deprecated-networks.js
+++ b/ui/components/ui/deprecated-networks/deprecated-networks.js
@@ -17,7 +17,7 @@ import {
   DEPRECATED_NETWORKS,
   NEAR_AURORA_MAINNET_IMAGE_URL,
 } from '../../../../shared/constants/network';
-import { editAndSetNetworkConfiguration } from '../../../store/actions';
+import { upsertNetworkConfiguration } from '../../../store/actions';
 import { MetaMetricsNetworkEventSource } from '../../../../shared/constants/metametrics';
 
 export default function DeprecatedNetworks() {
@@ -59,9 +59,9 @@ export default function DeprecatedNetworks() {
       actionButtonOnClick: async () => {
         setIsClosed(true);
         await dispatch(
-          editAndSetNetworkConfiguration(
+          upsertNetworkConfiguration(
             {
-              networkConfigurationId: id,
+              id,
               chainId: CHAIN_IDS.AURORA,
               nickname: AURORA_DISPLAY_NAME,
               rpcUrl: 'https://mainnet.aurora.dev',
@@ -71,7 +71,10 @@ export default function DeprecatedNetworks() {
                 blockExplorerUrl: 'https://aurorascan.dev',
               },
             },
-            { source: MetaMetricsNetworkEventSource.DeprecatedNetworkModal },
+            {
+              source: MetaMetricsNetworkEventSource.DeprecatedNetworkModal,
+              setActive: true,
+            },
           ),
         );
       },
diff --git a/ui/pages/settings/networks-tab/networks-form/networks-form.js b/ui/pages/settings/networks-tab/networks-form/networks-form.js
index b5a072ac3312..18a3731fd0ea 100644
--- a/ui/pages/settings/networks-tab/networks-form/networks-form.js
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.js
@@ -39,7 +39,6 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { usePrevious } from '../../../../hooks/usePrevious';
 import { useSafeChainsListValidationSelector } from '../../../../selectors';
 import {
-  editAndSetNetworkConfiguration,
   setNewNetworkAdded,
   setSelectedNetworkConfigurationId,
   showDeprecatedNetworkModal,
@@ -612,11 +611,11 @@ const NetworksForm = ({
         dispatch(showDeprecatedNetworkModal());
       } else if (selectedNetwork.rpcUrl && rpcUrl !== selectedNetwork.rpcUrl) {
         await dispatch(
-          editAndSetNetworkConfiguration(
+          upsertNetworkConfiguration(
             {
               rpcUrl,
               ticker,
-              networkConfigurationId: selectedNetwork.networkConfigurationId,
+              id: selectedNetwork.networkConfigurationId,
               chainId: prefixedChainId,
               nickname: networkName,
               rpcPrefs: {
@@ -627,6 +626,7 @@ const NetworksForm = ({
             },
             {
               source: MetaMetricsNetworkEventSource.CustomNetworkForm,
+              setActive: true,
             },
           ),
         );
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index e43c02e4bcb4..6a3fa73b8720 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -1113,114 +1113,6 @@ describe('Actions', () => {
     });
   });
 
-  describe('#editAndSetNetworkConfiguration', () => {
-    afterEach(() => {
-      sinon.restore();
-    });
-
-    it('removes then re-adds the given network configuration', async () => {
-      const store = mockStore();
-
-      const removeNetworkConfigurationStub = sinon
-        .stub()
-        .callsFake((_, cb) => cb());
-
-      const upsertNetworkConfigurationStub = sinon
-        .stub()
-        .callsFake((_, cb) => cb());
-
-      background.getApi.returns({
-        removeNetworkConfiguration: removeNetworkConfigurationStub,
-        upsertNetworkConfiguration: upsertNetworkConfigurationStub,
-      });
-      setBackgroundConnection(background.getApi());
-
-      const networkConfiguration = {
-        rpcUrl: 'newRpc',
-        chainId: '0x',
-        ticker: 'ETH',
-        nickname: 'nickname',
-        rpcPrefs: { blockExplorerUrl: 'etherscan.io' },
-      };
-
-      await store.dispatch(
-        actions.editAndSetNetworkConfiguration(
-          {
-            ...networkConfiguration,
-            networkConfigurationId: 'networkConfigurationId',
-          },
-          { source: 'https://test-dapp.com' },
-        ),
-      );
-      expect(
-        removeNetworkConfigurationStub.calledOnceWith('networkConfigurationId'),
-      ).toBe(true);
-      expect(
-        upsertNetworkConfigurationStub.calledOnceWith(networkConfiguration, {
-          setActive: true,
-          referrer: ORIGIN_METAMASK,
-          source: 'https://test-dapp.com',
-        }),
-      ).toBe(true);
-    });
-
-    it('displays warning when removeNetworkConfiguration throws', async () => {
-      const store = mockStore();
-
-      const upsertNetworkConfigurationStub = sinon
-        .stub()
-        .callsFake((_, cb) => cb());
-
-      const removeNetworkConfigurationStub = sinon
-        .stub()
-        .callsFake((_, cb) => cb(new Error('error')));
-
-      background.getApi.returns({
-        removeNetworkConfiguration: removeNetworkConfigurationStub,
-        upsertNetworkConfiguration: upsertNetworkConfigurationStub,
-      });
-
-      setBackgroundConnection(background.getApi());
-
-      const expectedActions = [
-        { type: 'DISPLAY_WARNING', payload: 'Had a problem removing network!' },
-      ];
-
-      await store.dispatch(
-        actions.editAndSetNetworkConfiguration(
-          {
-            networkConfigurationId: 'networkConfigurationId',
-            rpcUrl: 'newRpc',
-            chainId: '0x',
-            ticker: 'ETH',
-            nickname: 'nickname',
-            rpcPrefs: { blockExplorerUrl: 'etherscan.io' },
-          },
-          { source: 'https://test-dapp.com' },
-        ),
-      );
-      expect(store.getActions()).toStrictEqual(expectedActions);
-    });
-
-    it('throws when no options object is passed as a second argument', async () => {
-      const store = mockStore();
-      await expect(() =>
-        store.dispatch(
-          actions.editAndSetNetworkConfiguration({
-            networkConfigurationId: 'networkConfigurationId',
-            rpcUrl: 'newRpc',
-            chainId: '0x',
-            ticker: 'ETH',
-            nickname: 'nickname',
-            rpcPrefs: { blockExplorerUrl: 'etherscan.io' },
-          }),
-        ),
-      ).toThrow(
-        "Cannot destructure property 'source' of 'undefined' as it is undefined.",
-      );
-    });
-  });
-
   describe('#upsertNetworkConfiguration', () => {
     afterEach(() => {
       sinon.restore();
@@ -1239,6 +1131,7 @@ describe('Actions', () => {
       setBackgroundConnection(background.getApi());
 
       const networkConfiguration = {
+        id: 'networkConfigurationId',
         rpcUrl: 'newRpc',
         chainId: '0x',
         ticker: 'ETH',
@@ -1266,7 +1159,7 @@ describe('Actions', () => {
       await expect(() =>
         store.dispatch(
           actions.upsertNetworkConfiguration({
-            networkConfigurationId: 'networkConfigurationId',
+            id: 'networkConfigurationId',
             rpcUrl: 'newRpc',
             chainId: '0x',
             ticker: 'ETH',
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index 1ccdb4472441..d04f88297878 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -2432,12 +2432,14 @@ export function setProviderType(
 
 export function upsertNetworkConfiguration(
   {
+    id,
     rpcUrl,
     chainId,
     nickname,
     rpcPrefs,
     ticker = EtherDenomination.ETH,
   }: {
+    id?: string;
     rpcUrl: string;
     chainId: string;
     nickname: string;
@@ -2454,14 +2456,21 @@ export function upsertNetworkConfiguration(
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch) => {
     log.debug(
-      `background.upsertNetworkConfiguration: ${rpcUrl} ${chainId} ${ticker} ${nickname}`,
+      `background.upsertNetworkConfiguration: ${id} ${rpcUrl} ${chainId} ${ticker} ${nickname}`,
     );
     let networkConfigurationId;
     try {
       networkConfigurationId = await submitRequestToBackground(
         'upsertNetworkConfiguration',
         [
-          { rpcUrl, chainId, ticker, nickname: nickname || rpcUrl, rpcPrefs },
+          {
+            id,
+            rpcUrl,
+            chainId,
+            ticker,
+            nickname: nickname || rpcUrl,
+            rpcPrefs,
+          },
           { setActive, source, referrer: ORIGIN_METAMASK },
         ],
       );
@@ -2473,56 +2482,6 @@ export function upsertNetworkConfiguration(
   };
 }
 
-export function editAndSetNetworkConfiguration(
-  {
-    networkConfigurationId,
-    rpcUrl,
-    chainId,
-    nickname,
-    rpcPrefs,
-    ticker = EtherDenomination.ETH,
-  }: {
-    networkConfigurationId: string;
-    rpcUrl: string;
-    chainId: string;
-    nickname: string;
-    rpcPrefs: RPCDefinition['rpcPrefs'];
-    ticker: string;
-  },
-  { source }: { source: string },
-): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
-  return async (dispatch) => {
-    log.debug(
-      `background.removeNetworkConfiguration: ${networkConfigurationId}`,
-    );
-    try {
-      await submitRequestToBackground('removeNetworkConfiguration', [
-        networkConfigurationId,
-      ]);
-    } catch (error) {
-      logErrorWithMessage(error);
-      dispatch(displayWarning('Had a problem removing network!'));
-      return;
-    }
-
-    try {
-      await submitRequestToBackground('upsertNetworkConfiguration', [
-        {
-          rpcUrl,
-          chainId,
-          ticker,
-          nickname: nickname || rpcUrl,
-          rpcPrefs,
-        },
-        { setActive: true, referrer: ORIGIN_METAMASK, source },
-      ]);
-    } catch (error) {
-      logErrorWithMessage(error);
-      dispatch(displayWarning('Had a problem changing networks!'));
-    }
-  };
-}
-
 export function setActiveNetwork(
   networkConfigurationId: string,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
diff --git a/yarn.lock b/yarn.lock
index bc6289734248..3a083d6e9323 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5775,7 +5775,7 @@ __metadata:
 
 "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch":
   version: 18.1.2
-  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch::version=18.1.2&hash=b6da0e"
+  resolution: "@metamask/network-controller@patch:@metamask/network-controller@npm%3A18.1.2#~/.yarn/patches/@metamask-network-controller-npm-18.1.2-1bcb8d8610.patch::version=18.1.2&hash=3aa342"
   dependencies:
     "@metamask/base-controller": "npm:^5.0.2"
     "@metamask/controller-utils": "npm:^9.1.0"
@@ -5791,7 +5791,7 @@ __metadata:
     async-mutex: "npm:^0.2.6"
     immer: "npm:^9.0.6"
     uuid: "npm:^8.3.2"
-  checksum: 10/f34e01544573763be68b5e7833b98bc136366a2e8b192ac242e5ee965d3e6ada734c93a5abb32670c75de60c929ad4e922e539918fef9991663b6a13aa697b5b
+  checksum: 10/046b7e8a0e743e254dbe84b00c5d2f990733bb1fc01d626cb8f57aaa22ca2f7e66909e4ecebb5e7037f397e324ad39b7d9bf5052a4cfec7d62f348b798ee8355
   languageName: node
   linkType: hard
 

From b267d65a7e1e73f043e61c5cd5468a5a65dd2d58 Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Fri, 16 Aug 2024 00:10:10 -0230
Subject: [PATCH 186/236] Update changelog for v12.0.5

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e77fd03cc293..a92529ab15a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.5]
+### Fixed
+- Prevent network selection per dapp from breaking if the rpc url of the currently selected network is edited ([#26453](https://github.com/MetaMask/metamask-extension/pull/26453))
+- Fix the display of prices and balances of some tokens on networks other than ethereum mainnet ([#26450](https://github.com/MetaMask/metamask-extension/pull/26450))
 
 ## [12.0.4]
 ### Fixed

From 203e5d7acd2e019fa43963683f46b0f97e17b41d Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Fri, 16 Aug 2024 13:18:58 +0000
Subject: [PATCH 187/236] Version v12.0.6

---
 CHANGELOG.md | 5 ++++-
 package.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a92529ab15a8..699da911bba2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.0.6]
+
 ## [12.0.5]
 ### Fixed
 - Prevent network selection per dapp from breaking if the rpc url of the currently selected network is edited ([#26453](https://github.com/MetaMask/metamask-extension/pull/26453))
@@ -4918,7 +4920,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.6...HEAD
+[12.0.6]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...v12.0.6
 [12.0.5]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...v12.0.5
 [12.0.4]: https://github.com/MetaMask/metamask-extension/compare/v12.0.3...v12.0.4
 [12.0.3]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...v12.0.3
diff --git a/package.json b/package.json
index 2b2dc1a3196a..15ba33ced7b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.0.5",
+  "version": "12.0.6",
   "private": true,
   "repository": {
     "type": "git",

From e19f44a33a2d5d3d283e1d9740b5eab4ae9a5421 Mon Sep 17 00:00:00 2001
From: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Date: Tue, 13 Aug 2024 11:15:48 +0100
Subject: [PATCH 188/236] refactor(notifications): use contentful package as
 dev dependency (#26381)
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 only use this package for its types, so can be treated as a dev
dependency. This will also resolve the audit issue currently seen in
[CI](https://app.circleci.com/pipelines/github/MetaMask/metamask-extension/95274/workflows/b92333ec-1a1c-4ce6-bd7d-7601fe14e1e3/jobs/3546366).

<!--
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/26381?quickstart=1)

## **Related issues**

Fixes: CI issues, and better reflects the use case of this dependency.

## **Manual testing steps**

Re-test notifications flow

1. Onboard with new or existing wallet
2. Enable notifications
3. Perform a swap on Polygon (a chain we support on-chain notifications
for)
4. See if notifications appear.

For Notification Devs: As there is no feature announcements yet,
manually change the code to point to a portfolio feature announcement.
I've tested and it seems that we still correctly show a feature
announcement to users.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 31e6cc25cf85..e048b6784b9b 100644
--- a/package.json
+++ b/package.json
@@ -369,7 +369,6 @@
     "bowser": "^2.11.0",
     "chart.js": "^4.4.1",
     "classnames": "^2.2.6",
-    "contentful": "^10.8.7",
     "copy-to-clipboard": "^3.3.3",
     "currency-formatter": "^1.4.2",
     "debounce-stream": "^2.0.0",
@@ -534,6 +533,7 @@
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "concurrently": "^8.2.2",
+    "contentful": "^10.8.7",
     "copy-webpack-plugin": "^12.0.2",
     "cross-spawn": "^7.0.3",
     "css-loader": "^6.10.0",

From 8e7f71b8593dea94df6c6d9d8554712bcc5eb092 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 16 Aug 2024 12:24:08 -0230
Subject: [PATCH 189/236] Cherry pick 5ee57a63c0 (#25686) to v12.1.0 (#26473)

Cherry pick 5ee57a63c0 (#25686) to v12.1.0

Co-authored-by: George Weiler <georgejweiler@gmail.com>
---
 ui/ducks/ramps/ramps.test.ts | 25 ++++++++++++++++++++++---
 ui/ducks/ramps/ramps.ts      | 12 +++++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ui/ducks/ramps/ramps.test.ts b/ui/ducks/ramps/ramps.test.ts
index c4ca4089815a..a9f50860cfd7 100644
--- a/ui/ducks/ramps/ramps.test.ts
+++ b/ui/ducks/ramps/ramps.test.ts
@@ -30,15 +30,16 @@ describe('rampsSlice', () => {
     mockedRampAPI.getNetworks.mockReset();
   });
 
-  it('should set the initial state to defaultBuyableChains', () => {
+  it('should set the initial state to defaultBuyableChains and isFetched to false', () => {
     const { ramps: rampsState } = store.getState();
     expect(rampsState).toEqual({
       buyableChains: defaultBuyableChains,
+      isFetched: false,
     });
   });
 
   describe('setBuyableChains', () => {
-    it('should update the buyableChains state when setBuyableChains is dispatched', () => {
+    it('should update the buyableChains state and set isFetched to true when setBuyableChains is dispatched', () => {
       const mockBuyableChains = [{ chainId: '0x1' }];
       store.dispatch({
         type: 'ramps/setBuyableChains',
@@ -46,7 +47,9 @@ describe('rampsSlice', () => {
       });
       const { ramps: rampsState } = store.getState();
       expect(rampsState.buyableChains).toEqual(mockBuyableChains);
+      expect(rampsState.isFetched).toEqual(true);
     });
+
     it('should disregard invalid array and set buyableChains to default', () => {
       store.dispatch({
         type: 'ramps/setBuyableChains',
@@ -89,7 +92,7 @@ describe('rampsSlice', () => {
       getUseExternalServicesMock.mockReturnValue(true);
     });
 
-    it('should call RampAPI.getNetworks when the Basic Functionality Toggle is on', async () => {
+    it('should call RampAPI.getNetworks when the Basic Functionality Toggle is on and isFetched is false', async () => {
       // @ts-expect-error this is a valid action
       await store.dispatch(fetchBuyableChains());
       expect(RampAPI.getNetworks).toHaveBeenCalledTimes(1);
@@ -105,6 +108,17 @@ describe('rampsSlice', () => {
       expect(RampAPI.getNetworks).not.toHaveBeenCalled();
     });
 
+    it('should not call RampAPI.getNetworks when isFetched is true', async () => {
+      store.dispatch({
+        type: 'ramps/setBuyableChains',
+        payload: [{ chainId: '0x1' }],
+      });
+
+      // @ts-expect-error this is a valid action
+      await store.dispatch(fetchBuyableChains());
+      expect(RampAPI.getNetworks).not.toHaveBeenCalled();
+    });
+
     it('should update the state with the data that is returned', async () => {
       const mockBuyableChains = [
         {
@@ -120,7 +134,9 @@ describe('rampsSlice', () => {
       await store.dispatch(fetchBuyableChains());
       const { ramps: rampsState } = store.getState();
       expect(rampsState.buyableChains).toEqual(mockBuyableChains);
+      expect(rampsState.isFetched).toEqual(true);
     });
+
     it('should set state to defaultBuyableChains when returned networks are undefined', async () => {
       // @ts-expect-error forcing undefined to test the behavior
       jest.spyOn(RampAPI, 'getNetworks').mockResolvedValue(undefined);
@@ -128,6 +144,7 @@ describe('rampsSlice', () => {
       await store.dispatch(fetchBuyableChains());
       const { ramps: rampsState } = store.getState();
       expect(rampsState.buyableChains).toEqual(defaultBuyableChains);
+      expect(rampsState.isFetched).toEqual(true);
     });
 
     it('should set state to defaultBuyableChains when returned networks are empty', async () => {
@@ -136,6 +153,7 @@ describe('rampsSlice', () => {
       await store.dispatch(fetchBuyableChains());
       const { ramps: rampsState } = store.getState();
       expect(rampsState.buyableChains).toEqual(defaultBuyableChains);
+      expect(rampsState.isFetched).toEqual(true);
     });
 
     it('should set state to defaultBuyableChains when API request fails', async () => {
@@ -146,6 +164,7 @@ describe('rampsSlice', () => {
       await store.dispatch(fetchBuyableChains());
       const { ramps: rampsState } = store.getState();
       expect(rampsState.buyableChains).toEqual(defaultBuyableChains);
+      expect(rampsState.isFetched).toEqual(true);
     });
   });
 
diff --git a/ui/ducks/ramps/ramps.ts b/ui/ducks/ramps/ramps.ts
index afff609cd4d8..bd7f16573d7d 100644
--- a/ui/ducks/ramps/ramps.ts
+++ b/ui/ducks/ramps/ramps.ts
@@ -10,11 +10,17 @@ export const fetchBuyableChains = createAsyncThunk(
   'ramps/fetchBuyableChains',
   async (_, { getState }) => {
     const state = getState();
+    // @ts-expect-error: TS doesn't know about the root state interface yet
+    const { isFetched } = state.ramps;
     const allowExternalRequests = getUseExternalServices(state);
     if (!allowExternalRequests) {
       return defaultBuyableChains;
     }
-    return await RampAPI.getNetworks();
+    if (!isFetched) {
+      return await RampAPI.getNetworks();
+    }
+    // @ts-expect-error: TS doesn't know about the root state interface yet
+    return state.ramps.buyableChains;
   },
 );
 
@@ -22,6 +28,7 @@ const rampsSlice = createSlice({
   name: 'ramps',
   initialState: {
     buyableChains: defaultBuyableChains,
+    isFetched: false,
   },
   reducers: {
     setBuyableChains: (state, action) => {
@@ -31,6 +38,7 @@ const rampsSlice = createSlice({
         action.payload.every((network) => network?.chainId)
       ) {
         state.buyableChains = action.payload;
+        state.isFetched = true;
       } else {
         state.buyableChains = defaultBuyableChains;
       }
@@ -45,9 +53,11 @@ const rampsSlice = createSlice({
         } else {
           state.buyableChains = defaultBuyableChains;
         }
+        state.isFetched = true;
       })
       .addCase(fetchBuyableChains.rejected, (state) => {
         state.buyableChains = defaultBuyableChains;
+        state.isFetched = true;
       });
   },
 });

From a19c80f8e0e06de0682d02c1b382501c64694e7c Mon Sep 17 00:00:00 2001
From: Marina Boboc <120041701+benjisclowder@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:02:41 +0300
Subject: [PATCH 190/236] fix: Fix lint changelog 12.1.0 (#26474)

Corrected changelog file to solve failing ci job.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26474?quickstart=1)
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f09fd74ef041..e1e0cada434d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.1.0]
+
 ## [12.0.0]
 ### Added
 - Allow users to 'Select networks for each site' ([#24274](https://github.com/MetaMask/metamask-extension/pull/24274))
@@ -4890,8 +4891,7 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.1.0...HEAD
-[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v12.1.0
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...HEAD
+[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...v12.1.0
 [12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.16...v12.0.0
 [11.16.16]: https://github.com/MetaMask/metamask-extension/compare/v11.16.15...v11.16.16
 [11.16.15]: https://github.com/MetaMask/metamask-extension/compare/v11.16.14...v11.16.15

From 46b47d6a715c047bf7f77b92b0f7a011c9b4033f Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Mon, 29 Jul 2024 12:34:11 -0700
Subject: [PATCH 191/236] fix(deps): bump fast-xml-parser from 4.3.4 to 4.4.1.
 (#26202)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Fix audit:

```
└─ fast-xml-parser
   ├─ ID: 1098305
   ├─ Issue: fast-xml-parser vulnerable to ReDOS at currency parsing
   ├─ URL: https://github.com/advisories/GHSA-mpg4-rc92-vx8v
   ├─ Severity: high
   ├─ Vulnerable Versions: <4.4.1
   │
   ├─ Tree Versions
   │  └─ 4.3.4
```

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

## **Related issues**



## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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 958f63cd4e76..d1e21da1db32 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18621,13 +18621,13 @@ __metadata:
   linkType: hard
 
 "fast-xml-parser@npm:^4.3.4":
-  version: 4.3.4
-  resolution: "fast-xml-parser@npm:4.3.4"
+  version: 4.4.1
+  resolution: "fast-xml-parser@npm:4.4.1"
   dependencies:
     strnum: "npm:^1.0.5"
   bin:
     fxparser: src/cli/cli.js
-  checksum: 10/ef859101980cdd02b111fce09e25949a80e373654a6c424091355930f0d364abec144d8bb722d250a0c070416566518e621e198204a6b976db68f20c16d9300b
+  checksum: 10/0c05ab8703630d8c857fafadbd78d0020d3a8e54310c3842179cd4a0d9d97e96d209ce885e91241f4aa9dd8dfc2fd924a682741a423d65153cad34da2032ec44
   languageName: node
   linkType: hard
 

From b2a493b7e9fde676964ae28ce4935057471dca24 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 16 Aug 2024 11:24:25 -0500
Subject: [PATCH 192/236] fix (cherry-pick): Enable Save button on Add Contact
 page for address input (#26456)
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**
Cherry pick PR for the fix #25601
<!--
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/25701?quickstart=1)


## **Related issues**

fixes #25918
fixes #25889

## **Manual testing steps**

1. Go to Settings > Contacts > Add Contact
2. Enter a name and a valid Ethereum address
3. Observe the Save button getting enabled
4. Edit the address to make it invalid, observe the Save button getting
disabled
5. Instead of an address, enter an ENS name and pick the resolved result
6. Observe the Save button getting enabled
7. Observe that the input is still editable (repeat 4.)

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

Signed-off-by: Mircea Nistor <mirceanis@gmail.com>
Co-authored-by: Mircea Nistor <mirceanis@gmail.com>
---
 .../add-contact/add-contact.component.js      | 23 +++++-----
 .../add-contact/add-contact.test.js           | 45 ++++++++++++++++++-
 2 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js b/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js
index 78c3054df933..5221aff38d04 100644
--- a/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js
+++ b/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { debounce } from 'lodash';
 import TextField from '../../../../components/ui/text-field';
 import { CONTACT_LIST_ROUTE } from '../../../../helpers/constants/routes';
-import { IS_FLASK, isValidDomainName } from '../../../../helpers/utils/util';
+import { isValidDomainName } from '../../../../helpers/utils/util';
 import DomainInput from '../../../confirmations/send/send-content/add-recipient/domain-input';
 import PageContainerFooter from '../../../../components/ui/page-container/page-container-footer';
 import {
@@ -11,7 +11,7 @@ import {
   isValidHexAddress,
 } from '../../../../../shared/modules/hexstring-utils';
 import { INVALID_RECIPIENT_ADDRESS_ERROR } from '../../../confirmations/send/send.constants';
-import { DomainInputResolutionCell } from '../../../../components/multichain/pages/send/components/domain-input-resolution-cell';
+import { DomainInputResolutionCell } from '../../../../components/multichain/pages/send/components';
 
 export default class AddContact extends PureComponent {
   static contextTypes = {
@@ -68,8 +68,10 @@ export default class AddContact extends PureComponent {
       isValidHexAddress(input, { mixedCaseUseChecksum: true });
     const validEnsAddress = isValidDomainName(input);
 
-    if (!IS_FLASK && !validEnsAddress && !valid) {
+    if (!validEnsAddress && !valid) {
       this.setState({ error: INVALID_RECIPIENT_ADDRESS_ERROR });
+    } else {
+      this.setState({ error: null });
     }
   };
 
@@ -104,6 +106,10 @@ export default class AddContact extends PureComponent {
       this.props;
 
     const errorToRender = domainError || this.state.error;
+    const newAddress = this.state.selectedAddress || this.state.input;
+    const validAddress =
+      !isBurnAddress(newAddress) &&
+      isValidHexAddress(newAddress, { mixedCaseUseChecksum: true });
 
     return (
       <div className="settings-page__content-row address-book__add-contact">
@@ -150,7 +156,7 @@ export default class AddContact extends PureComponent {
                     domainName={domainName}
                     onClick={() => {
                       this.setState({
-                        selectedAddress: resolvedAddress,
+                        input: resolvedAddress,
                         newName: this.state.newName || domainName,
                       });
                       this.props.resetDomainResolution();
@@ -171,15 +177,10 @@ export default class AddContact extends PureComponent {
         <PageContainerFooter
           cancelText={this.context.t('cancel')}
           disabled={Boolean(
-            this.state.error ||
-              !this.state.selectedAddress ||
-              !this.state.newName.trim(),
+            this.state.error || !validAddress || !this.state.newName.trim(),
           )}
           onSubmit={async () => {
-            await addToAddressBook(
-              this.state.selectedAddress,
-              this.state.newName,
-            );
+            await addToAddressBook(newAddress, this.state.newName);
             history.push(CONTACT_LIST_ROUTE);
           }}
           onCancel={() => {
diff --git a/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js b/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js
index 29f9fc7722ad..2ab1a7111704 100644
--- a/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js
+++ b/ui/pages/settings/contact-list-tab/add-contact/add-contact.test.js
@@ -47,7 +47,7 @@ describe('AddContact component', () => {
     fireEvent.change(input, { target: { value: 'invalid address' } });
     setTimeout(() => {
       expect(getByText('Recipient address is invalid')).toBeInTheDocument();
-    }, 100);
+    }, 600);
   });
 
   it('should get disabled submit button when username field is empty', () => {
@@ -60,4 +60,47 @@ describe('AddContact component', () => {
     const saveButton = getByText('Save');
     expect(saveButton).toBeDisabled();
   });
+
+  it('should enable submit button when input is valid', () => {
+    const store = configureMockStore(middleware)(state);
+    const { getByText, getByTestId } = renderWithProvider(
+      <AddContact {...props} />,
+      store,
+    );
+
+    const nameInput = document.getElementById('nickname');
+    fireEvent.change(nameInput, { target: { value: 'friend' } });
+
+    const addressInput = getByTestId('ens-input');
+    fireEvent.change(addressInput, {
+      target: { value: '0x1234Bf0BBa69C63E2657cF94693cC4A907085678' },
+    });
+
+    const saveButton = getByText('Save');
+    expect(saveButton).not.toBeDisabled();
+  });
+
+  it('should disable submit button when input is not a valid address', () => {
+    const store = configureMockStore(middleware)(state);
+    const { getByText, getByTestId } = renderWithProvider(
+      <AddContact {...props} />,
+      store,
+    );
+
+    const nameInput = document.getElementById('nickname');
+    fireEvent.change(nameInput, { target: { value: 'friend' } });
+
+    const addressInput = getByTestId('ens-input');
+    fireEvent.change(addressInput, {
+      // invalid length
+      target: { value: '0x1234' },
+    });
+    expect(getByText('Save')).toBeDisabled();
+
+    fireEvent.change(addressInput, {
+      // wrong checksum
+      target: { value: '0x1234bf0bba69C63E2657cF94693cC4A907085678' },
+    });
+    expect(getByText('Save')).toBeDisabled();
+  });
 });

From 2870f594f9b63f00e44c7f55be262c656105a572 Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Fri, 16 Aug 2024 10:17:22 -0700
Subject: [PATCH 193/236] fix: fallback conversion rate for token market data
 #4615 (#26460)
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**

Patches https://github.com/MetaMask/core/pull/4615

When the price API does not support the native currency (e.g. MATIC),
prices are fetched in ETH and an additional conversion hop is performed
to the native currency. But this hop was only being performed on the
current price, and was missing on the extended market data like
marketCap, allTimeHigh, etc.


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

## **Related issues**


## **Manual testing steps**

1. Open the token details page for a polygon token
2. Verify market cap, all time low, all time high are correct

## **Screenshots/Recordings**

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

### **Before**

<img width="357" alt="Screenshot 2024-08-15 at 6 08 43 PM"
src="https://github.com/user-attachments/assets/073e2a74-8258-4206-af1d-664eb3d4c1bb">
<img width="353" alt="Screenshot 2024-08-15 at 6 22 15 PM"
src="https://github.com/user-attachments/assets/d5603a56-9fea-401a-a7cf-a08654792c17">


### **After**
<img width="351" alt="Screenshot 2024-08-15 at 6 12 46 PM"
src="https://github.com/user-attachments/assets/13498481-8fe7-4f6d-852d-8d45508769dd">
<img width="351" alt="Screenshot 2024-08-15 at 6 17 11 PM"
src="https://github.com/user-attachments/assets/1f094ce8-0d05-4c7f-bb6d-73221eeb3fef">

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

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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-33.0.0-3e7448c4cd.patch | 58 +++++++++++++++++++
 package.json                                  |  2 +-
 yarn.lock                                     | 46 ++++++++++++++-
 3 files changed, 103 insertions(+), 3 deletions(-)
 create mode 100644 .yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch

diff --git a/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch b/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch
new file mode 100644
index 000000000000..8961c8f629e6
--- /dev/null
+++ b/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch
@@ -0,0 +1,58 @@
+diff --git a/dist/chunk-FGAZXVKS.js b/dist/chunk-FGAZXVKS.js
+index 4a6aa7918599269951044b9f8c7c076a7fe6a9c7..4c1054a867ff6aef1e26f8d84e2831f234c4e44e 100644
+--- a/dist/chunk-FGAZXVKS.js
++++ b/dist/chunk-FGAZXVKS.js
+@@ -503,6 +503,7 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
+   if (fallbackCurrencyToNativeCurrencyConversionRate === null) {
+     return {};
+   }
++  const convertFallbackToNative = (value) => value !== void 0 && value !== null ? value * fallbackCurrencyToNativeCurrencyConversionRate : void 0;
+   const updatedContractExchangeRates = Object.entries(
+     contractExchangeInformations
+   ).reduce((acc, [tokenAddress, token]) => {
+@@ -510,7 +511,15 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
+       ...acc,
+       [tokenAddress]: {
+         ...token,
+-        price: token.price ? token.price * fallbackCurrencyToNativeCurrencyConversionRate : void 0
++        currency: nativeCurrency,
++        price: convertFallbackToNative(token.price),
++        marketCap: convertFallbackToNative(token.marketCap),
++        allTimeHigh: convertFallbackToNative(token.allTimeHigh),
++        allTimeLow: convertFallbackToNative(token.allTimeLow),
++        totalVolume: convertFallbackToNative(token.totalVolume),
++        high1d: convertFallbackToNative(token.high1d),
++        low1d: convertFallbackToNative(token.low1d),
++        dilutedMarketCap: convertFallbackToNative(token.dilutedMarketCap)
+       }
+     };
+     return acc;
+diff --git a/dist/chunk-P3O5CVAH.mjs b/dist/chunk-P3O5CVAH.mjs
+index 32379704450baee58a37623b1d0f6b471e69de2e..069c3deec15ad85057c910ecf0db31d856fd6ae2 100644
+--- a/dist/chunk-P3O5CVAH.mjs
++++ b/dist/chunk-P3O5CVAH.mjs
+@@ -503,6 +503,7 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
+   if (fallbackCurrencyToNativeCurrencyConversionRate === null) {
+     return {};
+   }
++  const convertFallbackToNative = (value) => value !== void 0 && value !== null ? value * fallbackCurrencyToNativeCurrencyConversionRate : void 0;
+   const updatedContractExchangeRates = Object.entries(
+     contractExchangeInformations
+   ).reduce((acc, [tokenAddress, token]) => {
+@@ -510,7 +511,15 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
+       ...acc,
+       [tokenAddress]: {
+         ...token,
+-        price: token.price ? token.price * fallbackCurrencyToNativeCurrencyConversionRate : void 0
++        currency: nativeCurrency,
++        price: convertFallbackToNative(token.price),
++        marketCap: convertFallbackToNative(token.marketCap),
++        allTimeHigh: convertFallbackToNative(token.allTimeHigh),
++        allTimeLow: convertFallbackToNative(token.allTimeLow),
++        totalVolume: convertFallbackToNative(token.totalVolume),
++        high1d: convertFallbackToNative(token.high1d),
++        low1d: convertFallbackToNative(token.low1d),
++        dilutedMarketCap: convertFallbackToNative(token.dilutedMarketCap)
+       }
+     };
+     return acc;
diff --git a/package.json b/package.json
index e048b6784b9b..52baa56a49d0 100644
--- a/package.json
+++ b/package.json
@@ -292,7 +292,7 @@
     "@metamask/address-book-controller": "^4.0.1",
     "@metamask/announcement-controller": "^6.1.0",
     "@metamask/approval-controller": "^7.0.0",
-    "@metamask/assets-controllers": "^33.0.0",
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch",
     "@metamask/base-controller": "^5.0.1",
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.5.0",
diff --git a/yarn.lock b/yarn.lock
index d1e21da1db32..ce71ce1b2bb6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4824,7 +4824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:^33.0.0":
+"@metamask/assets-controllers@npm:33.0.0":
   version: 33.0.0
   resolution: "@metamask/assets-controllers@npm:33.0.0"
   dependencies:
@@ -4866,6 +4866,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch":
+  version: 33.0.0
+  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch::version=33.0.0&hash=4c8a6f"
+  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:^17.0.0"
+    "@metamask/approval-controller": "npm:^7.0.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/contract-metadata": "npm:^2.4.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/keyring-controller": "npm:^17.1.0"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/network-controller": "npm:^19.0.0"
+    "@metamask/polling-controller": "npm:^8.0.0"
+    "@metamask/preferences-controller": "npm:^13.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.5.0"
+    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": ^17.0.0
+    "@metamask/approval-controller": ^7.0.0
+    "@metamask/keyring-controller": ^17.0.0
+    "@metamask/network-controller": ^19.0.0
+    "@metamask/preferences-controller": ^13.0.0
+  checksum: 10/effeb152b776dad38e173f9a699158d6df15d4175d27de763ba6ddd8f9b50cf604722683f8d91af989a7b5d721d1b846c5a78d2553ce7f84787925440f3c1107
+  languageName: node
+  linkType: hard
+
 "@metamask/auto-changelog@npm:^2.1.0":
   version: 2.6.1
   resolution: "@metamask/auto-changelog@npm:2.6.1"
@@ -25232,7 +25274,7 @@ __metadata:
     "@metamask/announcement-controller": "npm:^6.1.0"
     "@metamask/api-specs": "npm:^0.9.3"
     "@metamask/approval-controller": "npm:^7.0.0"
-    "@metamask/assets-controllers": "npm:^33.0.0"
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^5.0.1"
     "@metamask/browser-passworder": "npm:^4.3.0"

From db10925e09a5afcce020e9eb2dcc4984cbb96d42 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Mon, 19 Aug 2024 05:58:48 -0400
Subject: [PATCH 194/236] fix: refactor: cherry-pick 12.1.0 Permit decimal fix
 + introduce ConfirmInfoRowTextTokenUnits component (#26478)
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**

Cherry-picks refactor: Create reusable ConfirmInfoRowTextTokenUnits
component (#26105)
into V12.1.0

> No UI/UX changes
>
> Create reusable ConfirmInfoRowTextTokenUnits
>
> notes:
> - there is an outstanding bug ticket to redesign the display length of
the amount to max 15 characters. This will be handled separately
> - there's also a precision issue being handle separately

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26105?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2888
Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2991
(cherry-pick issue)

## **Manual testing steps**

1. Create a redesign Permit transaction
2. Observe amount displays as expected

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

![CleanShot 2024-07-25 at 03 35

08](https://github.com/user-attachments/assets/92e6db4e-7618-43d6-8259-d9e16f436dbe)


## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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.
-->
---
 ui/components/app/confirm/info/row/index.ts   |  1 +
 .../info/row/text-token-units.stories.tsx     | 27 +++++++++++++++
 .../info/row/text-token-units.test.tsx        | 27 +++++++++++++++
 .../app/confirm/info/row/text-token-units.tsx | 33 +++++++++++++++++++
 .../permit-simulation/permit-simulation.tsx   | 10 +++---
 .../components/confirm/row/dataTree.tsx       | 21 ++----------
 6 files changed, 94 insertions(+), 25 deletions(-)
 create mode 100644 ui/components/app/confirm/info/row/text-token-units.stories.tsx
 create mode 100644 ui/components/app/confirm/info/row/text-token-units.test.tsx
 create mode 100644 ui/components/app/confirm/info/row/text-token-units.tsx

diff --git a/ui/components/app/confirm/info/row/index.ts b/ui/components/app/confirm/info/row/index.ts
index 0fc08d5887bb..0f7ceaca9251 100644
--- a/ui/components/app/confirm/info/row/index.ts
+++ b/ui/components/app/confirm/info/row/index.ts
@@ -3,5 +3,6 @@ export * from './date';
 export * from './divider';
 export * from './row';
 export * from './text';
+export * from './text-token-units';
 export * from './url';
 export * from './value-double';
diff --git a/ui/components/app/confirm/info/row/text-token-units.stories.tsx b/ui/components/app/confirm/info/row/text-token-units.stories.tsx
new file mode 100644
index 000000000000..cc490b683dc5
--- /dev/null
+++ b/ui/components/app/confirm/info/row/text-token-units.stories.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { ConfirmInfoRow } from './row';
+import { ConfirmInfoRowTextTokenUnits } from './text-token-units';
+
+export default {
+  title: 'Components/App/Confirm/InfoRowTextToken',
+  component: ConfirmInfoRowTextTokenUnits,
+  decorators: [
+    (story) => <ConfirmInfoRow label="Amount">{story()}</ConfirmInfoRow>,
+  ],
+  argTypes: {
+    value: {
+      control: 'text',
+    },
+    decimals: {
+      control: 'number',
+    },
+  },
+  args: {
+    value: '3000198768',
+    decimals: 5,
+  },
+};
+
+export const DefaultStory = (args: { value: string, decimals: number }) =>
+  <ConfirmInfoRowTextTokenUnits {...args} />;
+
diff --git a/ui/components/app/confirm/info/row/text-token-units.test.tsx b/ui/components/app/confirm/info/row/text-token-units.test.tsx
new file mode 100644
index 000000000000..ee352d57acce
--- /dev/null
+++ b/ui/components/app/confirm/info/row/text-token-units.test.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { ConfirmInfoRowTextTokenUnits } from './text-token-units';
+
+describe('ConfirmInfoRowTextTokenUnits', () => {
+  it('renders the value with the correct formatted decimal', () => {
+    const value = 123.456789;
+    const decimals = 4;
+    const { getByText } = render(
+      <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
+    );
+
+    // Note: using formatAmount loses precision
+    expect(getByText('0.0123')).toBeInTheDocument();
+  });
+
+  it('renders the value with the correct formatted non-fractional number', () => {
+    const value = 123456789;
+    const decimals = 4;
+    const { getByText } = render(
+      <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
+    );
+
+    // Note: using formatAmount loses precision
+    expect(getByText('12,346')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/confirm/info/row/text-token-units.tsx b/ui/components/app/confirm/info/row/text-token-units.tsx
new file mode 100644
index 000000000000..62d0bb38e664
--- /dev/null
+++ b/ui/components/app/confirm/info/row/text-token-units.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { BigNumber } from 'bignumber.js';
+
+import { calcTokenAmount } from '../../../../../../shared/lib/transactions-controller-utils';
+import {
+  formatAmount,
+  formatAmountMaxPrecision,
+} from '../../../../../pages/confirmations/components/simulation-details/formatAmount';
+import { ConfirmInfoRowText } from './text';
+
+type ConfirmInfoRowTextTokenUnitsProps = {
+  value: number | string | BigNumber;
+  decimals: number;
+};
+
+export const ConfirmInfoRowTextTokenUnits: React.FC<
+  ConfirmInfoRowTextTokenUnitsProps
+> = ({ value, decimals }) => {
+  const tokenValue = calcTokenAmount(value, decimals);
+
+  // FIXME - Precision may be lost for large values when using formatAmount
+  /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
+  const tokenText = formatAmount('en-US', tokenValue);
+  const tokenTextMaxPrecision = formatAmountMaxPrecision('en-US', tokenValue);
+
+  return (
+    <ConfirmInfoRowText
+      isEllipsis={true}
+      text={tokenText}
+      tooltip={tokenTextMaxPrecision}
+    />
+  );
+};
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index 97b212d08256..81cd690e6f65 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { NameType } from '@metamask/name-controller';
-import { BigNumber } from 'bignumber.js';
 
+import { calcTokenAmount } from '../../../../../../../../shared/lib/transactions-controller-utils';
 import { parseTypedDataMessage } from '../../../../../../../../shared/modules/transaction.utils';
 import { Numeric } from '../../../../../../../../shared/modules/Numeric';
 import Name from '../../../../../../../components/app/name/name';
@@ -53,15 +53,13 @@ const PermitSimulation: React.FC<{
   }, [exchangeRate, value]);
 
   const { tokenValue, tokenValueMaxPrecision } = useMemo(() => {
-    const valueBN = new BigNumber(value);
-    const diviserBN = new BigNumber(10).pow(tokenDecimals);
-    const resultBn = valueBN.div(diviserBN);
+    const tokenAmount = calcTokenAmount(value, tokenDecimals);
 
     // FIXME - Precision may be lost for large values when using formatAmount
     /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
     return {
-      tokenValue: formatAmount('en-US', resultBn),
-      tokenValueMaxPrecision: formatAmountMaxPrecision('en-US', resultBn),
+      tokenValue: formatAmount('en-US', tokenAmount),
+      tokenValueMaxPrecision: formatAmountMaxPrecision('en-US', tokenAmount),
     };
   }, [tokenDecimals, value]);
 
diff --git a/ui/pages/confirmations/components/confirm/row/dataTree.tsx b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
index f7b35a35f352..bb4765fda5ef 100644
--- a/ui/pages/confirmations/components/confirm/row/dataTree.tsx
+++ b/ui/pages/confirmations/components/confirm/row/dataTree.tsx
@@ -1,4 +1,3 @@
-import { BigNumber } from 'bignumber.js';
 import React, { memo } from 'react';
 
 import { isValidHexAddress } from '../../../../../../shared/modules/hexstring-utils';
@@ -11,11 +10,8 @@ import {
   ConfirmInfoRowAddress,
   ConfirmInfoRowDate,
   ConfirmInfoRowText,
+  ConfirmInfoRowTextTokenUnits,
 } from '../../../../../components/app/confirm/info/row';
-import {
-  formatAmount,
-  formatAmountMaxPrecision,
-} from '../../simulation-details/formatAmount';
 
 type ValueType = string | Record<string, TreeData> | TreeData[];
 
@@ -81,21 +77,8 @@ const DataField = memo(
       );
     }
     if (isPermit && label === 'value') {
-      const valueBN = new BigNumber(value);
-      const diviserBN = new BigNumber(10).pow(tokenDecimals);
-      const resultBn = valueBN.div(diviserBN);
-
-      // FIXME - Precision may be lost for large values when using formatAmount
-      /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
-      const tokenValue = formatAmount('en-US', resultBn);
-      const tokenValueMaxPrecision = formatAmountMaxPrecision('en-US', valueBN);
-
       return (
-        <ConfirmInfoRowText
-          isEllipsis={true}
-          text={tokenValue}
-          tooltip={tokenValueMaxPrecision}
-        />
+        <ConfirmInfoRowTextTokenUnits value={value} decimals={tokenDecimals} />
       );
     }
     if (isPermit && label === 'deadline') {

From 21e019aa9bf2daea5cca56395e159ca9c84582f4 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:15:21 -0400
Subject: [PATCH 195/236] fix: [cherry-pick][V12.1.0] fix loss of precision for
 very big values  (#26496)

---
 .../permit-simulation/permit-simulation.tsx   |  2 --
 .../simulation-details/formatAmount.test.ts   | 10 +++------
 .../simulation-details/formatAmount.ts        | 22 +++++++++++++++----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index 81cd690e6f65..02a91ce95afc 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -55,8 +55,6 @@ const PermitSimulation: React.FC<{
   const { tokenValue, tokenValueMaxPrecision } = useMemo(() => {
     const tokenAmount = calcTokenAmount(value, tokenDecimals);
 
-    // FIXME - Precision may be lost for large values when using formatAmount
-    /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
     return {
       tokenValue: formatAmount('en-US', tokenAmount),
       tokenValueMaxPrecision: formatAmountMaxPrecision('en-US', tokenAmount),
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
index f7a627e46e5c..7f73e0ab42fc 100644
--- a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
@@ -37,14 +37,10 @@ describe('formatAmount', () => {
     [47361034.006, '47,361,034'],
     ['12130982923409.5', '12,130,982,923,410'],
     ['1213098292340944.5', '1,213,098,292,340,945'],
-    // Precision is lost after the value is greator than Number.MAX_SAFE_INTEGER. The digits after
-    // the 15th digit become 0's.
-    // TODO fix the precision
-    /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
-    ['30001231231212312138768', '30,001,231,231,212,312,000,000'],
+    ['30001231231212312138768', '30,001,231,231,212,312,138,768'],
     [
-      '115792089237316195423570985008687907853269984665640564039457584007913129639935',
-      '115,792,089,237,316,200,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000',
+      '1157920892373161954235709850086879078532699846656405640394575.84007913129639935',
+      '1,157,920,892,373,161,954,235,709,850,086,879,078,532,699,846,656,405,640,394,576',
     ],
   ])(
     'formats amount greater than or equal to 1 with appropriate decimal precision (%s => %s)',
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
index 1314b3b5f911..213b55d52083 100644
--- a/ui/pages/confirmations/components/simulation-details/formatAmount.ts
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
@@ -13,9 +13,18 @@ export function formatAmountMaxPrecision(
   locale: string,
   num: number | BigNumber,
 ): string {
-  return new Intl.NumberFormat(locale, {
-    minimumSignificantDigits: 1,
-  }).format(new BigNumber(num.toString()).toNumber());
+  const bigNumberValue = new BigNumber(num);
+  const numberOfDecimals = bigNumberValue.decimalPlaces();
+  const formattedValue = bigNumberValue.toFixed(numberOfDecimals);
+
+  const [integerPart, fractionalPart] = formattedValue.split('.');
+  const formattedIntegerPart = new Intl.NumberFormat(locale).format(
+    integerPart as unknown as number,
+  );
+
+  return fractionalPart
+    ? `${formattedIntegerPart}.${fractionalPart}`
+    : formattedIntegerPart;
 }
 
 /**
@@ -82,5 +91,10 @@ export function formatAmount(locale: string, amount: BigNumber): string {
 
   return new Intl.NumberFormat(locale, {
     maximumFractionDigits,
-  } as Intl.NumberFormatOptions).format(amount.toNumber());
+  } as Intl.NumberFormatOptions).format(
+    // string is valid parameter for format function
+    // for some reason it gives TS issue
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/format#number
+    amount.toFixed(maximumFractionDigits) as unknown as number,
+  );
 }

From 71db1ebedbf984e164fccc2434c5aa7c8099c61d Mon Sep 17 00:00:00 2001
From: Monte Lai <monte.lai@consensys.net>
Date: Mon, 19 Aug 2024 22:40:54 +0800
Subject: [PATCH 196/236] Version v12.1.0 cherrypick 43b8031 (#26158)

---
 .../app-header/app-header-locked-content.tsx  |  9 +-
 .../app-header-unlocked-content.tsx           | 11 +--
 .../multichain/app-header/app-header.js       | 13 +--
 .../multichain/app-header/app-header.test.js  | 58 ++++++++++++-
 .../token-list-item.test.js.snap              |  2 +-
 .../__snapshots__/asset-page.test.tsx.snap    |  6 +-
 .../confirm-send-ether.test.js.snap           |  2 +-
 ui/selectors/multichain.test.ts               | 60 ++++++++++++--
 ui/selectors/multichain.ts                    | 83 +++++++++++++++----
 9 files changed, 195 insertions(+), 49 deletions(-)

diff --git a/ui/components/multichain/app-header/app-header-locked-content.tsx b/ui/components/multichain/app-header/app-header-locked-content.tsx
index 9285529c8d39..9923b2d31281 100644
--- a/ui/components/multichain/app-header/app-header-locked-content.tsx
+++ b/ui/components/multichain/app-header/app-header-locked-content.tsx
@@ -6,13 +6,10 @@ import MetafoxLogo from '../../ui/metafox-logo';
 import { PickerNetwork } from '../../component-library';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { getTestNetworkBackgroundColor } from '../../../selectors';
-import {
-  MultichainProviderConfig,
-  ProviderConfigWithImageUrl,
-} from '../../../../shared/constants/multichain/networks';
+import { MultichainNetwork } from '../../../selectors/multichain';
 
 type AppHeaderLockedContentProps = {
-  currentNetwork: ProviderConfigWithImageUrl | MultichainProviderConfig;
+  currentNetwork: MultichainNetwork;
   networkOpenCallback: () => void;
 };
 
@@ -36,7 +33,7 @@ export const AppHeaderLockedContent = ({
           }}
           aria-label={`${t('networkMenu')} ${currentNetwork?.nickname}`}
           label={currentNetwork?.nickname ?? ''}
-          src={currentNetwork?.rpcPrefs?.imageUrl}
+          src={currentNetwork?.network?.rpcPrefs?.imageUrl}
           onClick={(e: React.MouseEvent<HTMLElement>) => {
             e.stopPropagation();
             e.preventDefault();
diff --git a/ui/components/multichain/app-header/app-header-unlocked-content.tsx b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
index 2be2d5ffd342..03e73b6e757d 100644
--- a/ui/components/multichain/app-header/app-header-unlocked-content.tsx
+++ b/ui/components/multichain/app-header/app-header-unlocked-content.tsx
@@ -51,16 +51,13 @@ import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { MINUTE } from '../../../../shared/constants/time';
 import { NotificationsTagCounter } from '../notifications-tag-counter';
-import {
-  MultichainProviderConfig,
-  ProviderConfigWithImageUrl,
-} from '../../../../shared/constants/multichain/networks';
 import { CONNECTIONS } from '../../../helpers/constants/routes';
+import { MultichainNetwork } from '../../../selectors/multichain';
 
 type AppHeaderUnlockedContentProps = {
   popupStatus: boolean;
   isEvmNetwork: boolean;
-  currentNetwork: ProviderConfigWithImageUrl | MultichainProviderConfig;
+  currentNetwork: MultichainNetwork;
   networkOpenCallback: () => void;
   disableNetworkPicker: boolean;
   disableAccountPicker: boolean;
@@ -135,7 +132,7 @@ export const AppHeaderUnlockedContent = ({
               className="multichain-app-header__contents--avatar-network"
               ref={menuRef}
               as="button"
-              src={currentNetwork?.rpcPrefs?.imageUrl ?? ''}
+              src={currentNetwork?.network?.rpcPrefs?.imageUrl ?? ''}
               label={currentNetwork?.nickname ?? ''}
               aria-label={`${t('networkMenu')} ${currentNetwork?.nickname}`}
               labelProps={{
@@ -162,7 +159,7 @@ export const AppHeaderUnlockedContent = ({
             margin={2}
             aria-label={`${t('networkMenu')} ${currentNetwork?.nickname}`}
             label={currentNetwork?.nickname ?? ''}
-            src={currentNetwork?.rpcPrefs?.imageUrl}
+            src={currentNetwork?.network?.rpcPrefs?.imageUrl}
             onClick={(e: React.MouseEvent<HTMLElement>) => {
               e.stopPropagation();
               e.preventDefault();
diff --git a/ui/components/multichain/app-header/app-header.js b/ui/components/multichain/app-header/app-header.js
index 45f05aadff86..87935e70ccb3 100644
--- a/ui/components/multichain/app-header/app-header.js
+++ b/ui/components/multichain/app-header/app-header.js
@@ -40,13 +40,8 @@ export const AppHeader = ({ location }) => {
   const menuRef = useRef(null);
   const isUnlocked = useSelector(getIsUnlocked);
 
-  const {
-    chainId,
-    // Used for network icon / dropdown
-    network: currentNetwork,
-    // Used for network icon / dropdown
-    isEvmNetwork,
-  } = useSelector(getMultichainNetwork);
+  const multichainNetwork = useSelector(getMultichainNetwork);
+  const { chainId, isEvmNetwork } = multichainNetwork;
 
   const dispatch = useDispatch();
 
@@ -149,7 +144,7 @@ export const AppHeader = ({ location }) => {
               <AppHeaderUnlockedContent
                 popupStatus={popupStatus}
                 isEvmNetwork={isEvmNetwork}
-                currentNetwork={currentNetwork}
+                currentNetwork={multichainNetwork}
                 networkOpenCallback={networkOpenCallback}
                 disableNetworkPicker={disableNetworkPicker}
                 disableAccountPicker={disableAccountPicker}
@@ -157,7 +152,7 @@ export const AppHeader = ({ location }) => {
               />
             ) : (
               <AppHeaderLockedContent
-                currentNetwork={currentNetwork}
+                currentNetwork={multichainNetwork}
                 networkOpenCallback={networkOpenCallback}
               />
             )}
diff --git a/ui/components/multichain/app-header/app-header.test.js b/ui/components/multichain/app-header/app-header.test.js
index 5b74f17858cd..d72d65510d96 100644
--- a/ui/components/multichain/app-header/app-header.test.js
+++ b/ui/components/multichain/app-header/app-header.test.js
@@ -23,6 +23,8 @@ jest.mock('react-router-dom', () => ({
 
 const render = ({
   stateChanges = {},
+  provider = {},
+  networkConfigurations = {},
   location = {},
   isUnlocked = true,
 } = {}) => {
@@ -30,12 +32,20 @@ const render = ({
     ...mockState,
     metamask: {
       ...mockState.metamask,
-      isUnlocked,
+      providerConfig: {
+        ...mockState.metamask.providerConfig,
+        ...(provider ?? {}),
+      },
+      networkConfigurations: {
+        ...mockState.metamask.networkConfigurations,
+        ...(networkConfigurations ?? {}),
+      },
+      isUnlocked: isUnlocked ?? true,
     },
     activeTab: {
       origin: 'https://remix.ethereum.org',
     },
-    ...stateChanges,
+    ...(stateChanges ?? {}),
   });
   return renderWithProvider(<AppHeader location={location} />, store);
 };
@@ -175,4 +185,48 @@ describe('App Header', () => {
       expect(connectionPickerButton).not.toBeInTheDocument();
     });
   });
+
+  describe('network picker', () => {
+    it('shows custom rpc if it has the same chainId as a default network', () => {
+      const mockProviderConfig = {
+        id: 'custom-rpc-localhost',
+        type: 'rpc',
+        ticker: 'ETH',
+        chainId: '0x1',
+        rpcUrl: 'https://localhost:8545',
+        nickname: 'Localhost',
+      };
+      const mockNetworkConfigurations = {
+        [mockProviderConfig.id]: mockProviderConfig,
+      };
+
+      const { getByText } = render({
+        provider: mockProviderConfig,
+        networkConfigurations: mockNetworkConfigurations,
+        isUnlocked: true,
+      });
+      expect(getByText(mockProviderConfig.nickname)).toBeInTheDocument();
+    });
+
+    it("shows rpc url as nickname if there isn't a nickname set", () => {
+      const mockProviderConfig = {
+        id: 'custom-rpc-localhost',
+        type: 'rpc',
+        ticker: 'ETH',
+        chainId: '0x1',
+        rpcUrl: 'https://localhost:8545',
+        nickname: null,
+      };
+      const mockNetworkConfigurations = {
+        [mockProviderConfig.id]: mockProviderConfig,
+      };
+
+      const { getByText } = render({
+        provider: mockProviderConfig,
+        networkConfigurations: mockNetworkConfigurations,
+        isUnlocked: true,
+      });
+      expect(getByText(mockProviderConfig.rpcUrl)).toBeInTheDocument();
+    });
+  });
 });
diff --git a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
index a80941b84c1a..b209e4d0603d 100644
--- a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
+++ b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
@@ -26,7 +26,7 @@ exports[`TokenListItem should render correctly 1`] = `
             class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-muted box--border-style-solid box--border-width-1"
           >
             <img
-              alt="Ethereum Mainnet logo"
+              alt="network logo"
               class="mm-avatar-network__network-image"
               src="./images/eth_logo.svg"
             />
diff --git a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
index fe4e339f903b..88be64f74f37 100644
--- a/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
+++ b/ui/pages/asset/components/__snapshots__/asset-page.test.tsx.snap
@@ -192,7 +192,7 @@ exports[`AssetPage should render a native asset 1`] = `
                 class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-muted box--border-style-solid box--border-width-1"
               >
                 <img
-                  alt="Ethereum Mainnet logo"
+                  alt="network logo"
                   class="mm-avatar-network__network-image"
                   src="./images/eth_logo.svg"
                 />
@@ -476,7 +476,7 @@ exports[`AssetPage should render an ERC20 asset without prices 1`] = `
                 class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-muted box--border-style-solid box--border-width-1"
               >
                 <img
-                  alt="Ethereum Mainnet logo"
+                  alt="network logo"
                   class="mm-avatar-network__network-image"
                   src="./images/eth_logo.svg"
                 />
@@ -953,7 +953,7 @@ exports[`AssetPage should render an ERC20 token with prices 1`] = `
                 class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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-border-muted box--border-style-solid box--border-width-1"
               >
                 <img
-                  alt="Ethereum Mainnet logo"
+                  alt="network logo"
                   class="mm-avatar-network__network-image"
                   src="./images/eth_logo.svg"
                 />
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 0e472aad11db..41fa86d0e454 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
@@ -302,7 +302,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
                 <div
                   class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-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"
                 >
-                  C
+                  g
                 </div>
               </div>
               <span
diff --git a/ui/selectors/multichain.test.ts b/ui/selectors/multichain.test.ts
index cbdaf3f627e2..37df8a5d5235 100644
--- a/ui/selectors/multichain.test.ts
+++ b/ui/selectors/multichain.test.ts
@@ -1,6 +1,9 @@
 import { Cryptocurrency } from '@metamask/assets-controllers';
 import { InternalAccount } from '@metamask/keyring-api';
-import { getNativeCurrency } from '../ducks/metamask/metamask';
+import {
+  getNativeCurrency,
+  getProviderConfig,
+} from '../ducks/metamask/metamask';
 import {
   MULTICHAIN_PROVIDER_CONFIGS,
   MultichainNetworks,
@@ -12,7 +15,14 @@ import {
   MOCK_ACCOUNT_BIP122_P2WPKH,
   MOCK_ACCOUNT_BIP122_P2WPKH_TESTNET,
 } from '../../test/data/mock-accounts';
-import { CHAIN_IDS, TEST_NETWORK_IDS } from '../../shared/constants/network';
+
+import {
+  CHAIN_IDS,
+  ETH_TOKEN_IMAGE_URL,
+  MAINNET_DISPLAY_NAME,
+  TEST_NETWORK_IDS,
+} from '../../shared/constants/network';
+
 import { MultichainNativeAssets } from '../../shared/constants/multichain/assets';
 import { AccountsState } from './accounts';
 import {
@@ -32,7 +42,6 @@ import {
 } from './multichain';
 import {
   getCurrentCurrency,
-  getCurrentNetwork,
   getSelectedAccountCachedBalance,
   getShouldShowFiat,
 } from '.';
@@ -156,6 +165,47 @@ describe('Multichain Selectors', () => {
       const network = getMultichainNetwork(state);
       expect(network.isEvmNetwork).toBe(true);
     });
+
+    it('returns a EVM network with the correct network image', () => {
+      const state = getEvmState();
+
+      const network = getMultichainNetwork(state);
+      expect(network.network.rpcPrefs?.imageUrl).toBe(ETH_TOKEN_IMAGE_URL);
+    });
+
+    it('returns a nickname for default networks', () => {
+      const state = getEvmState();
+
+      const network = getMultichainNetwork(state);
+      expect(network.nickname).toBe(MAINNET_DISPLAY_NAME);
+    });
+
+    it('returns rpcUrl as its nickname if its not defined', () => {
+      const mockNetworkRpc = 'https://mock-rpc.com';
+      const mockNetwork = {
+        id: 'mock-network',
+        type: 'rpc',
+        ticker: 'MOCK',
+        chainId: '0x123123123',
+        rpcUrl: mockNetworkRpc,
+        // `nickname` is undefined here
+      };
+
+      const state = {
+        ...getEvmState(),
+        metamask: {
+          ...getEvmState().metamask,
+          providerConfig: mockNetwork,
+          networkConfigurations: {
+            [mockNetwork.id]: mockNetwork,
+          },
+        },
+      };
+
+      const network = getMultichainNetwork(state);
+      expect(network.nickname).toBe(network.network.rpcUrl);
+      expect(network.nickname).toBe(mockNetworkRpc);
+    });
   });
 
   describe('getMultichainIsEvm', () => {
@@ -176,9 +226,7 @@ describe('Multichain Selectors', () => {
     it('returns a ProviderConfig if account is EVM', () => {
       const state = getEvmState();
 
-      // NOTE: We do fallback to `getCurrentNetwork` (using the "original" list
-      // of network) when using EVM context, so check against this value here
-      const evmMainnetNetwork = getCurrentNetwork(state);
+      const evmMainnetNetwork = getProviderConfig(state);
       expect(getMultichainProviderConfig(state)).toBe(evmMainnetNetwork);
     });
 
diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
index ba2af4e3b3ac..cbe55a8ebdc9 100644
--- a/ui/selectors/multichain.ts
+++ b/ui/selectors/multichain.ts
@@ -1,8 +1,10 @@
 import { InternalAccount, isEvmAccountType } from '@metamask/keyring-api';
-import { ProviderConfig } from '@metamask/network-controller';
+import {
+  NetworkConfiguration,
+  ProviderConfig,
+} from '@metamask/network-controller';
 import type { RatesControllerState } from '@metamask/assets-controllers';
 import { CaipChainId, KnownCaipNamespace } from '@metamask/utils';
-import { ChainId } from '@metamask/controller-utils';
 import {
   MultichainProviderConfig,
   MULTICHAIN_PROVIDER_CONFIGS,
@@ -16,15 +18,22 @@ import {
 } from '../ducks/metamask/metamask';
 import { BalancesControllerState } from '../../app/scripts/lib/accounts/BalancesController';
 import { MultichainNativeAssets } from '../../shared/constants/multichain/assets';
-import { TEST_NETWORK_IDS } from '../../shared/constants/network';
+
+import {
+  CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP,
+  NETWORK_TO_NAME_MAP,
+  NETWORK_TYPES,
+  TEST_NETWORK_IDS,
+} from '../../shared/constants/network';
+
 import { AccountsState } from './accounts';
 import {
-  getAllNetworks,
   getCurrentChainId,
   getCurrentCurrency,
   getIsMainnet,
   getMaybeSelectedInternalAccount,
   getNativeCurrencyImage,
+  getNetworkConfigurations,
   getSelectedAccountCachedBalance,
   getSelectedInternalAccount,
   getShouldShowFiat,
@@ -41,11 +50,19 @@ export type BalancesState = {
 
 export type MultichainState = AccountsState & RatesState & BalancesState;
 
+// TODO: Remove after updating to @metamask/network-controller 20.0.0
+export type ProviderConfigWithImageUrlAndExplorerUrl = ProviderConfig & {
+  rpcPrefs?: { blockExplorerUrl?: string; imageUrl?: string };
+};
+
+// TODO: Remove after updating to @metamask/network-controller 20.0.0
+export type NetworkConfigurationWithId = NetworkConfiguration & { id: string };
+
 export type MultichainNetwork = {
   nickname: string;
   isEvmNetwork: boolean;
-  chainId?: CaipChainId;
-  network: ProviderConfig | MultichainProviderConfig;
+  chainId: CaipChainId;
+  network: ProviderConfigWithImageUrlAndExplorerUrl | MultichainProviderConfig;
 };
 
 export function getMultichainNetworkProviders(
@@ -61,17 +78,55 @@ export function getMultichainNetwork(
 ): MultichainNetwork {
   const isEvm = getMultichainIsEvm(state, account);
 
-  // EVM networks
-  const evmNetworks: ProviderConfig[] = getAllNetworks(state);
-  const evmChainId: ChainId = getCurrentChainId(state);
-
   if (isEvm) {
-    const evmNetwork: ProviderConfig =
-      evmNetworks.find((provider) => provider.chainId === evmChainId) ??
-      getProviderConfig(state); // We fallback to the original selector otherwise
+    // EVM networks
+    const evmChainId: string = getCurrentChainId(state);
+
+    // TODO: Update to use network configurations when @metamask/network-controller is updated to 20.0.0
+    // ProviderConfig will be deprecated to use NetworkConfigurations
+    // When a user updates a network name its only updated in the NetworkConfigurations.
+    const evmNetwork: ProviderConfigWithImageUrlAndExplorerUrl =
+      getProviderConfig(state);
+    // Fallback to a known network image if network configuration does not defined it
+    const evmChainIdKey =
+      evmChainId as keyof typeof CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP;
+    if (
+      !evmNetwork?.rpcPrefs?.imageUrl &&
+      evmChainIdKey in CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP
+    ) {
+      evmNetwork.rpcPrefs = {
+        ...evmNetwork.rpcPrefs,
+        imageUrl: CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP[evmChainIdKey],
+      };
+    }
+
+    let nickname;
+    if (evmNetwork.type === NETWORK_TYPES.RPC) {
+      // These are custom networks defined by the user.
+      // If there aren't any nicknames, the RPC URL is displayed.
+
+      // Could be undefined for default configurations.
+      const evmNetworkConfigurations = getNetworkConfigurations(state);
+      const evmNetworkConfiguration =
+        // id will always be defined for custom networks.
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        evmNetworkConfigurations?.[evmNetwork.id!];
+      nickname =
+        evmNetworkConfiguration?.nickname ??
+        evmNetwork.nickname ??
+        // rpcUrl will always be defined for custom networks.
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        evmNetwork.rpcUrl!;
+    } else {
+      // These are the default networks, they do not have nicknames
+
+      // Nickname is "optional", so it might be undefined here
+      nickname = NETWORK_TO_NAME_MAP[evmNetwork.type];
+    }
 
     return {
-      nickname: 'Ethereum',
+      // Current behavior is to display RPC URL as nickname if its not defined.
+      nickname,
       isEvmNetwork: true,
       // We assume the chain ID is `string` or `number`, so we convert it to a
       // `Number` to be compliant with EIP155 CAIP chain ID

From 0072384b9fa6443d3c83d6bcefc0653ae4acc385 Mon Sep 17 00:00:00 2001
From: Jyoti Puri <jyotipuri@gmail.com>
Date: Mon, 19 Aug 2024 20:30:11 +0530
Subject: [PATCH 197/236] cherry-pick: Update @blockaid/ppom_release to release
 1.5.2 (#26499)
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 @blockaid/ppom_release to release 1.5.2

## **Related issues**

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

## **Manual testing steps**

1. Go to test dapp
2. Submit confirmations
3. Ensure validation works as expected

## **Screenshots/Recordings**
NA

## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 package.json                                         |  2 +-
 .../__snapshots__/blockaid-banner-alert.test.js.snap | 12 ++++++------
 yarn.lock                                            | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 52baa56a49d0..5c22c769c57d 100644
--- a/package.json
+++ b/package.json
@@ -262,7 +262,7 @@
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
-    "@blockaid/ppom_release": "^1.5.1",
+    "@blockaid/ppom_release": "^1.5.2",
     "@contentful/rich-text-html-renderer": "^16.3.5",
     "@ensdomains/content-hash": "^2.5.7",
     "@ethereumjs/tx": "^4.1.1",
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 da55738715fa..127e733ad95d 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
@@ -54,7 +54,7 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo
                 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.5.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Malicious%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%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"
                 >
@@ -151,7 +151,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.5.1%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
                   rel="noopener noreferrer"
                   target="_blank"
                 >
@@ -248,7 +248,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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.5.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%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"
                 >
@@ -346,7 +346,7 @@ exports[`Blockaid Banner Alert should render details section even when features
                   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.5.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%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"
                   >
@@ -457,7 +457,7 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
                   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.5.1%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"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%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"
                   >
@@ -556,7 +556,7 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
                   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.5.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
+                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%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"
                   >
diff --git a/yarn.lock b/yarn.lock
index ce71ce1b2bb6..bb84c4797c2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1710,10 +1710,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@blockaid/ppom_release@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "@blockaid/ppom_release@npm:1.5.1"
-  checksum: 10/e2283240e484b60525501772bc5c57e86a30eb153227168eb52584061ac7e10c717bb4a858bfcf0bbdd590033675c193a3a41de2658d066baef210ec48ed7a6e
+"@blockaid/ppom_release@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "@blockaid/ppom_release@npm:1.5.2"
+  checksum: 10/b47af74e8a315d996abb8371a7b28f9923bf78272cc408b2307024e2050b57f36c53b6b9a57b276b0910b449ebb384897e293abad356131ccf65c6c3c5ca31ae
   languageName: node
   linkType: hard
 
@@ -25239,7 +25239,7 @@ __metadata:
     "@babel/preset-typescript": "npm:^7.23.2"
     "@babel/register": "npm:^7.22.15"
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch"
-    "@blockaid/ppom_release": "npm:^1.5.1"
+    "@blockaid/ppom_release": "npm:^1.5.2"
     "@contentful/rich-text-html-renderer": "npm:^16.3.5"
     "@ensdomains/content-hash": "npm:^2.5.7"
     "@ethereumjs/tx": "npm:^4.1.1"

From 621d39cb5640502c53f90a9fba2f00859bfdd7d5 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Mon, 19 Aug 2024 11:04:28 -0400
Subject: [PATCH 198/236] feat: [cherry-pick][V12.1.0] Permit ellipsis fix
 (2/3) - show ellipsis at max 15 digits (#26500)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Cherry-pick feat: Update Redesign Signature Permit to show ellipsis at
max 15 digits (#26227) into Version-v12.1.0

`+2 +(-1)`line delta comes from
`ui/pages/confirmations/confirm/confirm.test.tsx` snapshot update

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26500?quickstart=1)

## **Related issues**

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2845 (Permit
design review)
Fixes: https://github.com/MetaMask/metamask-extension/issues/26226
(Ellipsis fix)
Fixes: https://github.com/MetaMask/MetaMask-planning/issues/2730 (older,
original issue)

## **Manual testing steps**


1. Go to cowswap
2. Swap a token with gas-free approve for another token
3. Notice the permit signature screen

or

1. run `yarn storybook`
2. go to
http://localhost:6006/?path=/story/pages-confirmations-confirm-signatures-signedtypeddatav3orv4--permit-story&args=msgParams.data:3.0001231231212312e+22
3. copy and paste the following into data
```
"{\"types\":{\"EIP712Domain\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"version\",\"type\":\"string\"},{\"name\":\"chainId\",\"type\":\"uint256\"},{\"name\":\"verifyingContract\",\"type\":\"address\"}],\"Permit\":[{\"name\":\"owner\",\"type\":\"address\"},{\"name\":\"spender\",\"type\":\"address\"},{\"name\":\"value\",\"type\":\"uint256\"},{\"name\":\"nonce\",\"type\":\"uint256\"},{\"name\":\"deadline\",\"type\":\"uint256\"}]},\"primaryType\":\"Permit\",\"domain\":{\"name\":\"MyToken\",\"version\":\"1\",\"verifyingContract\":\"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC\",\"chainId\":1},\"message\":{\"owner\":\"0x935e73edb9ff52e23bac7f7e043a1ecd06d05477\",\"spender\":\"0x5B38Da6a701c568545dCfcB03FcB875f56beddC4\",\"value\":30001231231212312138768,\"nonce\":0,\"deadline\":50000000000}}"
```

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

<img width="520"

src="https://github.com/user-attachments/assets/1b6e45cb-f54b-45e5-968c-141359de7466">
<img width="320"

src="https://github.com/user-attachments/assets/804d4e8a-1c47-470e-88a4-c6195c5cf96e">

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../info/row/text-token-units.test.tsx        |  32 +++++-
 .../app/confirm/info/row/text-token-units.tsx |   6 +-
 ui/components/app/confirm/info/row/text.tsx   |  20 +---
 .../__snapshots__/typed-sign.test.tsx.snap    |   3 +-
 .../permit-simulation.test.tsx.snap           |   2 +-
 .../permit-simulation/permit-simulation.tsx   |   4 +-
 .../simulation-details/formatAmount.test.ts   | 103 +++++++++++-------
 .../simulation-details/formatAmount.ts        |  40 +++++++
 8 files changed, 142 insertions(+), 68 deletions(-)

diff --git a/ui/components/app/confirm/info/row/text-token-units.test.tsx b/ui/components/app/confirm/info/row/text-token-units.test.tsx
index ee352d57acce..d25b23a52010 100644
--- a/ui/components/app/confirm/info/row/text-token-units.test.tsx
+++ b/ui/components/app/confirm/info/row/text-token-units.test.tsx
@@ -10,10 +10,19 @@ describe('ConfirmInfoRowTextTokenUnits', () => {
       <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
     );
 
-    // Note: using formatAmount loses precision
     expect(getByText('0.0123')).toBeInTheDocument();
   });
 
+  it('renders the value with the correct formatted number for lengthy decimals', () => {
+    const value = '300012312312123121';
+    const decimals = 18;
+    const { getByText } = render(
+      <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
+    );
+
+    expect(getByText('0.3')).toBeInTheDocument();
+  });
+
   it('renders the value with the correct formatted non-fractional number', () => {
     const value = 123456789;
     const decimals = 4;
@@ -21,7 +30,26 @@ describe('ConfirmInfoRowTextTokenUnits', () => {
       <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
     );
 
-    // Note: using formatAmount loses precision
     expect(getByText('12,346')).toBeInTheDocument();
   });
+
+  it('renders the value with the correct formatted number', () => {
+    const value = '30001231231212312138768';
+    const decimals = 9;
+    const { getByText } = render(
+      <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
+    );
+
+    expect(getByText('30,001,231,231,212')).toBeInTheDocument();
+  });
+
+  it('renders the value with the correct formatted number and ellipsis', () => {
+    const value = '30001231231212312138768';
+    const decimals = 7;
+    const { getByText } = render(
+      <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
+    );
+
+    expect(getByText('3,000,123,123,121,23...')).toBeInTheDocument();
+  });
 });
diff --git a/ui/components/app/confirm/info/row/text-token-units.tsx b/ui/components/app/confirm/info/row/text-token-units.tsx
index 62d0bb38e664..bd7fbc52c195 100644
--- a/ui/components/app/confirm/info/row/text-token-units.tsx
+++ b/ui/components/app/confirm/info/row/text-token-units.tsx
@@ -3,6 +3,7 @@ import { BigNumber } from 'bignumber.js';
 
 import { calcTokenAmount } from '../../../../../../shared/lib/transactions-controller-utils';
 import {
+  ellipsisAmountText,
   formatAmount,
   formatAmountMaxPrecision,
 } from '../../../../../pages/confirmations/components/simulation-details/formatAmount';
@@ -18,15 +19,12 @@ export const ConfirmInfoRowTextTokenUnits: React.FC<
 > = ({ value, decimals }) => {
   const tokenValue = calcTokenAmount(value, decimals);
 
-  // FIXME - Precision may be lost for large values when using formatAmount
-  /** @see {@link https://github.com/MetaMask/metamask-extension/issues/25755} */
   const tokenText = formatAmount('en-US', tokenValue);
   const tokenTextMaxPrecision = formatAmountMaxPrecision('en-US', tokenValue);
 
   return (
     <ConfirmInfoRowText
-      isEllipsis={true}
-      text={tokenText}
+      text={ellipsisAmountText(tokenText)}
       tooltip={tokenTextMaxPrecision}
     />
   );
diff --git a/ui/components/app/confirm/info/row/text.tsx b/ui/components/app/confirm/info/row/text.tsx
index a93b053dd80e..23750d8836bc 100644
--- a/ui/components/app/confirm/info/row/text.tsx
+++ b/ui/components/app/confirm/info/row/text.tsx
@@ -11,18 +11,8 @@ import {
 import { Box, ButtonIcon, IconName, Text } from '../../../../component-library';
 import Tooltip from '../../../../ui/tooltip';
 
-const InfoText = ({
-  isEllipsis,
-  text,
-}: {
-  isEllipsis: boolean;
-  text: string;
-}) => (
-  <Text
-    color={TextColor.inherit}
-    style={isEllipsis ? {} : { whiteSpace: 'pre-wrap' }}
-    ellipsis={isEllipsis}
-  >
+const InfoText = ({ text }: { text: string }) => (
+  <Text color={TextColor.inherit} style={{ whiteSpace: 'pre-wrap' }}>
     {text}
   </Text>
 );
@@ -31,14 +21,12 @@ export type ConfirmInfoRowTextProps = {
   text: string;
   onEditClick?: () => void;
   editIconClassName?: string;
-  isEllipsis?: boolean;
   tooltip?: string;
 };
 
 export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
   text,
   onEditClick,
-  isEllipsis = false,
   editIconClassName,
   tooltip,
 }) => {
@@ -61,10 +49,10 @@ export const ConfirmInfoRowText: React.FC<ConfirmInfoRowTextProps> = ({
           wrapperStyle={{ minWidth: 0 }}
           interactive
         >
-          <InfoText isEllipsis={isEllipsis} text={text} />
+          <InfoText text={text} />
         </Tooltip>
       ) : (
-        <InfoText isEllipsis={isEllipsis} text={text} />
+        <InfoText text={text} />
       )}
       {isEditable ? (
         <ButtonIcon
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index 1d52c4c47392..9da7d9d6619c 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -409,7 +409,8 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
                     tabindex="0"
                   >
                     <p
-                      class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-box--color-inherit"
+                      class="mm-box mm-text mm-text--body-md mm-box--color-inherit"
+                      style="white-space: pre-wrap;"
                     >
                       3,000
                     </p>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
index a671b24d02a7..47d715b01d8c 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -79,7 +79,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
                 tabindex="0"
               >
                 <p
-                  class="mm-box mm-text mm-text--body-md mm-text--ellipsis mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+                  class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
                 >
                   30
                 </p>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index 02a91ce95afc..dbbe560ce0d9 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -25,6 +25,7 @@ import { SignatureRequestType } from '../../../../../types/confirm';
 import useTokenExchangeRate from '../../../../../../../components/app/currency-input/hooks/useTokenExchangeRate';
 import { IndividualFiatDisplay } from '../../../../simulation-details/fiat-display';
 import {
+  ellipsisAmountText,
   formatAmount,
   formatAmountMaxPrecision,
 } from '../../../../simulation-details/formatAmount';
@@ -88,9 +89,8 @@ const PermitSimulation: React.FC<{
                   borderRadius={BorderRadius.XL}
                   paddingInline={2}
                   textAlign={TextAlign.Center}
-                  ellipsis
                 >
-                  {tokenValue}
+                  {ellipsisAmountText(tokenValue || '')}
                 </Text>
               </Tooltip>
             </Box>
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
index 7f73e0ab42fc..4a39cc5dfa15 100644
--- a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
@@ -1,51 +1,70 @@
 import { BigNumber } from 'bignumber.js';
-import { formatAmount } from './formatAmount';
+import { ellipsisAmountText, formatAmount } from './formatAmount';
 
 describe('formatAmount', () => {
-  const locale = 'en-US';
+  describe('#ellipsisAmountText', () => {
+    const MOCK_MAX_LEFT_DIGITS = 15;
 
-  it('returns "0" for zero amount', () => {
-    expect(formatAmount(locale, new BigNumber(0))).toBe('0');
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each([
+      ['1.003', '1.003'],
+      ['1,034', '1,034'],
+      ['1,213,098,292,340,945', '1,213,098,292,340,94...'],
+      ['30,001,231,231,212,312,138,768', '30,001,231,231,212,3...'],
+    ])(
+      'formats amount greater than or equal to 1 with appropriate decimal precision (%s => %s)',
+      (amount: string, expected: string) => {
+        expect(ellipsisAmountText(amount, MOCK_MAX_LEFT_DIGITS)).toBe(expected);
+      },
+    );
   });
 
-  it('returns "<0.000001" for 0 < amount < MIN_AMOUNT', () => {
-    expect(formatAmount(locale, new BigNumber(0.0000009))).toBe('<0.000001');
-  });
+  describe('#formatAmount', () => {
+    const locale = 'en-US';
+
+    it('returns "0" for zero amount', () => {
+      expect(formatAmount(locale, new BigNumber(0))).toBe('0');
+    });
 
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each([
-    [0.0000456, '0.000046'],
-    [0.0004567, '0.000457'],
-    [0.003456, '0.00346'],
-    [0.023456, '0.0235'],
-    [0.125456, '0.125'],
-  ])(
-    'formats amount less than 1 with maximum significant digits (%s => %s)',
-    (amount: number, expected: string) => {
-      expect(formatAmount(locale, new BigNumber(amount))).toBe(expected);
-    },
-  );
+    it('returns "<0.000001" for 0 < amount < MIN_AMOUNT', () => {
+      expect(formatAmount(locale, new BigNumber(0.0000009))).toBe('<0.000001');
+    });
 
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each([
-    [1.0034, '1.003'],
-    [1.034, '1.034'],
-    [1.3034, '1.303'],
-    [12.0345, '12.03'],
-    [121.456, '121.5'],
-    [1034.123, '1,034'],
-    [47361034.006, '47,361,034'],
-    ['12130982923409.5', '12,130,982,923,410'],
-    ['1213098292340944.5', '1,213,098,292,340,945'],
-    ['30001231231212312138768', '30,001,231,231,212,312,138,768'],
-    [
-      '1157920892373161954235709850086879078532699846656405640394575.84007913129639935',
-      '1,157,920,892,373,161,954,235,709,850,086,879,078,532,699,846,656,405,640,394,576',
-    ],
-  ])(
-    'formats amount greater than or equal to 1 with appropriate decimal precision (%s => %s)',
-    (amount: number, expected: string) => {
-      expect(formatAmount(locale, new BigNumber(amount))).toBe(expected);
-    },
-  );
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each([
+      [0.0000456, '0.000046'],
+      [0.0004567, '0.000457'],
+      [0.003456, '0.00346'],
+      [0.023456, '0.0235'],
+      [0.125456, '0.125'],
+    ])(
+      'formats amount less than 1 with maximum significant digits (%s => %s)',
+      (amount: number, expected: string) => {
+        expect(formatAmount(locale, new BigNumber(amount))).toBe(expected);
+      },
+    );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each([
+      [1.0034, '1.003'],
+      [1.034, '1.034'],
+      [1.3034, '1.303'],
+      [12.0345, '12.03'],
+      [121.456, '121.5'],
+      [1034.123, '1,034'],
+      [47361034.006, '47,361,034'],
+      ['12130982923409.5', '12,130,982,923,410'],
+      ['1213098292340944.5', '1,213,098,292,340,945'],
+      ['30001231231212312138768', '30,001,231,231,212,312,138,768'],
+      [
+        '1157920892373161954235709850086879078532699846656405640394575.84007913129639935',
+        '1,157,920,892,373,161,954,235,709,850,086,879,078,532,699,846,656,405,640,394,576',
+      ],
+    ])(
+      'formats amount greater than or equal to 1 with appropriate decimal precision (%s => %s)',
+      (amount: number, expected: string) => {
+        expect(formatAmount(locale, new BigNumber(amount))).toBe(expected);
+      },
+    );
+  });
 });
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
index 213b55d52083..8e63c44aa0bc 100644
--- a/ui/pages/confirmations/components/simulation-details/formatAmount.ts
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
@@ -4,11 +4,51 @@ import {
   DEFAULT_PRECISION,
 } from '../../../../hooks/useCurrencyDisplay';
 
+const MAX_ELLIPSIS_LEFT_DIGITS = 15;
+
 // The number of significant decimals places to show for amounts less than 1.
 const MAX_SIGNIFICANT_DECIMAL_PLACES = 3;
 
 const ZERO_DISPLAY = '0';
 
+/**
+ * This function receives an formatted number and will append an ellipsis if the number of digits
+ * is greater than MAX_LEFT_DIGITS. Currently, we're only supporting en-US format. When we support
+ * i18n numbers, we'll need to update this method to support i18n.
+ *
+ * This method has been designed to receive results of formatAmount.
+ *
+ * There is no need to format the decimal portion because formatAmount shaves the portions off
+ * accordingly.
+ *
+ * @param amountText
+ * @param maxLeftDigits
+ */
+export function ellipsisAmountText(
+  amountText: string,
+  maxLeftDigits: number = MAX_ELLIPSIS_LEFT_DIGITS,
+): string {
+  const [integerPart] = amountText.split('.');
+  const cleanIntegerPart = integerPart.replace(/,/gu, '');
+
+  if (cleanIntegerPart.length > maxLeftDigits) {
+    let result = '';
+    let digitCount = 0;
+
+    for (let i = 0; digitCount < maxLeftDigits; i++) {
+      const integerChar = integerPart[i];
+      result += integerChar;
+      if (integerChar !== ',') {
+        digitCount += 1;
+      }
+    }
+
+    return `${result}...`;
+  }
+
+  return amountText;
+}
+
 export function formatAmountMaxPrecision(
   locale: string,
   num: number | BigNumber,

From 6188c5cd324e9147696e6598a25850564e24ce72 Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Mon, 19 Aug 2024 18:19:11 +0200
Subject: [PATCH 199/236] cherry-pick: Add signature insights hotfix to RC
 (#26506)

## **Description**

Cherry-picks
https://github.com/MetaMask/metamask-extension/commit/ee8009f7cba59012e3bcad346da2e2d3f5c91371
to the 12.0.6 RC to fix a Sentry error triggered by `msgParams` being
undefined.

Co-authored-by: Hassan Malik <41640681+hmalik88@users.noreply.github.com>
---
 ui/hooks/snaps/useSignatureInsights.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/hooks/snaps/useSignatureInsights.js b/ui/hooks/snaps/useSignatureInsights.js
index ae5679466be3..c0e297fcb216 100644
--- a/ui/hooks/snaps/useSignatureInsights.js
+++ b/ui/hooks/snaps/useSignatureInsights.js
@@ -108,7 +108,7 @@ export function useSignatureInsights({ txData }) {
         }
       }
     }
-    if (Object.keys(txData).length > 0) {
+    if (Object.keys(txData).length > 0 && txData.msgParams !== undefined) {
       fetchInsight();
     }
     return () => {

From 32edb6dab32b5c907e830c680a1228eda70cc0b5 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:53:59 -0400
Subject: [PATCH 200/236] fix:[cherry-pick][V12.1.0] Permit ellipsis fixes
 (3/4) - add ellipsis for permit fiat values (#26001)  (#26515)
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**

Cherry-pick fix: add ellipsis for permit fiat values (#26001) into
v12.1.0

no line changes
<!--
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? -->
This PR goal is to add ellipsis to the fiat value if it's more than 15
character in permit simulations.


[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26001?quickstart=1)

## **Related issues**

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

## **Manual testing steps**

1. Go to cowswap
2. Swap a token with gas-free approve for another token
3. Notice the permit signature screen

## **Screenshots/Recordings**

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

### **Before**

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

### **After**



## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/26515?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: OGPoyraz <omergoktugpoyraz@gmail.com>
---
 ui/helpers/utils/util.js                      | 17 +++--
 ui/helpers/utils/util.test.js                 | 11 +++
 ui/hooks/useFiatFormatter.test.ts             | 41 ++++++++++-
 ui/hooks/useFiatFormatter.ts                  | 73 +++++++++++++++++--
 .../permit-simulation/permit-simulation.tsx   |  4 +-
 .../simulation-details/amount-pill.tsx        |  1 +
 .../simulation-details/fiat-display.tsx       | 14 ++--
 7 files changed, 143 insertions(+), 18 deletions(-)

diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index cae0ed769267..c68443d8c2fc 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -222,24 +222,30 @@ export function getRandomFileName() {
  * @param {number} options.truncatedCharLimit - The maximum length of the string.
  * @param {number} options.truncatedStartChars - The number of characters to preserve at the beginning.
  * @param {number} options.truncatedEndChars - The number of characters to preserve at the end.
+ * @param {boolean} options.skipCharacterInEnd - Skip the character at the end.
  * @returns {string} The shortened string.
  */
 export function shortenString(
   stringToShorten = '',
-  { truncatedCharLimit, truncatedStartChars, truncatedEndChars } = {
+  {
+    truncatedCharLimit,
+    truncatedStartChars,
+    truncatedEndChars,
+    skipCharacterInEnd,
+  } = {
     truncatedCharLimit: TRUNCATED_NAME_CHAR_LIMIT,
     truncatedStartChars: TRUNCATED_ADDRESS_START_CHARS,
     truncatedEndChars: TRUNCATED_ADDRESS_END_CHARS,
+    skipCharacterInEnd: false,
   },
 ) {
   if (stringToShorten.length < truncatedCharLimit) {
     return stringToShorten;
   }
 
-  return `${stringToShorten.slice(
-    0,
-    truncatedStartChars,
-  )}...${stringToShorten.slice(-truncatedEndChars)}`;
+  return `${stringToShorten.slice(0, truncatedStartChars)}...${
+    skipCharacterInEnd ? '' : stringToShorten.slice(-truncatedEndChars)
+  }`;
 }
 
 /**
@@ -258,6 +264,7 @@ export function shortenAddress(address = '') {
     truncatedCharLimit: TRUNCATED_NAME_CHAR_LIMIT,
     truncatedStartChars: TRUNCATED_ADDRESS_START_CHARS,
     truncatedEndChars: TRUNCATED_ADDRESS_END_CHARS,
+    skipCharacterInEnd: false,
   });
 }
 
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index 76811f432f81..2ad0db6e50a0 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -1081,5 +1081,16 @@ describe('util', () => {
         }),
       ).toStrictEqual('0x12...7890');
     });
+
+    it('should shorten the string and remove all characters from the end if skipCharacterInEnd is true', () => {
+      expect(
+        util.shortenString('0x1234567890123456789012345678901234567890', {
+          truncatedCharLimit: 10,
+          truncatedStartChars: 4,
+          truncatedEndChars: 4,
+          skipCharacterInEnd: true,
+        }),
+      ).toStrictEqual('0x12...');
+    });
   });
 });
diff --git a/ui/hooks/useFiatFormatter.test.ts b/ui/hooks/useFiatFormatter.test.ts
index bf7fc670b5ed..7e6423f1df34 100644
--- a/ui/hooks/useFiatFormatter.test.ts
+++ b/ui/hooks/useFiatFormatter.test.ts
@@ -35,6 +35,44 @@ describe('useFiatFormatter', () => {
     expect(formatFiat(0)).toBe('$0.00');
   });
 
+  describe('shorten the fiat', () => {
+    it('when currency symbol on the left for given locale', () => {
+      mockGetIntlLocale.mockReturnValue('en-US');
+      mockGetCurrentCurrency.mockReturnValue('USD');
+
+      const { result } = renderHook(() => useFiatFormatter());
+      const formatFiat = result.current;
+
+      expect(formatFiat(100000000000000000, { shorten: true })).toBe(
+        '$100,000,000,...',
+      );
+    });
+
+    it('when currency symbol on the right for given locale', () => {
+      mockGetIntlLocale.mockReturnValue('es-ES');
+      mockGetCurrentCurrency.mockReturnValue('EUR');
+
+      const { result } = renderHook(() => useFiatFormatter());
+      const formatFiat = result.current;
+
+      expect(formatFiat(100000000000000000, { shorten: true })).toBe(
+        '100.000.000....€',
+      );
+    });
+
+    it('handle unknown currencies by returning amount followed by currency code', () => {
+      mockGetCurrentCurrency.mockReturnValue('storj');
+      mockGetIntlLocale.mockReturnValue('en-US');
+
+      const { result } = renderHook(() => useFiatFormatter());
+      const formatFiat = result.current;
+
+      expect(formatFiat(100000, { shorten: true })).toBe('100,000 storj');
+      expect(formatFiat(500.5, { shorten: true })).toBe('500.5 storj');
+      expect(formatFiat(0, { shorten: true })).toBe('0 storj');
+    });
+  });
+
   it('should use the current locale and currency from the mocked functions', () => {
     mockGetIntlLocale.mockReturnValue('fr-FR');
     mockGetCurrentCurrency.mockReturnValue('EUR');
@@ -47,12 +85,13 @@ describe('useFiatFormatter', () => {
 
   it('should gracefully handle unknown currencies by returning amount followed by currency code', () => {
     mockGetCurrentCurrency.mockReturnValue('storj');
+    mockGetIntlLocale.mockReturnValue('en-US');
 
     const { result } = renderHook(() => useFiatFormatter());
     const formatFiat = result.current;
 
     // Testing the fallback formatting for an unknown currency
-    expect(formatFiat(1000)).toBe('1000 storj');
+    expect(formatFiat(100000)).toBe('100,000 storj');
     expect(formatFiat(500.5)).toBe('500.5 storj');
     expect(formatFiat(0)).toBe('0 storj');
   });
diff --git a/ui/hooks/useFiatFormatter.ts b/ui/hooks/useFiatFormatter.ts
index 0f5e37151670..0c9bd33ffee5 100644
--- a/ui/hooks/useFiatFormatter.ts
+++ b/ui/hooks/useFiatFormatter.ts
@@ -1,35 +1,98 @@
 import { useSelector } from 'react-redux';
 import { getIntlLocale } from '../ducks/locale/locale';
 import { getCurrentCurrency } from '../selectors';
+import { shortenString } from '../helpers/utils/util';
 
 /**
  * Returns a function that formats a fiat amount as a localized string.
+ * The hook takes an optional options object to configure the formatting.
  *
  * Example usage:
  *
  * ```
  * const formatFiat = useFiatFormatter();
  * const formattedAmount = formatFiat(1000);
+ *
+ * const shorteningFiatFormatter = useFiatFormatter();
+ * const shortenedAmount = shorteningFiatFormatter(100000000000000000, { shorten: true });
  * ```
  *
  * @returns A function that takes a fiat amount as a number and returns a formatted string.
  */
 
-type FiatFormatter = (fiatAmount: number) => string;
+const TRUNCATED_CHAR_LIMIT_FOR_SHORTENED_FIAT = 15;
+const TRUNCATED_START_CHARS_FOR_SHORTENED_FIAT = 12;
+
+type FiatFormatterOptions = {
+  shorten?: boolean;
+};
+
+type FiatFormatter = (
+  fiatAmount: number,
+  options?: FiatFormatterOptions,
+) => string;
 
 export const useFiatFormatter = (): FiatFormatter => {
   const locale = useSelector(getIntlLocale);
   const fiatCurrency = useSelector(getCurrentCurrency);
 
-  return (fiatAmount: number) => {
+  return (fiatAmount: number, options: FiatFormatterOptions = {}) => {
+    const { shorten } = options;
+
     try {
-      return new Intl.NumberFormat(locale, {
+      const formatter = new Intl.NumberFormat(locale, {
         style: 'currency',
         currency: fiatCurrency,
-      }).format(fiatAmount);
+      });
+
+      if (!shorten) {
+        return formatter.format(fiatAmount);
+      }
+
+      const parts = formatter.formatToParts(fiatAmount);
+
+      let currencySymbol = '';
+      let numberString = '';
+
+      parts.forEach((part) => {
+        if (part.type === 'currency') {
+          currencySymbol += part.value;
+        } else {
+          numberString += part.value;
+        }
+      });
+
+      // Shorten the number part while preserving commas
+      const shortenedNumberString = shortenString(numberString, {
+        truncatedCharLimit: TRUNCATED_CHAR_LIMIT_FOR_SHORTENED_FIAT,
+        truncatedStartChars: TRUNCATED_START_CHARS_FOR_SHORTENED_FIAT,
+        truncatedEndChars: 0,
+        skipCharacterInEnd: true,
+      });
+
+      // Determine the position of the currency symbol
+      const currencyBeforeNumber =
+        parts.findIndex((part) => part.type === 'currency') <
+        parts.findIndex((part) => part.type === 'integer');
+
+      // Reassemble the formatted string
+      return currencyBeforeNumber
+        ? `${currencySymbol}${shortenedNumberString}`
+        : `${shortenedNumberString}${currencySymbol}`;
     } catch (error) {
       // Fallback for unknown or unsupported currencies
-      return `${fiatAmount} ${fiatCurrency}`;
+      const formattedNumber = new Intl.NumberFormat(locale).format(fiatAmount);
+      const shortenedNumberString = shortenString(formattedNumber, {
+        truncatedCharLimit: TRUNCATED_CHAR_LIMIT_FOR_SHORTENED_FIAT,
+        truncatedStartChars: TRUNCATED_START_CHARS_FOR_SHORTENED_FIAT,
+        truncatedEndChars: 0,
+        skipCharacterInEnd: true,
+      });
+
+      if (shorten) {
+        return `${shortenedNumberString} ${fiatCurrency}`;
+      }
+      return `${formattedNumber} ${fiatCurrency}`;
     }
   };
 };
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index dbbe560ce0d9..b2a036370e10 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -97,7 +97,9 @@ const PermitSimulation: React.FC<{
             <Name value={verifyingContract} type={NameType.ETHEREUM_ADDRESS} />
           </Box>
           <Box>
-            {fiatValue && <IndividualFiatDisplay fiatAmount={fiatValue} />}
+            {fiatValue && (
+              <IndividualFiatDisplay fiatAmount={fiatValue} shorten />
+            )}
           </Box>
         </Box>
       </ConfirmInfoRow>
diff --git a/ui/pages/confirmations/components/simulation-details/amount-pill.tsx b/ui/pages/confirmations/components/simulation-details/amount-pill.tsx
index 5e86018f5e58..a8ad71cfadc6 100644
--- a/ui/pages/confirmations/components/simulation-details/amount-pill.tsx
+++ b/ui/pages/confirmations/components/simulation-details/amount-pill.tsx
@@ -59,6 +59,7 @@ export const AmountPill: React.FC<{
       truncatedCharLimit: 11,
       truncatedStartChars: 4,
       truncatedEndChars: 4,
+      skipCharacterInEnd: false,
     });
 
     const shortenedTokenIdPart = `#${shortenedDecimalTokenId}`;
diff --git a/ui/pages/confirmations/components/simulation-details/fiat-display.tsx b/ui/pages/confirmations/components/simulation-details/fiat-display.tsx
index 5143cd5ed06b..66e9148c676e 100644
--- a/ui/pages/confirmations/components/simulation-details/fiat-display.tsx
+++ b/ui/pages/confirmations/components/simulation-details/fiat-display.tsx
@@ -32,12 +32,14 @@ export function calculateTotalFiat(fiatAmounts: FiatAmount[]): number {
 /**
  * Displays the fiat value of a single balance change.
  *
- * @param props
- * @param props.fiatAmount
+ * @param props - The props object.
+ * @param props.fiatAmount - The fiat amount to display.
+ * @param props.shorten - Whether to shorten the fiat amount.
  */
-export const IndividualFiatDisplay: React.FC<{ fiatAmount: FiatAmount }> = ({
-  fiatAmount,
-}) => {
+export const IndividualFiatDisplay: React.FC<{
+  fiatAmount: FiatAmount;
+  shorten?: boolean;
+}> = ({ fiatAmount, shorten = false }) => {
   const hideFiatForTestnet = useHideFiatForTestnet();
   const fiatFormatter = useFiatFormatter();
 
@@ -50,7 +52,7 @@ export const IndividualFiatDisplay: React.FC<{ fiatAmount: FiatAmount }> = ({
   }
   const absFiat = Math.abs(fiatAmount);
 
-  return <Text {...textStyle}>{fiatFormatter(absFiat)}</Text>;
+  return <Text {...textStyle}>{fiatFormatter(absFiat, { shorten })}</Text>;
 };
 
 /**

From 071c4911410d93328a5a0e7843d948252091d5f2 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:17:51 -0400
Subject: [PATCH 201/236] fix: [cherry-pick][V12.1.0] Permit ellipsis fixes
 (4/4) - Permit ellipsis should use max 15 char (#26458) (#26516)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

Cherry-pick fix: Permit ellipsis should use max 15 char (#26458) into
v12.1.0

> Display max 15 characters, not max 15 digits, before ellipsis for
amounts shown in Permit pages. Updated to use `shortenString` here.

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

## **Related issues**

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

## **Manual testing steps**

1. Go to test-dapp
2. Trigger Malicious Permit request
3. Observe ellipsis values in a. spending cap in simulation b. value in
the message

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

There is a decimal issue that will be merged with another cherry-pick
<img width="320"
src="https://github.com/user-attachments/assets/e9c75347-b6e4-410b-b235-682c925313a3">

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: OGPoyraz <omergoktugpoyraz@gmail.com>
---
 .../info/row/text-token-units.test.tsx        |  4 +-
 .../app/confirm/info/row/text-token-units.tsx |  9 ++++-
 .../permit-simulation/permit-simulation.tsx   |  9 ++++-
 .../simulation-details/formatAmount.test.ts   | 19 +--------
 .../simulation-details/formatAmount.ts        | 40 -------------------
 5 files changed, 17 insertions(+), 64 deletions(-)

diff --git a/ui/components/app/confirm/info/row/text-token-units.test.tsx b/ui/components/app/confirm/info/row/text-token-units.test.tsx
index d25b23a52010..311ab0acd9c5 100644
--- a/ui/components/app/confirm/info/row/text-token-units.test.tsx
+++ b/ui/components/app/confirm/info/row/text-token-units.test.tsx
@@ -40,7 +40,7 @@ describe('ConfirmInfoRowTextTokenUnits', () => {
       <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
     );
 
-    expect(getByText('30,001,231,231,212')).toBeInTheDocument();
+    expect(getByText('30,001,231,231,...')).toBeInTheDocument();
   });
 
   it('renders the value with the correct formatted number and ellipsis', () => {
@@ -50,6 +50,6 @@ describe('ConfirmInfoRowTextTokenUnits', () => {
       <ConfirmInfoRowTextTokenUnits value={value} decimals={decimals} />,
     );
 
-    expect(getByText('3,000,123,123,121,23...')).toBeInTheDocument();
+    expect(getByText('3,000,123,123,1...')).toBeInTheDocument();
   });
 });
diff --git a/ui/components/app/confirm/info/row/text-token-units.tsx b/ui/components/app/confirm/info/row/text-token-units.tsx
index bd7fbc52c195..cb0a620c4b5e 100644
--- a/ui/components/app/confirm/info/row/text-token-units.tsx
+++ b/ui/components/app/confirm/info/row/text-token-units.tsx
@@ -3,10 +3,10 @@ import { BigNumber } from 'bignumber.js';
 
 import { calcTokenAmount } from '../../../../../../shared/lib/transactions-controller-utils';
 import {
-  ellipsisAmountText,
   formatAmount,
   formatAmountMaxPrecision,
 } from '../../../../../pages/confirmations/components/simulation-details/formatAmount';
+import { shortenString } from '../../../../../helpers/utils/util';
 import { ConfirmInfoRowText } from './text';
 
 type ConfirmInfoRowTextTokenUnitsProps = {
@@ -24,7 +24,12 @@ export const ConfirmInfoRowTextTokenUnits: React.FC<
 
   return (
     <ConfirmInfoRowText
-      text={ellipsisAmountText(tokenText)}
+      text={shortenString(tokenText, {
+        truncatedCharLimit: 15,
+        truncatedStartChars: 15,
+        truncatedEndChars: 0,
+        skipCharacterInEnd: true,
+      })}
       tooltip={tokenTextMaxPrecision}
     />
   );
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index b2a036370e10..16f361c73b69 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -10,6 +10,7 @@ import {
   ConfirmInfoRow,
   ConfirmInfoRowText,
 } from '../../../../../../../components/app/confirm/info/row';
+import { shortenString } from '../../../../../../../helpers/utils/util';
 import { useI18nContext } from '../../../../../../../hooks/useI18nContext';
 import { currentConfirmationSelector } from '../../../../../../../selectors';
 import { Box, Text } from '../../../../../../../components/component-library';
@@ -25,7 +26,6 @@ import { SignatureRequestType } from '../../../../../types/confirm';
 import useTokenExchangeRate from '../../../../../../../components/app/currency-input/hooks/useTokenExchangeRate';
 import { IndividualFiatDisplay } from '../../../../simulation-details/fiat-display';
 import {
-  ellipsisAmountText,
   formatAmount,
   formatAmountMaxPrecision,
 } from '../../../../simulation-details/formatAmount';
@@ -90,7 +90,12 @@ const PermitSimulation: React.FC<{
                   paddingInline={2}
                   textAlign={TextAlign.Center}
                 >
-                  {ellipsisAmountText(tokenValue || '')}
+                  {shortenString(tokenValue || '', {
+                    truncatedCharLimit: 15,
+                    truncatedStartChars: 15,
+                    truncatedEndChars: 0,
+                    skipCharacterInEnd: true,
+                  })}
                 </Text>
               </Tooltip>
             </Box>
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
index 4a39cc5dfa15..4ae9b7ee7278 100644
--- a/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.test.ts
@@ -1,24 +1,7 @@
 import { BigNumber } from 'bignumber.js';
-import { ellipsisAmountText, formatAmount } from './formatAmount';
+import { formatAmount } from './formatAmount';
 
 describe('formatAmount', () => {
-  describe('#ellipsisAmountText', () => {
-    const MOCK_MAX_LEFT_DIGITS = 15;
-
-    // @ts-expect-error This is missing from the Mocha type definitions
-    it.each([
-      ['1.003', '1.003'],
-      ['1,034', '1,034'],
-      ['1,213,098,292,340,945', '1,213,098,292,340,94...'],
-      ['30,001,231,231,212,312,138,768', '30,001,231,231,212,3...'],
-    ])(
-      'formats amount greater than or equal to 1 with appropriate decimal precision (%s => %s)',
-      (amount: string, expected: string) => {
-        expect(ellipsisAmountText(amount, MOCK_MAX_LEFT_DIGITS)).toBe(expected);
-      },
-    );
-  });
-
   describe('#formatAmount', () => {
     const locale = 'en-US';
 
diff --git a/ui/pages/confirmations/components/simulation-details/formatAmount.ts b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
index 8e63c44aa0bc..213b55d52083 100644
--- a/ui/pages/confirmations/components/simulation-details/formatAmount.ts
+++ b/ui/pages/confirmations/components/simulation-details/formatAmount.ts
@@ -4,51 +4,11 @@ import {
   DEFAULT_PRECISION,
 } from '../../../../hooks/useCurrencyDisplay';
 
-const MAX_ELLIPSIS_LEFT_DIGITS = 15;
-
 // The number of significant decimals places to show for amounts less than 1.
 const MAX_SIGNIFICANT_DECIMAL_PLACES = 3;
 
 const ZERO_DISPLAY = '0';
 
-/**
- * This function receives an formatted number and will append an ellipsis if the number of digits
- * is greater than MAX_LEFT_DIGITS. Currently, we're only supporting en-US format. When we support
- * i18n numbers, we'll need to update this method to support i18n.
- *
- * This method has been designed to receive results of formatAmount.
- *
- * There is no need to format the decimal portion because formatAmount shaves the portions off
- * accordingly.
- *
- * @param amountText
- * @param maxLeftDigits
- */
-export function ellipsisAmountText(
-  amountText: string,
-  maxLeftDigits: number = MAX_ELLIPSIS_LEFT_DIGITS,
-): string {
-  const [integerPart] = amountText.split('.');
-  const cleanIntegerPart = integerPart.replace(/,/gu, '');
-
-  if (cleanIntegerPart.length > maxLeftDigits) {
-    let result = '';
-    let digitCount = 0;
-
-    for (let i = 0; digitCount < maxLeftDigits; i++) {
-      const integerChar = integerPart[i];
-      result += integerChar;
-      if (integerChar !== ',') {
-        digitCount += 1;
-      }
-    }
-
-    return `${result}...`;
-  }
-
-  return amountText;
-}
-
 export function formatAmountMaxPrecision(
   locale: string,
   num: number | BigNumber,

From 5d3abbc3d80e624b8b40d7057992088de0cb4085 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Mon, 19 Aug 2024 13:50:03 -0400
Subject: [PATCH 202/236] fix:  [cherry-pick][V12.1.0] permit simulation design
 - fix style alignment (#26186) (#26518)
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**

Cherry-pick  fix style alignment (#26186)  into v12.1.0

various snapshot discrepancies that cause significant line diffs

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

## **Related issues**

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

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: OGPoyraz <omergoktugpoyraz@gmail.com>
---
 .../info/__snapshots__/info.test.tsx.snap     |   4 +-
 .../__snapshots__/alert-row.test.tsx.snap     |   2 +-
 ui/components/app/confirm/info/row/row.tsx    |   2 +-
 .../info/__snapshots__/info.test.tsx.snap     |  26 ++---
 .../contract-interaction.test.tsx.snap        |   4 +-
 .../__snapshots__/personal-sign.test.tsx.snap |   8 +-
 .../__snapshots__/siwe-sign.test.tsx.snap     |  38 +++----
 .../transaction-details.test.tsx.snap         |   4 +-
 .../advanced-details.test.tsx.snap            |   6 +-
 .../__snapshots__/typed-sign-v1.test.tsx.snap |   8 +-
 .../__snapshots__/typed-sign.test.tsx.snap    | 100 +++++++++---------
 .../permit-simulation.test.tsx.snap           |   5 +-
 .../permit-simulation/permit-simulation.tsx   |   1 +
 .../row/__snapshots__/dataTree.test.tsx.snap  |  40 +++----
 .../typedSignDataV1.test.tsx.snap             |   4 +-
 .../__snapshots__/typedSignData.test.tsx.snap |  30 +++---
 .../__snapshots__/confirm.test.tsx.snap       |  40 +++----
 17 files changed, 162 insertions(+), 160 deletions(-)

diff --git a/ui/components/app/confirm/info/__snapshots__/info.test.tsx.snap b/ui/components/app/confirm/info/__snapshots__/info.test.tsx.snap
index a257e3ee3fa8..467385b65cc2 100644
--- a/ui/components/app/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/components/app/confirm/info/__snapshots__/info.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`ConfirmInfo should match snapshot 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -84,7 +84,7 @@ exports[`ConfirmInfo should match snapshot 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/components/app/confirm/info/row/alert-row/__snapshots__/alert-row.test.tsx.snap b/ui/components/app/confirm/info/row/alert-row/__snapshots__/alert-row.test.tsx.snap
index de65d1c7d004..856c5cc8bb53 100644
--- a/ui/components/app/confirm/info/row/alert-row/__snapshots__/alert-row.test.tsx.snap
+++ b/ui/components/app/confirm/info/row/alert-row/__snapshots__/alert-row.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`AlertRow matches snapshot with no alert 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/components/app/confirm/info/row/row.tsx b/ui/components/app/confirm/info/row/row.tsx
index 1455c46c44ef..2f982545dc6d 100644
--- a/ui/components/app/confirm/info/row/row.tsx
+++ b/ui/components/app/confirm/info/row/row.tsx
@@ -99,7 +99,7 @@ export const ConfirmInfoRow: React.FC<ConfirmInfoRowProps> = ({
         display={Display.Flex}
         flexDirection={FlexDirection.Row}
         justifyContent={JustifyContent.center}
-        alignItems={AlignItems.center}
+        alignItems={AlignItems.flexStart}
         color={color}
       >
         <Text variant={TextVariant.bodyMdMedium} color={TextColor.inherit}>
diff --git a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
index 76b15cccf95f..c388d2e9d3cd 100644
--- a/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/__snapshots__/info.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`Info renders info section for personal sign request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -52,7 +52,7 @@ exports[`Info renders info section for personal sign request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -85,7 +85,7 @@ exports[`Info renders info section for typed sign request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -123,7 +123,7 @@ exports[`Info renders info section for typed sign request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -198,7 +198,7 @@ exports[`Info renders info section for typed sign request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -214,7 +214,7 @@ exports[`Info renders info section for typed sign request 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -245,7 +245,7 @@ exports[`Info renders info section for typed sign request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -261,7 +261,7 @@ exports[`Info renders info section for typed sign request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -285,7 +285,7 @@ exports[`Info renders info section for typed sign request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -358,7 +358,7 @@ exports[`Info renders info section for typed sign request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -374,7 +374,7 @@ exports[`Info renders info section for typed sign request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -398,7 +398,7 @@ exports[`Info renders info section for typed sign request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -471,7 +471,7 @@ exports[`Info renders info section for typed sign request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/contract-interaction/__snapshots__/contract-interaction.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/contract-interaction/__snapshots__/contract-interaction.test.tsx.snap
index f09075446df0..c1ed31b56d04 100644
--- a/ui/pages/confirmations/components/confirm/info/contract-interaction/__snapshots__/contract-interaction.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/contract-interaction/__snapshots__/contract-interaction.test.tsx.snap
@@ -104,7 +104,7 @@ exports[`<ContractInteractionInfo /> renders component for contract interaction
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -142,7 +142,7 @@ exports[`<ContractInteractionInfo /> renders component for contract interaction
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
index 50624e107dff..4135577d99e1 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/__snapshots__/personal-sign.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`PersonalSignInfo handle reverse string properly 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -52,7 +52,7 @@ exports[`PersonalSignInfo handle reverse string properly 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -85,7 +85,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -127,7 +127,7 @@ exports[`PersonalSignInfo renders correctly for personal sign request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
index 2eabd9cc415a..6571bbbf5c0c 100644
--- a/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/personal-sign/siwe-sign/__snapshots__/siwe-sign.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -31,7 +31,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -55,7 +55,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -79,7 +79,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -150,7 +150,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -174,7 +174,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -198,7 +198,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -222,7 +222,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -246,7 +246,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request 1`] = `
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -275,7 +275,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -299,7 +299,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -323,7 +323,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -347,7 +347,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -418,7 +418,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -442,7 +442,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -466,7 +466,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -490,7 +490,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -514,7 +514,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -538,7 +538,7 @@ exports[`SIWESignInfo renders correctly for SIWE signature request with resource
     style="overflow-wrap: anywhere; min-height: 24px;"
   >
     <div
-      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+      class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
     >
       <p
         class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/__snapshots__/transaction-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/__snapshots__/transaction-details.test.tsx.snap
index c98b0b16fed9..a875d88923bd 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/__snapshots__/transaction-details.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/__snapshots__/transaction-details.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`<TransactionDetails /> renders component for transaction details 1`] =
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -56,7 +56,7 @@ exports[`<TransactionDetails /> renders component for transaction details 1`] =
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap
index 545446a58003..a1f4754dabfb 100644
--- a/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/shared/advanced-details/__snapshots__/advanced-details.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`<AdvancedDetails /> does not render component for advanced transaction
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -58,7 +58,7 @@ exports[`<AdvancedDetails /> renders component for advanced transaction details
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -109,7 +109,7 @@ exports[`<AdvancedDetails /> renders component for advanced transaction details
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
index ce62327bcc45..1968d98ebfef 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign-v1/__snapshots__/typed-sign-v1.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -52,7 +52,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -75,7 +75,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -99,7 +99,7 @@ exports[`TypedSignInfo correctly renders typed sign data request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
index 9da7d9d6619c..5f5214b3b7b4 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/__snapshots__/typed-sign.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -84,7 +84,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -122,7 +122,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -197,7 +197,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -213,7 +213,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -244,7 +244,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -315,7 +315,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -386,7 +386,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -423,7 +423,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -447,7 +447,7 @@ exports[`TypedSignInfo correctly renders permit sign type 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -486,7 +486,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -524,7 +524,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -599,7 +599,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -615,7 +615,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -646,7 +646,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -662,7 +662,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -686,7 +686,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -759,7 +759,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -775,7 +775,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -799,7 +799,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -872,7 +872,7 @@ exports[`TypedSignInfo renders origin for typed sign data request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -909,7 +909,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -947,7 +947,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1022,7 +1022,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1038,7 +1038,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1069,7 +1069,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1085,7 +1085,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1109,7 +1109,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1182,7 +1182,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1198,7 +1198,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1222,7 +1222,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1295,7 +1295,7 @@ exports[`TypedSignInfo should render message for typed sign v3 request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1332,7 +1332,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1370,7 +1370,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1445,7 +1445,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1461,7 +1461,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1492,7 +1492,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1516,7 +1516,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1532,7 +1532,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1556,7 +1556,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1572,7 +1572,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1643,7 +1643,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1714,7 +1714,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1789,7 +1789,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1805,7 +1805,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1821,7 +1821,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1845,7 +1845,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1861,7 +1861,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1932,7 +1932,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -2003,7 +2003,7 @@ exports[`TypedSignInfo should render message for typed sign v4 request 1`] = `
                           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
index 47d715b01d8c..49080199e35e 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/__snapshots__/permit-simulation.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -49,7 +49,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -80,6 +80,7 @@ exports[`PermitSimulation renders component correctly 1`] = `
               >
                 <p
                   class="mm-box mm-text mm-text--body-md mm-text--text-align-center mm-box--padding-inline-2 mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-xl"
+                  style="padding-top: 1px; padding-bottom: 1px;"
                 >
                   30
                 </p>
diff --git a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
index 16f361c73b69..59b46303dbc0 100644
--- a/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
+++ b/ui/pages/confirmations/components/confirm/info/typed-sign/permit-simulation/permit-simulation.tsx
@@ -88,6 +88,7 @@ const PermitSimulation: React.FC<{
                   backgroundColor={BackgroundColor.backgroundAlternative}
                   borderRadius={BorderRadius.XL}
                   paddingInline={2}
+                  style={{ paddingTop: '1px', paddingBottom: '1px' }}
                   textAlign={TextAlign.Center}
                 >
                   {shortenString(tokenValue || '', {
diff --git a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
index b8d470123220..24ea8d5cb9a9 100644
--- a/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/__snapshots__/dataTree.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`DataTree correctly renders reverse strings 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -34,7 +34,7 @@ exports[`DataTree correctly renders reverse strings 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -67,7 +67,7 @@ exports[`DataTree should match snapshot 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -91,7 +91,7 @@ exports[`DataTree should match snapshot 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -107,7 +107,7 @@ exports[`DataTree should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -131,7 +131,7 @@ exports[`DataTree should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -147,7 +147,7 @@ exports[`DataTree should match snapshot 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -218,7 +218,7 @@ exports[`DataTree should match snapshot 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -293,7 +293,7 @@ exports[`DataTree should match snapshot 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -309,7 +309,7 @@ exports[`DataTree should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -325,7 +325,7 @@ exports[`DataTree should match snapshot 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -349,7 +349,7 @@ exports[`DataTree should match snapshot 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -365,7 +365,7 @@ exports[`DataTree should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -436,7 +436,7 @@ exports[`DataTree should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -507,7 +507,7 @@ exports[`DataTree should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -584,7 +584,7 @@ exports[`DataTree should match snapshot 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -617,7 +617,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -639,7 +639,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -661,7 +661,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -683,7 +683,7 @@ exports[`DataTree should match snapshot for permit signature type 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
index 21d11d1453ec..822cc5c7d388 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data-v1/__snapshots__/typedSignDataV1.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -41,7 +41,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
index bb120c6caa50..bcb4f614f207 100644
--- a/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
+++ b/ui/pages/confirmations/components/confirm/row/typed-sign-data/__snapshots__/typedSignData.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
       style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
     >
       <div
-        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
       >
         <p
           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -41,7 +41,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -65,7 +65,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -81,7 +81,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -105,7 +105,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -121,7 +121,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -192,7 +192,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -263,7 +263,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -338,7 +338,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
         >
           <div
-            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
           >
             <p
               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -354,7 +354,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -370,7 +370,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -394,7 +394,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -410,7 +410,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -481,7 +481,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -552,7 +552,7 @@ exports[`ConfirmInfoRowTypedSignData should match snapshot 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
diff --git a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
index 969eb45905ad..84630e6a0c75 100644
--- a/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
+++ b/ui/pages/confirmations/confirm/__snapshots__/confirm.test.tsx.snap
@@ -137,7 +137,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -179,7 +179,7 @@ exports[`Confirm matches snapshot for personal signature type 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px; background: transparent;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start mm-box--color-text-default"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -359,7 +359,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -397,7 +397,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -472,7 +472,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
               style="overflow-wrap: anywhere; min-height: 24px;"
             >
               <div
-                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
               >
                 <p
                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -488,7 +488,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                   style="overflow-wrap: anywhere; min-height: 24px; padding-left: 0px; padding-right: 0px;"
                 >
                   <div
-                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                   >
                     <p
                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -519,7 +519,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -543,7 +543,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -559,7 +559,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -583,7 +583,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -599,7 +599,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
-                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                               >
                                 <p
                                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -670,7 +670,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
-                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                               >
                                 <p
                                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -741,7 +741,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
-                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                               >
                                 <p
                                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -816,7 +816,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                       style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                     >
                       <div
-                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                        class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                       >
                         <p
                           class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -832,7 +832,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                           style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                         >
                           <div
-                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                            class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                           >
                             <p
                               class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -848,7 +848,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
-                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                               >
                                 <p
                                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -872,7 +872,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                               style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                             >
                               <div
-                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                               >
                                 <p
                                   class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -888,7 +888,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                                 >
                                   <div
-                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                                   >
                                     <p
                                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -959,7 +959,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                                 >
                                   <div
-                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                                   >
                                     <p
                                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"
@@ -1030,7 +1030,7 @@ exports[`Confirm should match snapshot for typed sign signature 1`] = `
                                   style="overflow-wrap: anywhere; min-height: 24px; padding-right: 0px;"
                                 >
                                   <div
-                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-center"
+                                    class="mm-box mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--align-items-flex-start"
                                   >
                                     <p
                                       class="mm-box mm-text mm-text--body-md-medium mm-box--color-inherit"

From e6d7a5752daab0af9ae4e63a6de92b15496ef48a Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Mon, 15 Jul 2024 14:12:24 +0200
Subject: [PATCH 203/236] chore: Patch security issue in snaps-utils (#25827)

This is the same as #25823, but targeting `develop` instead of
`Version-v12.0.0`.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25827?quickstart=1)
---
 ...ask-snaps-utils-npm-7.7.0-2cc1f044af.patch | 30 ++++++++++++++++
 package.json                                  |  4 +--
 yarn.lock                                     | 35 +++++++++++++++++--
 3 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 .yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch

diff --git a/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch b/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch
new file mode 100644
index 000000000000..82ddce260b99
--- /dev/null
+++ b/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch
@@ -0,0 +1,30 @@
+diff --git a/dist/chunk-37VHIRUJ.js b/dist/chunk-37VHIRUJ.js
+index a909a4ef20305665a07db5c25b4a9ff7eb0a447e..98dd75bf33a9716dc6cca96a38d184645f6ec033 100644
+--- a/dist/chunk-37VHIRUJ.js
++++ b/dist/chunk-37VHIRUJ.js
+@@ -53,8 +53,8 @@ function assertIsKeyringOrigins(value, ErrorWrapper) {
+ }
+ function createOriginRegExp(matcher) {
+   const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+-  const regex = escaped.replace(/\*/gu, ".*");
+-  return RegExp(regex, "u");
++  const regex = escaped.replace(/\\\*/gu, '.*');
++  return RegExp(`${regex}$`, 'u');
+ }
+ function checkAllowedOrigin(matcher, origin) {
+   if (matcher === "*" || matcher === origin) {
+diff --git a/dist/chunk-K2OTEZZZ.mjs b/dist/chunk-K2OTEZZZ.mjs
+index 15be5da7563a5bdf464d7e9c28ed6f04863e378a..7f38bf328e71c1feb2b8850ba050ce9e55801668 100644
+--- a/dist/chunk-K2OTEZZZ.mjs
++++ b/dist/chunk-K2OTEZZZ.mjs
+@@ -53,8 +53,8 @@ function assertIsKeyringOrigins(value, ErrorWrapper) {
+ }
+ function createOriginRegExp(matcher) {
+   const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+-  const regex = escaped.replace(/\*/gu, ".*");
+-  return RegExp(regex, "u");
++  const regex = escaped.replace(/\\\*/gu, '.*');
++  return RegExp(`${regex}$`, 'u');
+ }
+ function checkAllowedOrigin(matcher, origin) {
+   if (matcher === "*" || matcher === origin) {
diff --git a/package.json b/package.json
index 459b1d223a6a..ee91ede2bd3b 100644
--- a/package.json
+++ b/package.json
@@ -256,7 +256,7 @@
     "@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A19.0.0#~/.yarn/patches/@metamask-network-controller-npm-19.0.0-a5e0d1fe14.patch",
     "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
     "@metamask/gas-fee-controller@npm:^15.1.1": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch",
-    "@metamask/snaps-utils@npm:^7.6.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
+    "@metamask/snaps-utils@npm:^7.7.0": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
     "@metamask/snaps-utils@npm:^7.4.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
     "@metamask/snaps-utils@npm:^7.5.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
     "@metamask/keyring-controller@npm:^16.0.0": "patch:@metamask/keyring-controller@npm%3A16.1.0#~/.yarn/patches/@metamask-keyring-controller-npm-16.1.0-7043d2dc62.patch",
@@ -345,7 +345,7 @@
     "@metamask/snaps-execution-environments": "^6.5.0",
     "@metamask/snaps-rpc-methods": "^9.1.4",
     "@metamask/snaps-sdk": "^6.0.0",
-    "@metamask/snaps-utils": "^7.7.0",
+    "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
     "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A32.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch",
     "@metamask/user-operation-controller": "^10.0.0",
     "@metamask/utils": "^8.2.1",
diff --git a/yarn.lock b/yarn.lock
index 225de7f5b677..a9f2b43bbac3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6439,7 +6439,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^7.7.0":
+"@metamask/snaps-utils@npm:7.7.0":
   version: 7.7.0
   resolution: "@metamask/snaps-utils@npm:7.7.0"
   dependencies:
@@ -6501,6 +6501,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch":
+  version: 7.7.0
+  resolution: "@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch::version=7.7.0&hash=5f2735"
+  dependencies:
+    "@babel/core": "npm:^7.23.2"
+    "@babel/types": "npm:^7.23.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/key-tree": "npm:^9.1.1"
+    "@metamask/permission-controller": "npm:^10.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/slip44": "npm:^3.1.0"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-sdk": "npm:^6.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@noble/hashes": "npm:^1.3.1"
+    "@scure/base": "npm:^1.1.1"
+    chalk: "npm:^4.1.2"
+    cron-parser: "npm:^4.5.0"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    fast-xml-parser: "npm:^4.3.4"
+    marked: "npm:^12.0.1"
+    rfdc: "npm:^1.3.0"
+    semver: "npm:^7.5.4"
+    ses: "npm:^1.1.0"
+    superstruct: "npm:^1.0.3"
+    validate-npm-package-name: "npm:^5.0.0"
+  checksum: 10/9ac16da1c2c1c7e2b857078ff4d9d450db8d5dbf650143ffc7953d2aea70fd58c87d1c1f2429a5a1c1418334d27e87d4a6a03089a55ba86840c417dfdb73b2fe
+  languageName: node
+  linkType: hard
+
 "@metamask/swappable-obj-proxy@npm:^2.2.0":
   version: 2.2.0
   resolution: "@metamask/swappable-obj-proxy@npm:2.2.0"
@@ -25355,7 +25386,7 @@ __metadata:
     "@metamask/snaps-execution-environments": "npm:^6.5.0"
     "@metamask/snaps-rpc-methods": "npm:^9.1.4"
     "@metamask/snaps-sdk": "npm:^6.0.0"
-    "@metamask/snaps-utils": "npm:^7.7.0"
+    "@metamask/snaps-utils": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch"
     "@metamask/test-bundler": "npm:^1.0.0"
     "@metamask/test-dapp": "npm:^8.4.0"
     "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A32.0.0#~/.yarn/patches/@metamask-transaction-controller-npm-32.0.0-e23c2c3443.patch"

From 141a07dc1e73f820eab377dd73521e8aafa0da6b Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Tue, 20 Aug 2024 12:22:10 +0200
Subject: [PATCH 204/236] fix: use a counter to show if there are pending
 transactions (#26116) (#26434)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…26116)

Cherry-picks #26116

## **Description**

This PR modifies the content of the badge for pending transactions.
Before this PR, the blue badge showed three dots; now it shows a number
again.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26116?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**

<img width="140" alt="Screenshot 2024-07-25 at 10 16 28"
src="https://github.com/user-attachments/assets/39dd4c13-922b-4180-9a82-97dfff5a66d7">

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

---------


<!--
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/26434?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Prithpal Sooriya <prithpal.sooriya@gmail.com>
Co-authored-by: Marina Boboc <120041701+benjisclowder@users.noreply.github.com>
---
 app/scripts/background.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 63ac039ae83a..7cd7b8d00ab7 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -75,8 +75,7 @@ import { TRIGGER_TYPES } from './controllers/metamask-notifications/constants/no
 const BADGE_COLOR_APPROVAL = '#0376C9';
 // eslint-disable-next-line @metamask/design-tokens/color-no-hex
 const BADGE_COLOR_NOTIFICATION = '#D73847';
-const BADGE_LABEL_APPROVAL = '\u22EF'; // unicode ellipsis
-const BADGE_MAX_NOTIFICATION_COUNT = 9;
+const BADGE_MAX_COUNT = 9;
 
 // Setup global hook for improved Sentry state snapshots during initialization
 const inTest = process.env.IN_TEST;
@@ -840,6 +839,17 @@ export function setupController(
 
   controller.txController.initApprovals();
 
+  /**
+   * Formats a count for display as a badge label.
+   *
+   * @param {number} count - The count to be formatted.
+   * @param {number} maxCount - The maximum count to display before using the '+' suffix.
+   * @returns {string} The formatted badge label.
+   */
+  function getBadgeLabel(count, maxCount) {
+    return count > maxCount ? `${maxCount}+` : String(count);
+  }
+
   /**
    * Updates the Web Extension's "badge" number, on the little fox in the toolbar.
    * The number reflects the current number of pending transactions or message signatures needing user approval.
@@ -852,12 +862,9 @@ export function setupController(
     let badgeColor = BADGE_COLOR_APPROVAL;
 
     if (pendingApprovalCount) {
-      label = BADGE_LABEL_APPROVAL;
+      label = getBadgeLabel(pendingApprovalCount, BADGE_MAX_COUNT);
     } else if (unreadNotificationsCount > 0) {
-      label =
-        unreadNotificationsCount > BADGE_MAX_NOTIFICATION_COUNT
-          ? `${BADGE_MAX_NOTIFICATION_COUNT}+`
-          : String(unreadNotificationsCount);
+      label = getBadgeLabel(unreadNotificationsCount, BADGE_MAX_COUNT);
       badgeColor = BADGE_COLOR_NOTIFICATION;
     }
 

From 48fbcd59a7283015a486905814ac526939230cf5 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 20 Aug 2024 07:55:33 -0230
Subject: [PATCH 205/236] Remove assets controller patch added in 12.0.5, which
 is already included in assets controller v33

---
 ...-assets-controllers-patch-a3b39b55a6.patch | 52 -------------------
 package.json                                  |  2 +-
 yarn.lock                                     | 46 +---------------
 3 files changed, 3 insertions(+), 97 deletions(-)
 delete mode 100644 .yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch

diff --git a/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch b/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch
deleted file mode 100644
index acb3b9586db1..000000000000
--- a/.yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/dist/chunk-6W5EQ3JQ.js b/dist/chunk-6W5EQ3JQ.js
-index 81c2d0d1e6a0ad6db8b361423774b9a843fb46f6..fa8a115bb9b392a958265fa8df8b5549636952ff 100644
---- a/dist/chunk-6W5EQ3JQ.js
-+++ b/dist/chunk-6W5EQ3JQ.js
-@@ -416,7 +416,7 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
-       ...acc,
-       [tokenAddress]: {
-         ...token,
--        value: token.value ? token.value * fallbackCurrencyToNativeCurrencyConversionRate : void 0
-+        price: token.price ? token.price * fallbackCurrencyToNativeCurrencyConversionRate : void 0
-       }
-     };
-     return acc;
-diff --git a/dist/chunk-NEXY7SE2.js b/dist/chunk-NEXY7SE2.js
-index 8c506d9d26d81eac470bb4d7b84a4396a1651a83..d1ec2d220491aa353340da4f12a5b40ddaa30afc 100644
---- a/dist/chunk-NEXY7SE2.js
-+++ b/dist/chunk-NEXY7SE2.js
-@@ -182,7 +182,7 @@ async function fetchTokenContractExchangeRates({
-     (obj, [tokenAddress, tokenPrice]) => {
-       return {
-         ...obj,
--        [_controllerutils.toChecksumHexAddress.call(void 0, tokenAddress)]: tokenPrice?.value
-+        [_controllerutils.toChecksumHexAddress.call(void 0, tokenAddress)]: tokenPrice?.price
-       };
-     },
-     {}
-diff --git a/dist/chunk-Q5JRBGWO.mjs b/dist/chunk-Q5JRBGWO.mjs
-index 6c2a61a7703d0b8ecac3561935443994badd451c..1bbe069ba07b9ab6c213a27988c68c5be6321589 100644
---- a/dist/chunk-Q5JRBGWO.mjs
-+++ b/dist/chunk-Q5JRBGWO.mjs
-@@ -182,7 +182,7 @@ async function fetchTokenContractExchangeRates({
-     (obj, [tokenAddress, tokenPrice]) => {
-       return {
-         ...obj,
--        [toChecksumHexAddress(tokenAddress)]: tokenPrice?.value
-+        [toChecksumHexAddress(tokenAddress)]: tokenPrice?.price
-       };
-     },
-     {}
-diff --git a/dist/chunk-X4FFNQHE.mjs b/dist/chunk-X4FFNQHE.mjs
-index f0264520818f7f715df4bb8c08fdc8c95baee999..74dae86c2a30a143684ed076867259e8b3d878c0 100644
---- a/dist/chunk-X4FFNQHE.mjs
-+++ b/dist/chunk-X4FFNQHE.mjs
-@@ -416,7 +416,7 @@ fetchAndMapExchangeRatesForUnsupportedNativeCurrency_fn = async function({
-       ...acc,
-       [tokenAddress]: {
-         ...token,
--        value: token.value ? token.value * fallbackCurrencyToNativeCurrencyConversionRate : void 0
-+        price: token.price ? token.price * fallbackCurrencyToNativeCurrencyConversionRate : void 0
-       }
-     };
-     return acc;
diff --git a/package.json b/package.json
index ee91ede2bd3b..d8bb50891ad5 100644
--- a/package.json
+++ b/package.json
@@ -294,7 +294,7 @@
     "@metamask/address-book-controller": "^4.0.1",
     "@metamask/announcement-controller": "^6.1.0",
     "@metamask/approval-controller": "^7.0.0",
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch",
+    "@metamask/assets-controllers": "^33.0.0",
     "@metamask/base-controller": "^5.0.1",
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.5.0",
diff --git a/yarn.lock b/yarn.lock
index a9f2b43bbac3..4c564868c4e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4824,7 +4824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:33.0.0":
+"@metamask/assets-controllers@npm:^33.0.0":
   version: 33.0.0
   resolution: "@metamask/assets-controllers@npm:33.0.0"
   dependencies:
@@ -4866,48 +4866,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch":
-  version: 33.0.0
-  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch::version=33.0.0&hash=4c8a6f"
-  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:^17.0.0"
-    "@metamask/approval-controller": "npm:^7.0.0"
-    "@metamask/base-controller": "npm:^6.0.0"
-    "@metamask/contract-metadata": "npm:^2.4.0"
-    "@metamask/controller-utils": "npm:^11.0.0"
-    "@metamask/eth-query": "npm:^4.0.0"
-    "@metamask/keyring-controller": "npm:^17.1.0"
-    "@metamask/metamask-eth-abis": "npm:^3.1.1"
-    "@metamask/network-controller": "npm:^19.0.0"
-    "@metamask/polling-controller": "npm:^8.0.0"
-    "@metamask/preferences-controller": "npm:^13.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.5.0"
-    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": ^17.0.0
-    "@metamask/approval-controller": ^7.0.0
-    "@metamask/keyring-controller": ^17.0.0
-    "@metamask/network-controller": ^19.0.0
-    "@metamask/preferences-controller": ^13.0.0
-  checksum: 10/effeb152b776dad38e173f9a699158d6df15d4175d27de763ba6ddd8f9b50cf604722683f8d91af989a7b5d721d1b846c5a78d2553ce7f84787925440f3c1107
-  languageName: node
-  linkType: hard
-
 "@metamask/auto-changelog@npm:^2.1.0":
   version: 2.6.1
   resolution: "@metamask/auto-changelog@npm:2.6.1"
@@ -25325,7 +25283,7 @@ __metadata:
     "@metamask/announcement-controller": "npm:^6.1.0"
     "@metamask/api-specs": "npm:^0.9.3"
     "@metamask/approval-controller": "npm:^7.0.0"
-    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch"
+    "@metamask/assets-controllers": "npm:^33.0.0"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^5.0.1"
     "@metamask/browser-passworder": "npm:^4.3.0"

From 5a1d0b91b1a0045035da9e2a9924d3c93329e059 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 20 Aug 2024 08:48:43 -0230
Subject: [PATCH 206/236] Add missing locale

---
 app/_locales/en/messages.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index edcfb717e589..6ebd5fab0f05 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -3493,6 +3493,9 @@
   "onboardingMetametricsNeverSellDataEmphasis": {
     "message": "Optional:"
   },
+  "onboardingMetametricsPrivacyDescription": {
+    "message": "Learn how we protect your privacy while collecting usage data for your profile."
+  },
   "onboardingMetametricsTitle": {
     "message": "Help us improve MetaMask"
   },

From a5a7f0e63db4f8fd03cde2b3d84f689c3fb95fa0 Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Tue, 20 Aug 2024 09:02:40 -0400
Subject: [PATCH 207/236] fix (cherry-pick for v12.1.0): reduce spacing in
 asset picker (#26479)
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**

Cherry picks https://github.com/MetaMask/metamask-extension/pull/25576

<!--
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/26479?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../asset-picker/__snapshots__/asset-picker.test.tsx.snap     | 4 ++--
 .../asset-picker-amount/asset-picker/asset-picker.tsx         | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
index 9eedf3168b8b..2662eb196a76 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`AssetPicker matches snapshot 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-badge-wrapper mm-box--margin-right-3 mm-box--display-inline-block"
+          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
         >
           <div
             class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
@@ -80,7 +80,7 @@ exports[`AssetPicker render if disabled 1`] = `
         class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
       >
         <div
-          class="mm-box mm-badge-wrapper mm-box--margin-right-3 mm-box--display-inline-block"
+          class="mm-box mm-badge-wrapper mm-box--display-inline-block"
         >
           <div
             class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm 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"
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 4516011afc4c..d70e73782b5d 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -194,7 +194,6 @@ export function AssetPicker({
                 }
               />
             }
-            marginRight={3}
           >
             <AvatarToken
               borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}

From b82d102456f3d3602c14a352a9a7a698e16571d6 Mon Sep 17 00:00:00 2001
From: salimtb <salim.toubal@outlook.com>
Date: Tue, 20 Aug 2024 16:55:02 +0200
Subject: [PATCH 208/236] fix: set network client id for domain (#25646)
 (#26543)
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 goal of this PR is to fix the network switch on dapp context <!--
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/25646?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to metamask test dapp
2. Choose any testnet ( sepolia for example )
3. Connect to dapp
4. close the extension than open it
5. network should stay on sepolia

## **Screenshots/Recordings**

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

### **Before**

[<!-- [screenshots/recordings]

-->](https://github.com/MetaMask/metamask-extension/assets/26223211/a940295c-c71f-4aff-8c40-65769978055c)

### **After**

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

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

---------


<!--
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/26543?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: David Walsh <davidwalsh83@gmail.com>
---
 .../network-list-menu/network-list-menu.js    | 189 ++++++++----------
 .../network-list-menu.test.js                 |  28 ++-
 2 files changed, 114 insertions(+), 103 deletions(-)

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 3a1f279103d4..6f511b6a8bcd 100644
--- a/ui/components/multichain/network-list-menu/network-list-menu.js
+++ b/ui/components/multichain/network-list-menu/network-list-menu.js
@@ -166,6 +166,7 @@ export const NetworkListMenu = ({ onClose }) => {
   const [items, setItems] = useState([...networksList]);
 
   useEffect(() => {
+    setActionMode(ACTION_MODES.LIST);
     if (currentlyOnTestNetwork) {
       dispatch(setShowTestNetworks(currentlyOnTestNetwork));
     }
@@ -259,29 +260,75 @@ export const NetworkListMenu = ({ onClose }) => {
     );
   }
 
-  const getOnDeleteCallback = (networkId) => {
-    return () => {
-      dispatch(toggleNetworkMenu());
-      dispatch(
-        showModal({
-          name: 'CONFIRM_DELETE_NETWORK',
-          target: networkId,
-          onConfirm: () => undefined,
-        }),
-      );
-    };
+  const getOnEditCallback = (network) => {
+    dispatch(
+      setEditedNetwork({
+        networkConfigurationId: network.id,
+        nickname: network.nickname,
+      }),
+    );
+    setActionMode(ACTION_MODES.EDIT);
   };
 
-  const getOnEditCallback = (network) => {
-    return () => {
-      dispatch(
-        setEditedNetwork({
-          networkConfigurationId: network.id,
-          nickname: network.nickname,
-        }),
-      );
-      setActionMode(ACTION_MODES.EDIT);
-    };
+  const getOnEdit = (network) => {
+    return () => getOnEditCallback(network);
+  };
+
+  const generateNetworkListItem = ({
+    network,
+    isCurrentNetwork,
+    canDeleteNetwork,
+  }) => {
+    return (
+      <NetworkListItem
+        name={network.nickname}
+        iconSrc={network?.rpcPrefs?.imageUrl}
+        key={network.id}
+        selected={isCurrentNetwork && !focusSearch}
+        focus={isCurrentNetwork && !focusSearch}
+        onClick={() => {
+          dispatch(toggleNetworkMenu());
+          if (network.providerType) {
+            dispatch(setProviderType(network.providerType));
+          } 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 (useRequestQueue && selectedTabOrigin) {
+            setNetworkClientIdForDomain(selectedTabOrigin, network.id);
+          }
+
+          trackEvent({
+            event: MetaMetricsEventName.NavNetworkSwitched,
+            category: MetaMetricsEventCategory.Network,
+            properties: {
+              location: 'Network Menu',
+              chain_id: currentChainId,
+              from_network: currentChainId,
+              to_network: network.chainId,
+            },
+          });
+        }}
+        onDeleteClick={
+          canDeleteNetwork
+            ? () => {
+                dispatch(toggleNetworkMenu());
+                dispatch(
+                  showModal({
+                    name: 'CONFIRM_DELETE_NETWORK',
+                    target: network.id,
+                    onConfirm: () => undefined,
+                  }),
+                );
+              }
+            : null
+        }
+        onEditClick={() => getOnEditCallback(network)}
+      />
+    );
   };
 
   const generateMenuItems = (desiredNetworks) => {
@@ -293,37 +340,11 @@ export const NetworkListMenu = ({ onClose }) => {
       const canDeleteNetwork =
         isUnlocked && !isCurrentNetwork && network.removable;
 
-      return (
-        <NetworkListItem
-          name={network.nickname}
-          iconSrc={network?.rpcPrefs?.imageUrl}
-          key={network.id}
-          selected={isCurrentNetwork && !focusSearch}
-          focus={isCurrentNetwork && !focusSearch}
-          onClick={() => {
-            dispatch(toggleNetworkMenu());
-            if (network.providerType) {
-              dispatch(setProviderType(network.providerType));
-            } else {
-              dispatch(setActiveNetwork(network.id));
-            }
-            trackEvent({
-              event: MetaMetricsEventName.NavNetworkSwitched,
-              category: MetaMetricsEventCategory.Network,
-              properties: {
-                location: 'Network Menu',
-                chain_id: currentChainId,
-                from_network: currentChainId,
-                to_network: network.chainId,
-              },
-            });
-          }}
-          onDeleteClick={
-            canDeleteNetwork ? getOnDeleteCallback(network.id) : null
-          }
-          onEditClick={getOnEditCallback(network)}
-        />
-      );
+      return generateNetworkListItem({
+        network,
+        isCurrentNetwork,
+        canDeleteNetwork,
+      });
     });
   };
 
@@ -409,6 +430,12 @@ export const NetworkListMenu = ({ onClose }) => {
                             !isCurrentNetwork &&
                             network.removable;
 
+                          const networkListItem = generateNetworkListItem({
+                            network,
+                            isCurrentNetwork,
+                            canDeleteNetwork,
+                          });
+
                           return (
                             <Draggable
                               key={network.id}
@@ -421,55 +448,7 @@ export const NetworkListMenu = ({ onClose }) => {
                                   {...providedDrag.draggableProps}
                                   {...providedDrag.dragHandleProps}
                                 >
-                                  <NetworkListItem
-                                    name={network.nickname}
-                                    iconSrc={network?.rpcPrefs?.imageUrl}
-                                    key={network.id}
-                                    selected={isCurrentNetwork && !focusSearch}
-                                    focus={isCurrentNetwork && !focusSearch}
-                                    onClick={() => {
-                                      dispatch(toggleNetworkMenu());
-                                      if (network.providerType) {
-                                        dispatch(
-                                          setProviderType(network.providerType),
-                                        );
-                                      } 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 (
-                                        useRequestQueue &&
-                                        selectedTabOrigin
-                                      ) {
-                                        setNetworkClientIdForDomain(
-                                          selectedTabOrigin,
-                                          network.id,
-                                        );
-                                      }
-
-                                      trackEvent({
-                                        event:
-                                          MetaMetricsEventName.NavNetworkSwitched,
-                                        category:
-                                          MetaMetricsEventCategory.Network,
-                                        properties: {
-                                          location: 'Network Menu',
-                                          chain_id: currentChainId,
-                                          from_network: currentChainId,
-                                          to_network: network.chainId,
-                                        },
-                                      });
-                                    }}
-                                    onDeleteClick={
-                                      canDeleteNetwork
-                                        ? getOnDeleteCallback(network.id)
-                                        : null
-                                    }
-                                    onEditClick={getOnEditCallback(network)}
-                                  />
+                                  {networkListItem}
                                 </Box>
                               )}
                             </Draggable>
@@ -541,7 +520,13 @@ export const NetworkListMenu = ({ onClose }) => {
         </>
       );
     } else if (actionMode === ACTION_MODES.ADD) {
-      return <AddNetworkModal isNewNetworkFlow addNewNetwork />;
+      return (
+        <AddNetworkModal
+          isNewNetworkFlow
+          addNewNetwork
+          getOnEditCallback={getOnEdit}
+        />
+      );
     } else if (actionMode === ACTION_MODES.EDIT) {
       return (
         <AddNetworkModal
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 ffd96256e336..678745defa25 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
@@ -7,6 +7,7 @@ import {
   CHAIN_IDS,
   MAINNET_DISPLAY_NAME,
   SEPOLIA_DISPLAY_NAME,
+  NETWORK_TYPES,
 } from '../../../../shared/constants/network';
 import { NetworkListMenu } from '.';
 
@@ -14,11 +15,16 @@ const mockSetShowTestNetworks = jest.fn();
 const mockSetProviderType = jest.fn();
 const mockToggleNetworkMenu = jest.fn();
 const mockNetworkMenuRedesignToggle = jest.fn();
+const mockSetNetworkClientIdForDomain = jest.fn();
+const mockSetActiveNetwork = jest.fn();
 
 jest.mock('../../../store/actions.ts', () => ({
   setShowTestNetworks: () => mockSetShowTestNetworks,
   setProviderType: () => mockSetProviderType,
+  setActiveNetwork: () => mockSetActiveNetwork,
   toggleNetworkMenu: () => mockToggleNetworkMenu,
+  setNetworkClientIdForDomain: (network, id) =>
+    mockSetNetworkClientIdForDomain(network, id),
 }));
 
 jest.mock('../../../helpers/utils/feature-flags', () => ({
@@ -26,12 +32,14 @@ jest.mock('../../../helpers/utils/feature-flags', () => ({
   getLocalNetworkMenuRedesignFeatureFlag: () => mockNetworkMenuRedesignToggle,
 }));
 
+const MOCK_ORIGIN = 'https://portfolio.metamask.io';
+
 const render = ({
   showTestNetworks = false,
   currentChainId = '0x5',
   providerConfigId = 'chain5',
   isUnlocked = true,
-  origin = 'https://portfolio.metamask.io',
+  origin = MOCK_ORIGIN,
 } = {}) => {
   const state = {
     metamask: {
@@ -156,6 +164,24 @@ describe('NetworkListMenu', () => {
     ).toHaveLength(0);
   });
 
+  it('fires setNetworkClientIdForDomain when network item is clicked', () => {
+    const { getByText } = render();
+    fireEvent.click(getByText(MAINNET_DISPLAY_NAME));
+    expect(mockSetNetworkClientIdForDomain).toHaveBeenCalledWith(
+      MOCK_ORIGIN,
+      NETWORK_TYPES.MAINNET,
+    );
+  });
+
+  it('fires setNetworkClientIdForDomain when test network item is clicked', () => {
+    const { getByText } = render({ showTestNetworks: true });
+    fireEvent.click(getByText(SEPOLIA_DISPLAY_NAME));
+    expect(mockSetNetworkClientIdForDomain).toHaveBeenCalledWith(
+      MOCK_ORIGIN,
+      NETWORK_TYPES.SEPOLIA,
+    );
+  });
+
   describe('NetworkListMenu with ENABLE_NETWORK_UI_REDESIGN', () => {
     // Set the environment variable before tests run
     beforeEach(() => {

From 20880e169c58f5904c4744934ceda794d6ab1469 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 20 Aug 2024 13:25:47 -0230
Subject: [PATCH 209/236] Update snapshot tests

These files all should have been updated during merge conflict resolution
---
 .../asset-picker/asset-picker.tsx             |  2 +-
 .../send/__snapshots__/send.test.js.snap      |  2 +-
 .../blockaid-banner-alert.test.js.snap        | 20 -------
 .../__snapshots__/metametrics.test.js.snap    | 52 ++++++++++++++-----
 4 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index d70e73782b5d..276c89bd50ab 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -184,7 +184,7 @@ export function AssetPicker({
             badge={
               <AvatarNetwork
                 size={AvatarNetworkSize.Xs}
-                name={currentNetwork?.nickname}
+                name={currentNetwork?.nickname ?? ''}
                 src={currentNetwork?.rpcPrefs?.imageUrl}
                 backgroundColor={testNetworkBackgroundColor}
                 borderColor={
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 b85d6dc5ab08..4f7970ecf999 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -477,7 +477,7 @@ exports[`SendPage render and initialization should render correctly even when a
                               <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
+                                USD
                               </span>
                             </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 478775ac80f1..127e733ad95d 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
@@ -151,11 +151,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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"
-<<<<<<< HEAD
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
-=======
                   href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom"
->>>>>>> origin/Version-v12.1.0
                   rel="noopener noreferrer"
                   target="_blank"
                 >
@@ -252,11 +248,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp
                 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"
-<<<<<<< HEAD
-                  href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-=======
                   href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
->>>>>>> origin/Version-v12.1.0
                   rel="noopener noreferrer"
                   target="_blank"
                 >
@@ -354,11 +346,7 @@ exports[`Blockaid Banner Alert should render details section even when features
                   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"
-<<<<<<< HEAD
-                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-=======
                     href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
->>>>>>> origin/Version-v12.1.0
                     rel="noopener noreferrer"
                     target="_blank"
                   >
@@ -469,11 +457,7 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = `
                   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"
-<<<<<<< HEAD
-                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%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"
-=======
                     href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%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"
->>>>>>> origin/Version-v12.1.0
                     rel="noopener noreferrer"
                     target="_blank"
                   >
@@ -572,11 +556,7 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = `
                   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"
-<<<<<<< HEAD
-                    href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
-=======
                     href="https://blockaid-false-positive-portal.metamask.io?data=%7B%22blockaidVersion%22%3A%221.5.2%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom"
->>>>>>> origin/Version-v12.1.0
                     rel="noopener noreferrer"
                     target="_blank"
                   >
diff --git a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
index 516b27b2a38b..5c8c445397e7 100644
--- a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
+++ b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap
@@ -16,6 +16,18 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
     >
       We’d like to gather basic usage and diagnostics data to improve MetaMask. Know that we never sell the data you provide here.
     </p>
+    <div
+      class="mm-box mm-box--padding-top-2 mm-box--padding-bottom-2"
+    >
+      <a
+        class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        href="https://support.metamask.io/privacy-and-security/profile-privacy#how-is-the-profile-created"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Learn how we protect your privacy while collecting usage data for your profile.
+      </a>
+    </div>
     <p
       class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-left typography--color-text-default"
     >
@@ -123,20 +135,20 @@ exports[`Onboarding Metametrics Component should match snapshot 1`] = `
       </span>
     </h6>
     <div
-      class="onboarding-metametrics__buttons"
+      class="mm-box onboarding-metametrics__buttons mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full"
     >
-      <button
-        class="button btn--rounded btn-primary btn--large"
-        data-testid="metametrics-i-agree"
-      >
-        I agree
-      </button>
       <button
         class="button btn--rounded btn-secondary btn--large"
         data-testid="metametrics-no-thanks"
       >
         No thanks
       </button>
+      <button
+        class="button btn--rounded btn-primary btn--large"
+        data-testid="metametrics-i-agree"
+      >
+        I agree
+      </button>
     </div>
   </div>
 </div>
@@ -158,6 +170,18 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy
     >
       We’d like to gather basic usage and diagnostics data to improve MetaMask. Know that we never sell the data you provide here.
     </p>
+    <div
+      class="mm-box mm-box--padding-top-2 mm-box--padding-bottom-2"
+    >
+      <a
+        class="mm-box mm-text mm-text--body-md mm-box--color-primary-default"
+        href="https://support.metamask.io/privacy-and-security/profile-privacy#how-is-the-profile-created"
+        rel="noopener noreferrer"
+        target="_blank"
+      >
+        Learn how we protect your privacy while collecting usage data for your profile.
+      </a>
+    </div>
     <p
       class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography onboarding-metametrics__desc typography--p typography--weight-normal typography--style-normal typography--align-left typography--color-text-default"
     >
@@ -265,20 +289,20 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy
       </span>
     </h6>
     <div
-      class="onboarding-metametrics__buttons"
+      class="mm-box onboarding-metametrics__buttons mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full"
     >
-      <button
-        class="button btn--rounded btn-primary btn--large"
-        data-testid="metametrics-i-agree"
-      >
-        I agree
-      </button>
       <button
         class="button btn--rounded btn-secondary btn--large"
         data-testid="metametrics-no-thanks"
       >
         No thanks
       </button>
+      <button
+        class="button btn--rounded btn-primary btn--large"
+        data-testid="metametrics-i-agree"
+      >
+        I agree
+      </button>
     </div>
   </div>
 </div>

From 911c5c0671bd92b352108614a4e15abb2b576aa7 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Tue, 20 Aug 2024 13:59:24 -0230
Subject: [PATCH 210/236] Fix changelog

---
 CHANGELOG.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0483da1b1d24..e72a71db88a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.1.0]
+
 ## [12.0.5]
 ### Fixed
 - Prevent network selection per dapp from breaking if the rpc url of the currently selected network is edited ([#26453](https://github.com/MetaMask/metamask-extension/pull/26453))
@@ -4920,18 +4921,12 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.1.0...HEAD
-[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v12.1.0
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...HEAD
+[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...v12.1.0
 [12.0.5]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...v12.0.5
 [12.0.4]: https://github.com/MetaMask/metamask-extension/compare/v12.0.3...v12.0.4
 [12.0.3]: https://github.com/MetaMask/metamask-extension/compare/v12.0.2...v12.0.3
 [12.0.2]: https://github.com/MetaMask/metamask-extension/compare/v12.0.1...v12.0.2
 [12.0.1]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...v12.0.1
-[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v12.0.0...v12.1.0
 [12.0.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.16...v12.0.0
 [11.16.16]: https://github.com/MetaMask/metamask-extension/compare/v11.16.15...v11.16.16
 [11.16.15]: https://github.com/MetaMask/metamask-extension/compare/v11.16.14...v11.16.15

From ee890f9e16808bec0821a4e6073de1817b64799f Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Tue, 20 Aug 2024 08:17:03 -0700
Subject: [PATCH 211/236] put back 3e7448c4cd patch

---
 package.json |  2 +-
 yarn.lock    | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index d8bb50891ad5..ee91ede2bd3b 100644
--- a/package.json
+++ b/package.json
@@ -294,7 +294,7 @@
     "@metamask/address-book-controller": "^4.0.1",
     "@metamask/announcement-controller": "^6.1.0",
     "@metamask/approval-controller": "^7.0.0",
-    "@metamask/assets-controllers": "^33.0.0",
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch",
     "@metamask/base-controller": "^5.0.1",
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.5.0",
diff --git a/yarn.lock b/yarn.lock
index 4c564868c4e5..a9f2b43bbac3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4824,7 +4824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controllers@npm:^33.0.0":
+"@metamask/assets-controllers@npm:33.0.0":
   version: 33.0.0
   resolution: "@metamask/assets-controllers@npm:33.0.0"
   dependencies:
@@ -4866,6 +4866,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch":
+  version: 33.0.0
+  resolution: "@metamask/assets-controllers@patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch::version=33.0.0&hash=4c8a6f"
+  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:^17.0.0"
+    "@metamask/approval-controller": "npm:^7.0.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/contract-metadata": "npm:^2.4.0"
+    "@metamask/controller-utils": "npm:^11.0.0"
+    "@metamask/eth-query": "npm:^4.0.0"
+    "@metamask/keyring-controller": "npm:^17.1.0"
+    "@metamask/metamask-eth-abis": "npm:^3.1.1"
+    "@metamask/network-controller": "npm:^19.0.0"
+    "@metamask/polling-controller": "npm:^8.0.0"
+    "@metamask/preferences-controller": "npm:^13.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.5.0"
+    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": ^17.0.0
+    "@metamask/approval-controller": ^7.0.0
+    "@metamask/keyring-controller": ^17.0.0
+    "@metamask/network-controller": ^19.0.0
+    "@metamask/preferences-controller": ^13.0.0
+  checksum: 10/effeb152b776dad38e173f9a699158d6df15d4175d27de763ba6ddd8f9b50cf604722683f8d91af989a7b5d721d1b846c5a78d2553ce7f84787925440f3c1107
+  languageName: node
+  linkType: hard
+
 "@metamask/auto-changelog@npm:^2.1.0":
   version: 2.6.1
   resolution: "@metamask/auto-changelog@npm:2.6.1"
@@ -25283,7 +25325,7 @@ __metadata:
     "@metamask/announcement-controller": "npm:^6.1.0"
     "@metamask/api-specs": "npm:^0.9.3"
     "@metamask/approval-controller": "npm:^7.0.0"
-    "@metamask/assets-controllers": "npm:^33.0.0"
+    "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A33.0.0#~/.yarn/patches/@metamask-assets-controllers-npm-33.0.0-3e7448c4cd.patch"
     "@metamask/auto-changelog": "npm:^2.1.0"
     "@metamask/base-controller": "npm:^5.0.1"
     "@metamask/browser-passworder": "npm:^4.3.0"

From d8634a6ec874e0fa517bddb08f14ed40162a20ba Mon Sep 17 00:00:00 2001
From: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Date: Wed, 21 Aug 2024 08:27:47 -0400
Subject: [PATCH 212/236] Cherry-pick 6ed72f0 (PR #26542) (#26557)

---
 .../new-account-modal.component.js            |  4 +-
 .../new-account-modal.container.js            | 29 ++++---
 .../new-account-modal.test.tsx                | 87 +++++++++++++++++++
 3 files changed, 106 insertions(+), 14 deletions(-)
 create mode 100644 ui/components/app/modals/new-account-modal/new-account-modal.test.tsx

diff --git a/ui/components/app/modals/new-account-modal/new-account-modal.component.js b/ui/components/app/modals/new-account-modal/new-account-modal.component.js
index 72290c538afd..692ee4d5128e 100644
--- a/ui/components/app/modals/new-account-modal/new-account-modal.component.js
+++ b/ui/components/app/modals/new-account-modal/new-account-modal.component.js
@@ -26,8 +26,8 @@ export default class NewAccountModal extends Component {
     });
   };
 
-  onSubmit = () => {
-    this.props.onSave(this.state.alias).then(this.props.hideModal);
+  onSubmit = async () => {
+    await this.props.onSave(this.state.alias).then(this.props.hideModal);
   };
 
   onKeyPress = (e) => {
diff --git a/ui/components/app/modals/new-account-modal/new-account-modal.container.js b/ui/components/app/modals/new-account-modal/new-account-modal.container.js
index 2a1ba3175e80..13af5f15868b 100644
--- a/ui/components/app/modals/new-account-modal/new-account-modal.container.js
+++ b/ui/components/app/modals/new-account-modal/new-account-modal.container.js
@@ -1,5 +1,10 @@
 import { connect } from 'react-redux';
-import * as actions from '../../../../store/actions';
+import {
+  addNewAccount,
+  setAccountLabel,
+  forceUpdateMetamaskState,
+  hideModal,
+} from '../../../../store/actions';
 import NewAccountModal from './new-account-modal.component';
 
 function mapStateToProps(state) {
@@ -10,14 +15,14 @@ function mapStateToProps(state) {
 
 function mapDispatchToProps(dispatch) {
   return {
-    hideModal: () => dispatch(actions.hideModal()),
-    createAccount: (newAccountName) => {
-      return dispatch(actions.addNewAccount()).then((newAccountAddress) => {
-        if (newAccountName) {
-          dispatch(actions.setAccountLabel(newAccountAddress, newAccountName));
-        }
-        return newAccountAddress;
-      });
+    hideModal: () => dispatch(hideModal()),
+    createAccount: async (newAccountName) => {
+      const newAccountAddress = await dispatch(addNewAccount());
+      if (newAccountName) {
+        dispatch(setAccountLabel(newAccountAddress, newAccountName));
+      }
+      await forceUpdateMetamaskState(dispatch);
+      return newAccountAddress;
     },
   };
 }
@@ -30,9 +35,9 @@ function mergeProps(stateProps, dispatchProps) {
     ...stateProps,
     ...dispatchProps,
     onSave: (newAccountName) => {
-      return createAccount(newAccountName).then((newAccountAddress) =>
-        onCreateNewAccount(newAccountAddress),
-      );
+      return createAccount(newAccountName).then((newAccountAddress) => {
+        onCreateNewAccount(newAccountAddress);
+      });
     },
   };
 }
diff --git a/ui/components/app/modals/new-account-modal/new-account-modal.test.tsx b/ui/components/app/modals/new-account-modal/new-account-modal.test.tsx
new file mode 100644
index 000000000000..4c3fdf8de3e2
--- /dev/null
+++ b/ui/components/app/modals/new-account-modal/new-account-modal.test.tsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import thunk from 'redux-thunk';
+import { waitFor, fireEvent } from '@testing-library/react';
+import configureStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../../test/jest';
+import mockState from '../../../../../test/data/mock-state.json';
+import messages from '../../../../../app/_locales/en/messages.json';
+import NewAccountModal from './new-account-modal.container';
+
+const mockOnCreateNewAccount = jest.fn();
+const mockNewAccountNumber = 2;
+const mockNewMetamaskState = {
+  ...mockState.metamask,
+  currentLocale: 'en',
+};
+const mockAddress = '0x1234567890';
+
+const mockSubmitRequestToBackground = jest.fn().mockImplementation((method) => {
+  switch (method) {
+    case 'addNewAccount':
+      return mockAddress;
+    case 'setAccountLabel':
+      return {};
+    case 'getState':
+      return mockNewMetamaskState;
+    default:
+      return {};
+  }
+});
+
+jest.mock('../../../../store/background-connection', () => ({
+  ...jest.requireActual('../../../../store/background-connection'),
+  submitRequestToBackground: (method: string, args: unknown) =>
+    mockSubmitRequestToBackground(method, args),
+}));
+
+const renderModal = (
+  props = {
+    onCreateNewAccount: mockOnCreateNewAccount,
+    newAccountNumber: mockNewAccountNumber,
+  },
+) => {
+  const state = {
+    ...mockState,
+    metamask: {
+      ...mockState.metamask,
+      currentLocale: 'en',
+    },
+    appState: {
+      ...mockState.appState,
+      modal: {
+        ...mockState.appState.modal,
+        modalState: {
+          name: 'NEW_ACCOUNT',
+          props,
+        },
+      },
+    },
+  };
+  const middlewares = [thunk];
+  const mockStore = configureStore(middlewares);
+  const store = mockStore(state);
+
+  return {
+    render: renderWithProvider(<NewAccountModal />, store),
+    store,
+  };
+};
+
+describe('NewAccountModal', () => {
+  it('calls forceUpdateMetamaskState after adding account', async () => {
+    const { render } = renderModal();
+    const { getByText } = render;
+    const addAccountButton = getByText(messages.save.message);
+    expect(addAccountButton).toBeInTheDocument();
+
+    fireEvent.click(addAccountButton);
+
+    await waitFor(() => {
+      expect(mockSubmitRequestToBackground).toHaveBeenNthCalledWith(
+        2,
+        'getState',
+        undefined,
+      );
+    });
+  });
+});

From 8b0d1c360f29955fb9a377984c54a3cb31e4d08a Mon Sep 17 00:00:00 2001
From: martahj <marta.hourigan.johnson@gmail.com>
Date: Wed, 21 Aug 2024 07:53:25 -0500
Subject: [PATCH 213/236] fix: missing deadline in swaps stx status screen
 (#25779) (#26544)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**
This PR fixes an issue where the STX status screen for a swap was
showing a 0:00 for the timer. It is a cherry-pick of [this
PR](https://github.com/MetaMask/metamask-extension/pull/25779).

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

## **Related issues**

Related to: https://github.com/MetaMask/metamask-extension/pull/25063

## **Manual testing steps**

1. Make sure Smart Transactions is on (Settings > Advanced)
2. Do a Swap
3. Observe that timer is not 0:00 and is a reasonable number

## **Screenshots/Recordings**

### **Before**


https://github.com/user-attachments/assets/7388ffe0-c2c3-48e9-a01c-aaf8792cc720

### **After**



https://github.com/user-attachments/assets/302e1fa4-bebf-41d3-8f18-d6ad398d3b3a



## **Pre-merge author checklist**

- [X] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: infiniteflower <139582705+infiniteflower@users.noreply.github.com>
---
 app/scripts/controllers/swaps.constants.ts                    | 2 ++
 app/scripts/controllers/swaps.test.js                         | 3 +++
 app/scripts/controllers/swaps.ts                              | 4 ++++
 app/scripts/lib/setupSentry.js                                | 1 +
 .../errors-after-init-opt-in-background-state.json            | 1 +
 .../state-snapshots/errors-after-init-opt-in-ui-state.json    | 1 +
 .../smart-transaction-status/smart-transaction-status.js      | 1 -
 7 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/scripts/controllers/swaps.constants.ts b/app/scripts/controllers/swaps.constants.ts
index d959c02c439e..6228dd2bcb66 100644
--- a/app/scripts/controllers/swaps.constants.ts
+++ b/app/scripts/controllers/swaps.constants.ts
@@ -1,4 +1,5 @@
 import {
+  FALLBACK_SMART_TRANSACTIONS_DEADLINE,
   FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
   FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
 } from '../../../shared/constants/smartTransactions';
@@ -42,6 +43,7 @@ export const swapsControllerInitialState: { swapsState: SwapsControllerState } =
       swapsQuoteRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
       swapsQuotePrefetchingRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
       swapsStxBatchStatusRefreshTime: FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
+      swapsStxStatusDeadline: FALLBACK_SMART_TRANSACTIONS_DEADLINE,
       swapsStxGetTransactionsRefreshTime:
         FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
       swapsStxMaxFeeMultiplier: FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
diff --git a/app/scripts/controllers/swaps.test.js b/app/scripts/controllers/swaps.test.js
index e5059467532d..63b910f35b0e 100644
--- a/app/scripts/controllers/swaps.test.js
+++ b/app/scripts/controllers/swaps.test.js
@@ -120,6 +120,7 @@ const EMPTY_INIT_STATE = {
     swapsStxGetTransactionsRefreshTime:
       FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
     swapsStxMaxFeeMultiplier: FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
+    swapsStxStatusDeadline: 180,
     swapsUserFeeLevel: '',
     saveFetchedQuotes: false,
   },
@@ -1002,6 +1003,7 @@ describe('SwapsController', function () {
         const swapsQuotePrefetchingRefreshTime = 0;
         const swapsStxBatchStatusRefreshTime = 0;
         const swapsStxGetTransactionsRefreshTime = 0;
+        const swapsStxStatusDeadline = 0;
         swapsController.store.updateState({
           swapsState: {
             tokens,
@@ -1012,6 +1014,7 @@ describe('SwapsController', function () {
             swapsQuotePrefetchingRefreshTime,
             swapsStxBatchStatusRefreshTime,
             swapsStxGetTransactionsRefreshTime,
+            swapsStxStatusDeadline,
           },
         });
 
diff --git a/app/scripts/controllers/swaps.ts b/app/scripts/controllers/swaps.ts
index b0915b2ed21f..e8f7426744cd 100644
--- a/app/scripts/controllers/swaps.ts
+++ b/app/scripts/controllers/swaps.ts
@@ -24,6 +24,7 @@ import { CHAIN_IDS } from '../../../shared/constants/network';
 import {
   FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
   FALLBACK_SMART_TRANSACTIONS_REFRESH_TIME,
+  FALLBACK_SMART_TRANSACTIONS_DEADLINE,
 } from '../../../shared/constants/smartTransactions';
 import {
   DEFAULT_ERC20_APPROVE_GAS,
@@ -944,6 +945,9 @@ export default class SwapsController {
         swapsStxMaxFeeMultiplier:
           swapsNetworkConfig?.stxMaxFeeMultiplier ||
           FALLBACK_SMART_TRANSACTIONS_MAX_FEE_MULTIPLIER,
+        swapsStxStatusDeadline:
+          swapsNetworkConfig?.stxStatusDeadline ||
+          FALLBACK_SMART_TRANSACTIONS_DEADLINE,
       },
     });
   }
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 92173fc5f72c..4a0f8b0be488 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -335,6 +335,7 @@ export const SENTRY_BACKGROUND_STATE = {
       swapsQuotePrefetchingRefreshTime: true,
       swapsQuoteRefreshTime: true,
       swapsStxBatchStatusRefreshTime: true,
+      swapsStxStatusDeadline: true,
       swapsStxGetTransactionsRefreshTime: true,
       swapsStxMaxFeeMultiplier: true,
       swapsUserFeeLevel: true,
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
index 9d4a4d18c1f3..fc8db2d5aa47 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json
@@ -271,6 +271,7 @@
       "swapsQuoteRefreshTime": 60000,
       "swapsQuotePrefetchingRefreshTime": 60000,
       "swapsStxBatchStatusRefreshTime": 10000,
+      "swapsStxStatusDeadline": 180,
       "swapsStxGetTransactionsRefreshTime": 10000,
       "swapsStxMaxFeeMultiplier": 2
     }
diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
index 009c259f7c86..5157b6c88405 100644
--- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
+++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
@@ -245,6 +245,7 @@
       "swapsQuoteRefreshTime": 60000,
       "swapsQuotePrefetchingRefreshTime": 60000,
       "swapsStxBatchStatusRefreshTime": 10000,
+      "swapsStxStatusDeadline": 180,
       "swapsStxGetTransactionsRefreshTime": 10000,
       "swapsStxMaxFeeMultiplier": 2
     },
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 ad60188f4ce1..157190687f31 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -110,7 +110,6 @@ export default function SmartTransactionStatusPage() {
     cancellationFeeWei =
       latestSmartTransaction?.statusMetadata?.cancellationFeeWei;
   }
-
   const [timeLeftForPendingStxInSec, setTimeLeftForPendingStxInSec] = useState(
     swapsNetworkConfig.stxStatusDeadline,
   );

From 692f6cd4d5b85d5c8fe237b4c4b8d7374ef878c7 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 21 Aug 2024 15:51:00 -0230
Subject: [PATCH 214/236] chore: feat(sentry): Adding extensionId and
 installType to Sentry (#26482) (#26590)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a cherry-pick of #26482 for v12.0.6. Original description:

<!--
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 want to differentiate between errors from our published extension,
and errors from side-loaded extensions or forks that we don't support.
Adding `extensionID` to our Sentry logs helps us do that. Following
@Gudahtt's suggestion to use
https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/management/getSelf
to add `installType` as well.
<!--
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/26482?quickstart=1)

## **Related issues**

Fixes: #26444

## **Manual testing steps**

1. Run app, go to network tab in devtools
2. Filter for sentry envelope request and verify

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

<!-- [screenshots/recordings] -->
<img width="1728" alt="image"
src="https://github.com/user-attachments/assets/9427b0f7-f1a0-4305-b16e-c48e3ec8e408">

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Victor Thomas <10986371+vthomas13@users.noreply.github.com>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 app/scripts/background.js                    |   2 +-
 app/scripts/constants/sentry-state.ts        | 400 ++++++++++++++++++
 app/scripts/lib/setup-initial-state-hooks.js |   2 +-
 app/scripts/lib/setupSentry.js               | 423 +------------------
 lavamoat/browserify/beta/policy.json         |  11 -
 lavamoat/browserify/desktop/policy.json      |  11 -
 lavamoat/browserify/flask/policy.json        |  11 -
 lavamoat/browserify/main/policy.json         |  11 -
 lavamoat/browserify/mmi/policy.json          |  11 -
 test/e2e/tests/metrics/errors.spec.js        |  16 +-
 ui/index.js                                  |   2 +-
 11 files changed, 439 insertions(+), 461 deletions(-)
 create mode 100644 app/scripts/constants/sentry-state.ts

diff --git a/app/scripts/background.js b/app/scripts/background.js
index c7a1621fba19..a9bc3f5f3f5d 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -48,7 +48,7 @@ import Migrator from './lib/migrator';
 import ExtensionPlatform from './platforms/extension';
 import LocalStore from './lib/local-store';
 import ReadOnlyNetworkStore from './lib/network-store';
-import { SENTRY_BACKGROUND_STATE } from './lib/setupSentry';
+import { SENTRY_BACKGROUND_STATE } from './constants/sentry-state';
 
 import createStreamSink from './lib/createStreamSink';
 import NotificationManager, {
diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
new file mode 100644
index 000000000000..792bc4882051
--- /dev/null
+++ b/app/scripts/constants/sentry-state.ts
@@ -0,0 +1,400 @@
+import { AllProperties } from '../../../shared/modules/object.utils';
+
+export const MMI_SENTRY_BACKGROUND_STATE = {
+  MMIController: {
+    opts: true,
+  },
+  CustodyController: {
+    store: true,
+  },
+  MmiConfigurationController: {
+    store: true,
+    configurationClient: true,
+  },
+};
+
+// This describes the subset of background controller state attached to errors
+// sent to Sentry These properties have some potential to be useful for
+// debugging, and they do not contain any identifiable information.
+export const SENTRY_BACKGROUND_STATE = {
+  AccountsController: {
+    internalAccounts: {
+      accounts: false,
+      selectedAccount: false,
+    },
+  },
+  AccountTracker: {
+    accounts: false,
+    accountsByChainId: false,
+    currentBlockGasLimit: true,
+    currentBlockGasLimitByChainId: true,
+  },
+  AddressBookController: {
+    addressBook: false,
+  },
+  AlertController: {
+    alertEnabledness: true,
+    unconnectedAccountAlertShownOrigins: false,
+    web3ShimUsageOrigins: false,
+  },
+  AnnouncementController: {
+    announcements: false,
+  },
+  AuthenticationController: {
+    isSignedIn: false,
+  },
+  NetworkOrderController: {
+    orderedNetworkList: [],
+  },
+  AccountOrderController: {
+    pinnedAccountList: [],
+    hiddenAccountList: [],
+  },
+  AppMetadataController: {
+    currentAppVersion: true,
+    currentMigrationVersion: true,
+    previousAppVersion: true,
+    previousMigrationVersion: true,
+    showTokenAutodetectModalOnUpgrade: false,
+  },
+  ApprovalController: {
+    approvalFlows: false,
+    pendingApprovals: false,
+    pendingApprovalCount: false,
+  },
+  AppStateController: {
+    browserEnvironment: true,
+    connectedStatusPopoverHasBeenShown: true,
+    currentPopupId: false,
+    onboardingDate: false,
+    currentExtensionPopupId: false,
+    defaultHomeActiveTabName: true,
+    fullScreenGasPollTokens: true,
+    hadAdvancedGasFeesSetPriorToMigration92_3: true,
+    nftsDetectionNoticeDismissed: true,
+    nftsDropdownState: true,
+    notificationGasPollTokens: true,
+    outdatedBrowserWarningLastShown: true,
+    popupGasPollTokens: true,
+    qrHardware: true,
+    recoveryPhraseReminderHasBeenShown: true,
+    recoveryPhraseReminderLastShown: true,
+    showBetaHeader: true,
+    showPermissionsTour: true,
+    showNetworkBanner: true,
+    showAccountBanner: true,
+    switchedNetworkDetails: false,
+    switchedNetworkNeverShowMessage: false,
+    showTestnetMessageInDropdown: true,
+    surveyLinkLastClickedOrClosed: true,
+    snapsInstallPrivacyWarningShown: true,
+    termsOfUseLastAgreed: true,
+    timeoutMinutes: true,
+    trezorModel: true,
+    usedNetworks: true,
+  },
+  CronjobController: {
+    jobs: false,
+  },
+  CurrencyController: {
+    currentCurrency: true,
+    currencyRates: true,
+  },
+  DecryptMessageController: {
+    unapprovedDecryptMsgs: false,
+    unapprovedDecryptMsgCount: true,
+  },
+  EncryptionPublicKeyController: {
+    unapprovedEncryptionPublicKeyMsgs: false,
+    unapprovedEncryptionPublicKeyMsgCount: true,
+  },
+  EnsController: {
+    ensResolutionsByAddress: false,
+    ensEntries: false,
+  },
+  GasFeeController: {
+    estimatedGasFeeTimeBounds: true,
+    gasEstimateType: true,
+    gasFeeEstimates: true,
+    gasFeeEstimatesByChainId: true,
+    nonRPCGasFeeApisDisabled: false,
+  },
+  KeyringController: {
+    isUnlocked: true,
+    keyrings: false,
+  },
+  LoggingController: {
+    logs: false,
+  },
+  MetamaskNotificationsController: {
+    subscriptionAccountsSeen: false,
+    isMetamaskNotificationsFeatureSeen: false,
+    isMetamaskNotificationsEnabled: false,
+    isFeatureAnnouncementsEnabled: false,
+    metamaskNotificationsList: false,
+    metamaskNotificationsReadList: false,
+    isCheckingAccountsPresence: false,
+    isFetchingMetamaskNotifications: false,
+    isUpdatingMetamaskNotifications: false,
+    isUpdatingMetamaskNotificationsAccount: false,
+  },
+  MetaMetricsController: {
+    eventsBeforeMetricsOptIn: false,
+    fragments: false,
+    metaMetricsId: true,
+    participateInMetaMetrics: true,
+    previousUserTraits: false,
+    segmentApiCalls: false,
+    traits: false,
+    dataCollectionForMarketing: false,
+  },
+  NameController: {
+    names: false,
+    nameSources: false,
+    useExternalNameSources: false,
+  },
+  NetworkController: {
+    networkConfigurations: false,
+    networksMetadata: true,
+    providerConfig: {
+      chainId: true,
+      id: true,
+      nickname: true,
+      rpcPrefs: false,
+      rpcUrl: false,
+      ticker: true,
+      type: true,
+    },
+    selectedNetworkClientId: false,
+  },
+  NftController: {
+    allNftContracts: false,
+    allNfts: false,
+    ignoredNfts: false,
+  },
+  NotificationController: {
+    notifications: false,
+  },
+  OnboardingController: {
+    completedOnboarding: true,
+    firstTimeFlowType: true,
+    onboardingTabs: false,
+    seedPhraseBackedUp: true,
+  },
+  PPOMController: {
+    securityAlertsEnabled: false,
+    storageMetadata: [],
+    versionFileETag: false,
+    versionInfo: [],
+  },
+  PermissionController: {
+    subjects: false,
+  },
+  PermissionLogController: {
+    permissionActivityLog: false,
+    permissionHistory: false,
+  },
+  PhishingController: {},
+  PreferencesController: {
+    advancedGasFee: true,
+    currentLocale: true,
+    disabledRpcMethodPreferences: true,
+    dismissSeedBackUpReminder: true,
+    featureFlags: true,
+    forgottenPassword: true,
+    identities: false,
+    incomingTransactionsPreferences: true,
+    isIpfsGatewayEnabled: false,
+    ipfsGateway: false,
+    knownMethodData: false,
+    ledgerTransportType: true,
+    lostIdentities: false,
+    openSeaEnabled: true,
+    preferences: {
+      autoLockTimeLimit: true,
+      hideZeroBalanceTokens: true,
+      showExtensionInFullSizeView: true,
+      showFiatInTestnets: true,
+      showTestNetworks: true,
+      smartTransactionsOptInStatus: true,
+      useNativeCurrencyAsPrimaryCurrency: true,
+      petnamesEnabled: true,
+      showTokenAutodetectModal: false,
+    },
+    useExternalServices: false,
+    selectedAddress: false,
+    snapRegistryList: false,
+    theme: true,
+    signatureSecurityAlertResponses: false,
+    use4ByteResolution: true,
+    useAddressBarEnsResolution: true,
+    useBlockie: true,
+    useCurrencyRateCheck: true,
+    useMultiAccountBalanceChecker: true,
+    useNftDetection: true,
+    useNonceField: true,
+    usePhishDetect: true,
+    useTokenDetection: true,
+    useRequestQueue: true,
+    useTransactionSimulations: true,
+    enableMV3TimestampSave: true,
+    hasDismissedOpenSeaToBlockaidBanner: true,
+  },
+  PushPlatformNotificationsController: {
+    fcmToken: false,
+  },
+  QueuedRequestController: {
+    queuedRequestCount: true,
+  },
+  SelectedNetworkController: { domains: false },
+  SignatureController: {
+    unapprovedMsgCount: true,
+    unapprovedMsgs: false,
+    unapprovedPersonalMsgCount: true,
+    unapprovedPersonalMsgs: false,
+    unapprovedTypedMessages: false,
+    unapprovedTypedMessagesCount: true,
+  },
+  SmartTransactionsController: {
+    smartTransactionsState: {
+      fees: {
+        approvalTxFees: true,
+        tradeTxFees: true,
+      },
+      liveness: true,
+      smartTransactions: false,
+      userOptIn: true,
+      userOptInV2: true,
+    },
+  },
+  SnapController: {
+    unencryptedSnapStates: false,
+    snapStates: false,
+    snaps: false,
+  },
+  SnapInterface: {
+    interfaces: false,
+  },
+  SnapsRegistry: {
+    database: false,
+    lastUpdated: false,
+    databaseUnavailable: false,
+  },
+  SubjectMetadataController: {
+    subjectMetadata: false,
+  },
+  SwapsController: {
+    swapsState: {
+      approveTxId: false,
+      customApproveTxData: false,
+      customGasPrice: true,
+      customMaxFeePerGas: true,
+      customMaxGas: true,
+      customMaxPriorityFeePerGas: true,
+      errorKey: true,
+      fetchParams: true,
+      quotes: false,
+      quotesLastFetched: true,
+      quotesPollingLimitEnabled: true,
+      routeState: true,
+      saveFetchedQuotes: true,
+      selectedAggId: true,
+      swapsFeatureFlags: true,
+      swapsFeatureIsLive: true,
+      swapsQuotePrefetchingRefreshTime: true,
+      swapsQuoteRefreshTime: true,
+      swapsStxBatchStatusRefreshTime: true,
+      swapsStxGetTransactionsRefreshTime: true,
+      swapsStxMaxFeeMultiplier: true,
+      swapsUserFeeLevel: true,
+      tokens: false,
+      topAggId: false,
+      tradeTxId: false,
+    },
+  },
+  TokenDetectionController: {
+    [AllProperties]: false,
+  },
+  TokenListController: {
+    preventPollingOnNetworkRestart: true,
+    tokenList: false,
+    tokensChainsCache: {
+      [AllProperties]: false,
+    },
+  },
+  TokenRatesController: {
+    marketData: false,
+  },
+  TokensController: {
+    allDetectedTokens: {
+      [AllProperties]: false,
+    },
+    allIgnoredTokens: {
+      [AllProperties]: false,
+    },
+    allTokens: {
+      [AllProperties]: false,
+    },
+    detectedTokens: false,
+    ignoredTokens: false,
+    tokens: false,
+  },
+  TransactionController: {
+    transactions: false,
+    lastFetchedBlockNumbers: false,
+    methodData: false,
+  },
+  TxController: {
+    transactions: false,
+  },
+  UserOperationController: {
+    userOperations: false,
+  },
+  UserStorageController: {
+    isProfileSyncingEnabled: true,
+    isProfileSyncingUpdateLoading: false,
+  },
+  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
+  ...MMI_SENTRY_BACKGROUND_STATE,
+  ///: END:ONLY_INCLUDE_IF
+};
+
+const flattenedBackgroundStateMask = Object.values(
+  SENTRY_BACKGROUND_STATE,
+).reduce((partialBackgroundState, controllerState: object) => {
+  return {
+    ...partialBackgroundState,
+    ...controllerState,
+  };
+}, {});
+
+// This describes the subset of Redux state attached to errors sent to Sentry
+// These properties have some potential to be useful for debugging, and they do
+// not contain any identifiable information.
+export const SENTRY_UI_STATE = {
+  gas: true,
+  history: true,
+  metamask: {
+    ...flattenedBackgroundStateMask,
+    // This property comes from the background but isn't in controller state
+    isInitialized: true,
+    // These properties are in the `metamask` slice but not in the background state
+    customNonceValue: true,
+    isAccountMenuOpen: true,
+    isNetworkMenuOpen: true,
+    nextNonce: true,
+    pendingTokens: false,
+    welcomeScreenSeen: true,
+    confirmationExchangeRates: true,
+    useSafeChainsListValidation: true,
+    ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+    addSnapAccountEnabled: false,
+    snapsAddSnapAccountModalDismissed: false,
+    ///: END:ONLY_INCLUDE_IF
+    switchedNetworkDetails: false,
+    switchedNetworkNeverShowMessage: false,
+    newPrivacyPolicyToastClickedOrClosed: false,
+    newPrivacyPolicyToastShownDate: false,
+  },
+  unconnectedAccount: true,
+};
diff --git a/app/scripts/lib/setup-initial-state-hooks.js b/app/scripts/lib/setup-initial-state-hooks.js
index 9b3f18e09b3e..3cd13a77e29e 100644
--- a/app/scripts/lib/setup-initial-state-hooks.js
+++ b/app/scripts/lib/setup-initial-state-hooks.js
@@ -1,8 +1,8 @@
 import { maskObject } from '../../../shared/modules/object.utils';
 import ExtensionPlatform from '../platforms/extension';
+import { SENTRY_BACKGROUND_STATE } from '../constants/sentry-state';
 import LocalStore from './local-store';
 import ReadOnlyNetworkStore from './network-store';
-import { SENTRY_BACKGROUND_STATE } from './setupSentry';
 
 const platform = new ExtensionPlatform();
 
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 3dd4f11e643c..47f06a6c2edf 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -1,10 +1,11 @@
 import * as Sentry from '@sentry/browser';
 import { Dedupe, ExtraErrorData } from '@sentry/integrations';
-
-import { AllProperties } from '../../../shared/modules/object.utils';
+import browser from 'webextension-polyfill';
 import { FilterEvents } from './sentry-filter-events';
 import extractEthjsErrorMessage from './extractEthjsErrorMessage';
 
+let installType = 'unknown';
+
 /* eslint-disable prefer-destructuring */
 // Destructuring breaks the inlining of the environment variables
 const METAMASK_DEBUG = process.env.METAMASK_DEBUG;
@@ -23,406 +24,6 @@ export const ERROR_URL_ALLOWLIST = {
   CODEFI: 'codefi.network',
   SEGMENT: 'segment.io',
 };
-
-export const MMI_SENTRY_BACKGROUND_STATE = {
-  MMIController: {
-    opts: true,
-  },
-  CustodyController: {
-    store: true,
-  },
-  MmiConfigurationController: {
-    store: true,
-    configurationClient: true,
-  },
-};
-
-// This describes the subset of background controller state attached to errors
-// sent to Sentry These properties have some potential to be useful for
-// debugging, and they do not contain any identifiable information.
-export const SENTRY_BACKGROUND_STATE = {
-  AccountsController: {
-    internalAccounts: {
-      accounts: false,
-      selectedAccount: false,
-    },
-  },
-  AccountTracker: {
-    accounts: false,
-    accountsByChainId: false,
-    currentBlockGasLimit: true,
-    currentBlockGasLimitByChainId: true,
-  },
-  AddressBookController: {
-    addressBook: false,
-  },
-  AlertController: {
-    alertEnabledness: true,
-    unconnectedAccountAlertShownOrigins: false,
-    web3ShimUsageOrigins: false,
-  },
-  AnnouncementController: {
-    announcements: false,
-  },
-  AuthenticationController: {
-    isSignedIn: false,
-  },
-  NetworkOrderController: {
-    orderedNetworkList: [],
-  },
-  AccountOrderController: {
-    pinnedAccountList: [],
-    hiddenAccountList: [],
-  },
-  AppMetadataController: {
-    currentAppVersion: true,
-    currentMigrationVersion: true,
-    previousAppVersion: true,
-    previousMigrationVersion: true,
-    showTokenAutodetectModalOnUpgrade: false,
-  },
-  ApprovalController: {
-    approvalFlows: false,
-    pendingApprovals: false,
-    pendingApprovalCount: false,
-  },
-  AppStateController: {
-    browserEnvironment: true,
-    connectedStatusPopoverHasBeenShown: true,
-    currentPopupId: false,
-    onboardingDate: false,
-    currentExtensionPopupId: false,
-    defaultHomeActiveTabName: true,
-    fullScreenGasPollTokens: true,
-    hadAdvancedGasFeesSetPriorToMigration92_3: true,
-    nftsDetectionNoticeDismissed: true,
-    nftsDropdownState: true,
-    notificationGasPollTokens: true,
-    outdatedBrowserWarningLastShown: true,
-    popupGasPollTokens: true,
-    qrHardware: true,
-    recoveryPhraseReminderHasBeenShown: true,
-    recoveryPhraseReminderLastShown: true,
-    showBetaHeader: true,
-    showPermissionsTour: true,
-    showNetworkBanner: true,
-    showAccountBanner: true,
-    switchedNetworkDetails: false,
-    switchedNetworkNeverShowMessage: false,
-    showTestnetMessageInDropdown: true,
-    surveyLinkLastClickedOrClosed: true,
-    snapsInstallPrivacyWarningShown: true,
-    termsOfUseLastAgreed: true,
-    timeoutMinutes: true,
-    trezorModel: true,
-    usedNetworks: true,
-  },
-  CronjobController: {
-    jobs: false,
-  },
-  CurrencyController: {
-    currentCurrency: true,
-    currencyRates: true,
-  },
-  DecryptMessageController: {
-    unapprovedDecryptMsgs: false,
-    unapprovedDecryptMsgCount: true,
-  },
-  EncryptionPublicKeyController: {
-    unapprovedEncryptionPublicKeyMsgs: false,
-    unapprovedEncryptionPublicKeyMsgCount: true,
-  },
-  EnsController: {
-    ensResolutionsByAddress: false,
-    ensEntries: false,
-  },
-  GasFeeController: {
-    estimatedGasFeeTimeBounds: true,
-    gasEstimateType: true,
-    gasFeeEstimates: true,
-    gasFeeEstimatesByChainId: true,
-    nonRPCGasFeeApisDisabled: false,
-  },
-  KeyringController: {
-    isUnlocked: true,
-    keyrings: false,
-  },
-  LoggingController: {
-    logs: false,
-  },
-  MetamaskNotificationsController: {
-    subscriptionAccountsSeen: false,
-    isMetamaskNotificationsFeatureSeen: false,
-    isMetamaskNotificationsEnabled: false,
-    isFeatureAnnouncementsEnabled: false,
-    metamaskNotificationsList: false,
-    metamaskNotificationsReadList: false,
-    isCheckingAccountsPresence: false,
-    isFetchingMetamaskNotifications: false,
-    isUpdatingMetamaskNotifications: false,
-    isUpdatingMetamaskNotificationsAccount: false,
-  },
-  MetaMetricsController: {
-    eventsBeforeMetricsOptIn: false,
-    fragments: false,
-    metaMetricsId: true,
-    participateInMetaMetrics: true,
-    previousUserTraits: false,
-    segmentApiCalls: false,
-    traits: false,
-    dataCollectionForMarketing: false,
-  },
-  NameController: {
-    names: false,
-    nameSources: false,
-    useExternalNameSources: false,
-  },
-  NetworkController: {
-    networkConfigurations: false,
-    networksMetadata: true,
-    providerConfig: {
-      chainId: true,
-      id: true,
-      nickname: true,
-      rpcPrefs: false,
-      rpcUrl: false,
-      ticker: true,
-      type: true,
-    },
-    selectedNetworkClientId: false,
-  },
-  NftController: {
-    allNftContracts: false,
-    allNfts: false,
-    ignoredNfts: false,
-  },
-  NotificationController: {
-    notifications: false,
-  },
-  OnboardingController: {
-    completedOnboarding: true,
-    firstTimeFlowType: true,
-    onboardingTabs: false,
-    seedPhraseBackedUp: true,
-  },
-  PPOMController: {
-    securityAlertsEnabled: false,
-    storageMetadata: [],
-    versionFileETag: false,
-    versionInfo: [],
-  },
-  PermissionController: {
-    subjects: false,
-  },
-  PermissionLogController: {
-    permissionActivityLog: false,
-    permissionHistory: false,
-  },
-  PhishingController: {},
-  PreferencesController: {
-    advancedGasFee: true,
-    currentLocale: true,
-    disabledRpcMethodPreferences: true,
-    dismissSeedBackUpReminder: true,
-    featureFlags: true,
-    forgottenPassword: true,
-    identities: false,
-    incomingTransactionsPreferences: true,
-    isIpfsGatewayEnabled: false,
-    ipfsGateway: false,
-    knownMethodData: false,
-    ledgerTransportType: true,
-    lostIdentities: false,
-    openSeaEnabled: true,
-    preferences: {
-      autoLockTimeLimit: true,
-      hideZeroBalanceTokens: true,
-      showExtensionInFullSizeView: true,
-      showFiatInTestnets: true,
-      showTestNetworks: true,
-      smartTransactionsOptInStatus: true,
-      useNativeCurrencyAsPrimaryCurrency: true,
-      petnamesEnabled: true,
-      showTokenAutodetectModal: false,
-    },
-    useExternalServices: false,
-    selectedAddress: false,
-    snapRegistryList: false,
-    theme: true,
-    signatureSecurityAlertResponses: false,
-    use4ByteResolution: true,
-    useAddressBarEnsResolution: true,
-    useBlockie: true,
-    useCurrencyRateCheck: true,
-    useMultiAccountBalanceChecker: true,
-    useNftDetection: true,
-    useNonceField: true,
-    usePhishDetect: true,
-    useTokenDetection: true,
-    useRequestQueue: true,
-    useTransactionSimulations: true,
-    enableMV3TimestampSave: true,
-    hasDismissedOpenSeaToBlockaidBanner: true,
-  },
-  PushPlatformNotificationsController: {
-    fcmToken: false,
-  },
-  QueuedRequestController: {
-    queuedRequestCount: true,
-  },
-  SelectedNetworkController: { domains: false },
-  SignatureController: {
-    unapprovedMsgCount: true,
-    unapprovedMsgs: false,
-    unapprovedPersonalMsgCount: true,
-    unapprovedPersonalMsgs: false,
-    unapprovedTypedMessages: false,
-    unapprovedTypedMessagesCount: true,
-  },
-  SmartTransactionsController: {
-    smartTransactionsState: {
-      fees: {
-        approvalTxFees: true,
-        tradeTxFees: true,
-      },
-      liveness: true,
-      smartTransactions: false,
-      userOptIn: true,
-      userOptInV2: true,
-    },
-  },
-  SnapController: {
-    unencryptedSnapStates: false,
-    snapStates: false,
-    snaps: false,
-  },
-  SnapInterface: {
-    interfaces: false,
-  },
-  SnapsRegistry: {
-    database: false,
-    lastUpdated: false,
-    databaseUnavailable: false,
-  },
-  SubjectMetadataController: {
-    subjectMetadata: false,
-  },
-  SwapsController: {
-    swapsState: {
-      approveTxId: false,
-      customApproveTxData: false,
-      customGasPrice: true,
-      customMaxFeePerGas: true,
-      customMaxGas: true,
-      customMaxPriorityFeePerGas: true,
-      errorKey: true,
-      fetchParams: true,
-      quotes: false,
-      quotesLastFetched: true,
-      quotesPollingLimitEnabled: true,
-      routeState: true,
-      saveFetchedQuotes: true,
-      selectedAggId: true,
-      swapsFeatureFlags: true,
-      swapsFeatureIsLive: true,
-      swapsQuotePrefetchingRefreshTime: true,
-      swapsQuoteRefreshTime: true,
-      swapsStxBatchStatusRefreshTime: true,
-      swapsStxGetTransactionsRefreshTime: true,
-      swapsStxMaxFeeMultiplier: true,
-      swapsUserFeeLevel: true,
-      tokens: false,
-      topAggId: false,
-      tradeTxId: false,
-    },
-  },
-  TokenDetectionController: {
-    [AllProperties]: false,
-  },
-  TokenListController: {
-    preventPollingOnNetworkRestart: true,
-    tokenList: false,
-    tokensChainsCache: {
-      [AllProperties]: false,
-    },
-  },
-  TokenRatesController: {
-    marketData: false,
-  },
-  TokensController: {
-    allDetectedTokens: {
-      [AllProperties]: false,
-    },
-    allIgnoredTokens: {
-      [AllProperties]: false,
-    },
-    allTokens: {
-      [AllProperties]: false,
-    },
-    detectedTokens: false,
-    ignoredTokens: false,
-    tokens: false,
-  },
-  TransactionController: {
-    transactions: false,
-    lastFetchedBlockNumbers: false,
-    methodData: false,
-  },
-  TxController: {
-    transactions: false,
-  },
-  UserOperationController: {
-    userOperations: false,
-  },
-  UserStorageController: {
-    isProfileSyncingEnabled: true,
-    isProfileSyncingUpdateLoading: false,
-  },
-  ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-  ...MMI_SENTRY_BACKGROUND_STATE,
-  ///: END:ONLY_INCLUDE_IF
-};
-
-const flattenedBackgroundStateMask = Object.values(
-  SENTRY_BACKGROUND_STATE,
-).reduce((partialBackgroundState, controllerState) => {
-  return {
-    ...partialBackgroundState,
-    ...controllerState,
-  };
-}, {});
-
-// This describes the subset of Redux state attached to errors sent to Sentry
-// These properties have some potential to be useful for debugging, and they do
-// not contain any identifiable information.
-export const SENTRY_UI_STATE = {
-  gas: true,
-  history: true,
-  metamask: {
-    ...flattenedBackgroundStateMask,
-    // This property comes from the background but isn't in controller state
-    isInitialized: true,
-    // These properties are in the `metamask` slice but not in the background state
-    customNonceValue: true,
-    isAccountMenuOpen: true,
-    isNetworkMenuOpen: true,
-    nextNonce: true,
-    pendingTokens: false,
-    welcomeScreenSeen: true,
-    confirmationExchangeRates: true,
-    useSafeChainsListValidation: true,
-    ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-    addSnapAccountEnabled: false,
-    snapsAddSnapAccountModalDismissed: false,
-    ///: END:ONLY_INCLUDE_IF
-    switchedNetworkDetails: false,
-    switchedNetworkNeverShowMessage: false,
-    newPrivacyPolicyToastClickedOrClosed: false,
-    newPrivacyPolicyToastShownDate: false,
-  },
-  unconnectedAccount: true,
-};
-
 /**
  * Returns whether MetaMetrics is enabled, given the application state.
  *
@@ -574,6 +175,19 @@ export default function setupSentry({ release, getState }) {
     return getMetaMetricsEnabled();
   }
 
+  // Normally this would be awaited, but getSelf should be available by the time the report is finalized.
+  // If it's not, we still get the extensionId, but the installType will default to "unknown"
+  browser.management
+    .getSelf()
+    .then((extensionInfo) => {
+      if (extensionInfo.installType) {
+        installType = extensionInfo.installType;
+      }
+    })
+    .catch((error) => {
+      console.log('Error getting extension installType', error);
+    });
+
   Sentry.init({
     dsn: sentryTarget,
     debug: METAMASK_DEBUG,
@@ -785,6 +399,11 @@ export function rewriteReport(report, getState) {
       }
       report.extra.appState = appState;
     }
+
+    if (browser.runtime && browser.runtime.id) {
+      report.extra.extensionId = browser.runtime.id;
+    }
+    report.extra.installType = installType;
   } catch (err) {
     console.warn(err);
   }
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 5bab831bbd2d..1a441e91627d 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -3285,17 +3285,6 @@
         "browserify>process": true
       }
     },
-    "@sentry/integrations": {
-      "globals": {
-        "Request": true,
-        "__SENTRY_DEBUG__": true,
-        "console.log": true
-      },
-      "packages": {
-        "@sentry/utils": true,
-        "localforage": true
-      }
-    },
     "@sentry/utils": {
       "globals": {
         "CustomEvent": true,
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 8a8bac44c7f4..4ead1a6c4588 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -3378,17 +3378,6 @@
         "browserify>process": true
       }
     },
-    "@sentry/integrations": {
-      "globals": {
-        "Request": true,
-        "__SENTRY_DEBUG__": true,
-        "console.log": true
-      },
-      "packages": {
-        "@sentry/utils": true,
-        "localforage": true
-      }
-    },
     "@sentry/utils": {
       "globals": {
         "CustomEvent": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 794e0b277ac9..755fe9f03043 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -3430,17 +3430,6 @@
         "browserify>process": true
       }
     },
-    "@sentry/integrations": {
-      "globals": {
-        "Request": true,
-        "__SENTRY_DEBUG__": true,
-        "console.log": true
-      },
-      "packages": {
-        "@sentry/utils": true,
-        "localforage": true
-      }
-    },
     "@sentry/utils": {
       "globals": {
         "CustomEvent": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 5bab831bbd2d..1a441e91627d 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -3285,17 +3285,6 @@
         "browserify>process": true
       }
     },
-    "@sentry/integrations": {
-      "globals": {
-        "Request": true,
-        "__SENTRY_DEBUG__": true,
-        "console.log": true
-      },
-      "packages": {
-        "@sentry/utils": true,
-        "localforage": true
-      }
-    },
     "@sentry/utils": {
       "globals": {
         "CustomEvent": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 2cf2b367b7d9..b683318fe47b 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -3377,17 +3377,6 @@
         "browserify>process": true
       }
     },
-    "@sentry/integrations": {
-      "globals": {
-        "Request": true,
-        "__SENTRY_DEBUG__": true,
-        "console.log": true
-      },
-      "packages": {
-        "@sentry/utils": true,
-        "localforage": true
-      }
-    },
     "@sentry/utils": {
       "globals": {
         "CustomEvent": true,
diff --git a/test/e2e/tests/metrics/errors.spec.js b/test/e2e/tests/metrics/errors.spec.js
index 0961b46c5aa5..c9234165da51 100644
--- a/test/e2e/tests/metrics/errors.spec.js
+++ b/test/e2e/tests/metrics/errors.spec.js
@@ -5,7 +5,9 @@ const { get, has, set, unset, cloneDeep } = require('lodash');
 const { Browser } = require('selenium-webdriver');
 const { format } = require('prettier');
 const { isObject } = require('@metamask/utils');
-const { SENTRY_UI_STATE } = require('../../../../app/scripts/lib/setupSentry');
+const {
+  SENTRY_UI_STATE,
+} = require('../../../../app/scripts/constants/sentry-state');
 const FixtureBuilder = require('../../fixture-builder');
 const { convertToHexValue, withFixtures } = require('../../helpers');
 
@@ -667,6 +669,7 @@ describe('Sentry errors', function () {
           const mockTextBody = (await mockedRequest.body.getText()).split('\n');
           const mockJsonBody = JSON.parse(mockTextBody[2]);
           const appState = mockJsonBody?.extra?.appState;
+          const { extensionId, installType } = mockJsonBody.extra;
           assert.deepStrictEqual(Object.keys(appState), [
             'browser',
             'version',
@@ -682,6 +685,11 @@ describe('Sentry errors', function () {
               appState?.version.length > 0,
             'Invalid version state',
           );
+          assert.ok(
+            typeof extensionId === 'string' && extensionId.length > 0,
+            `${extensionId} is not a valid extension ID`,
+          );
+          assert.equal(installType, 'development');
           await matchesSnapshot({
             data: transformBackgroundState(appState.state),
             snapshot: 'errors-after-init-opt-in-background-state',
@@ -759,6 +767,7 @@ describe('Sentry errors', function () {
           const mockTextBody = (await mockedRequest.body.getText()).split('\n');
           const mockJsonBody = JSON.parse(mockTextBody[2]);
           const appState = mockJsonBody?.extra?.appState;
+          const { extensionId, installType } = mockJsonBody.extra;
           assert.deepStrictEqual(Object.keys(appState), [
             'browser',
             'version',
@@ -774,6 +783,11 @@ describe('Sentry errors', function () {
               appState?.version.length > 0,
             'Invalid version state',
           );
+          assert.ok(
+            typeof extensionId === 'string' && extensionId.length > 0,
+            `${extensionId} is not a valid extension ID`,
+          );
+          assert.equal(installType, 'development');
           await matchesSnapshot({
             data: transformUiState(appState.state),
             snapshot: 'errors-after-init-opt-in-ui-state',
diff --git a/ui/index.js b/ui/index.js
index da966a16019d..6820ded4eda9 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -8,7 +8,7 @@ import browser from 'webextension-polyfill';
 import { getEnvironmentType } from '../app/scripts/lib/util';
 import { AlertTypes } from '../shared/constants/alerts';
 import { maskObject } from '../shared/modules/object.utils';
-import { SENTRY_UI_STATE } from '../app/scripts/lib/setupSentry';
+import { SENTRY_UI_STATE } from '../app/scripts/constants/sentry-state';
 import { ENVIRONMENT_TYPE_POPUP } from '../shared/constants/app';
 import { COPY_OPTIONS } from '../shared/constants/copy';
 import switchDirection from '../shared/lib/switch-direction';

From 4e45b2274801775facda6734c193b591184b85fe Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 21 Aug 2024 15:59:48 -0230
Subject: [PATCH 215/236] cherry-pick: Fix migration 120.3 error caused by
 invalid state (#26485) (#26517)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This cherry-picks #26485 into v12.0.6. Original description:

## **Description**

For a small number of users, migration 120.3 is failing due to invalid
`TransactionController.transactions` state. We aren't sure yet how this
is happening, but we can resolve the problem by updating the migration
to delete this invalid state if we detect it. No other state relies on
this state, and if it's invalid it won't work properly anyway.

The migration has been renamed from 120.3 to 120.6 so that it will be
re-run for any users who encountered this migration on v12.0.1 already.

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

## **Related issues**

Fixes #26423

## **Manual testing steps**

* Create a dev build from v12.0.0
* Install the dev build from the `dist/chrome` directory and proceed
through onboarding
* Run this command in the background console: ```
chrome.storage.local.get( null, (state) => {
state.data.TransactionController.transactions = {};
chrome.storage.local.set(state, () => chrome.runtime.reload()); } ); ```
* Disable the extension
* Switch to v12.0.1 and create a dev build
* Enable and reload the extension
  * You should see in the console that migration 120.3 has failed
* Disable the extension
* Switch to this branch and create a dev build
* Enable and reload the extension
* You should see in the console that migration 120.6 has run without
error
* You can run `chrome.storage.local.get(console.log)` to check that the
transactions state has been removed.


## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../migrations/{120.3.test.ts => 120.6.test.ts} | 17 ++++++++---------
 app/scripts/migrations/{120.3.ts => 120.6.ts}   |  9 ++++++---
 app/scripts/migrations/index.js                 |  3 ++-
 3 files changed, 16 insertions(+), 13 deletions(-)
 rename app/scripts/migrations/{120.3.test.ts => 120.6.test.ts} (92%)
 rename app/scripts/migrations/{120.3.ts => 120.6.ts} (93%)

diff --git a/app/scripts/migrations/120.3.test.ts b/app/scripts/migrations/120.6.test.ts
similarity index 92%
rename from app/scripts/migrations/120.3.test.ts
rename to app/scripts/migrations/120.6.test.ts
index 11bef64a3422..1a7daa3aa225 100644
--- a/app/scripts/migrations/120.3.test.ts
+++ b/app/scripts/migrations/120.6.test.ts
@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-import { migrate, version } from './120.3';
+import { migrate, version } from './120.6';
 
 const sentryCaptureExceptionMock = jest.fn();
 
@@ -7,9 +7,9 @@ global.sentry = {
   captureException: sentryCaptureExceptionMock,
 };
 
-const oldVersion = 120.2;
+const oldVersion = 120.5;
 
-describe('migration #120.3', () => {
+describe('migration #120.6', () => {
   afterEach(() => {
     jest.resetAllMocks();
   });
@@ -72,7 +72,7 @@ describe('migration #120.3', () => {
     expect(newStorage.data).toStrictEqual(oldStorageDataClone);
   });
 
-  it('reports error and returns state unchanged if transactions property is invalid', async () => {
+  it('removes transactions property if it is invalid', async () => {
     const oldStorage = {
       meta: { version: oldVersion },
       data: {
@@ -82,14 +82,13 @@ describe('migration #120.3', () => {
         },
       },
     };
-    const oldStorageDataClone = cloneDeep(oldStorage.data);
 
     const newStorage = await migrate(oldStorage);
 
-    expect(sentryCaptureExceptionMock).toHaveBeenCalledWith(
-      `Migration ${version}: Invalid TransactionController transactions state of type 'string'`,
-    );
-    expect(newStorage.data).toStrictEqual(oldStorageDataClone);
+    expect(newStorage.data).toStrictEqual({
+      PreferencesController: {},
+      TransactionController: {},
+    });
   });
 
   it('reports error and returns state unchanged if there is an invalid transaction', async () => {
diff --git a/app/scripts/migrations/120.3.ts b/app/scripts/migrations/120.6.ts
similarity index 93%
rename from app/scripts/migrations/120.3.ts
rename to app/scripts/migrations/120.6.ts
index 139e6f5221c2..70be368f0c98 100644
--- a/app/scripts/migrations/120.3.ts
+++ b/app/scripts/migrations/120.6.ts
@@ -7,7 +7,7 @@ type VersionedData = {
   data: Record<string, unknown>;
 };
 
-export const version = 120.3;
+export const version = 120.6;
 
 const MAX_TRANSACTION_HISTORY_LENGTH = 100;
 
@@ -52,9 +52,12 @@ function transformState(state: Record<string, unknown>): void {
     );
     return;
   } else if (!Array.isArray(transactionControllerState.transactions)) {
-    global.sentry?.captureException(
-      `Migration ${version}: Invalid TransactionController transactions state of type '${typeof transactionControllerState.transactions}'`,
+    log.error(
+      new Error(
+        `Migration ${version}: Invalid TransactionController transactions state of type '${typeof transactionControllerState.transactions}'`,
+      ),
     );
+    delete transactionControllerState.transactions;
     return;
   }
 
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 018a13de7253..c455d4693ef4 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -133,9 +133,10 @@ const migrations = [
   require('./120'),
   require('./120.1'),
   require('./120.2'),
-  require('./120.3'),
+  // require('./120.3'), Renamed to 120.6, do not re-use this number
   require('./120.4'),
   require('./120.5'),
+  require('./120.6'),
 ];
 
 export default migrations;

From 85aa9925c7d378dec1ac2d3466f8c35ca0b186f9 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 21 Aug 2024 16:37:21 -0230
Subject: [PATCH 216/236] fix: Fix MV2 build sourcemap upload (#26467) (#26582)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a cherry-pick of #26467 for v12.0.6. Original description:

## **Description**

The sourcemaps for MV2 builds (used for Firefox) were not being uploaded
to Sentry at all. This resulted in invalid stack traces for Firefox
error reports.

The Sentry initiatization has been updated to use a `dist` option,
letting us differentiate between different types of build for the same
version. This is now used to signify which builds are mv2 and which are
mv3. Both distributions are uploaded separately as part of the release
process (for Flask and main builds; we don't have MV2 builds for MMI or
beta).

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26467?quickstart=1)

## **Related issues**

Fixes #26466

## **Manual testing steps**

Unfortunately I don't know of an easy way to test the CircleCI changes.
Those will just have to be read carefully.

We can test the application changes and the Sentry script changes
though. The two outcomes we want to test are:
* The source code and sourcemaps are uploaded correctly for both MV2 and
MV3 builds
* Application bundles for MV2 and MV3 builds are reporting errors
properly tagged as being from an MV2 or MV3 build, and are mapped
correctly in Sentry.

Here are the steps I used to test this:
* Setup a personal Sentry account with a `metamask` project
* Create a Custom Integration in Sentry (Settings -> Custom
Integrations)
  * Steps:
* Navigate to "Settings -> Custom Integrations" on the Sentry dashboard
for your personal Sentry account
* Click the purple "Create New Integration" button on the top-right of
the page
    * Select "Internal integration"
    * Provide any name, and grant it "Admin" access to "Releases"
* Alternatively an Auth Token might work as well, but some of the
commands used by our script to check for pre-existing releases seem to
not work with the `org:ci` scope, which is the only scope available for
Sentry auth tokens.
* Checkout this branch
* Bump the patch version in `package.json` (just in case you need to
re-test, this is an easy way to separate old errors/builds from new
ones)
* Before creating builds, make sure that `SENTRY_DSN_DEV` is set to the
DSN of your personal Sentry account's `metamask` project
* Run `yarn dist:mv2` to create an MV2 build
* Move it to the `dist-mv2` directory (`mv dist dist-mv2`)
* Run `yarn dist` to create an MV3 build
* Before uploading sourcemaps, make sure that `SENTRY_AUTH_TOKEN` is set
to the Auth Token generated from the custom integration earlier.
* Run `yarn sentry:publish --org [your organization]` to upload the MV3
build
* Run `yarn sentry:publish --org [your organization] --dist mv2` to
upload the MV2 build

At this point, you should be able to see the releases on the Sentry
dashboard along with the artifacts. Look in "Settings -> Projects ->
Source Maps" for these. They are labeled by release number and dist.

Now, load each build in your browser (one at a time, never both enabled
at once) and follow these steps:
* Proceed through onboarding, opting in to MetaMetrics
* Navigate to the test-dapp and connect to it
* Click the "INVALID TRANSACTION TYPE (NOT SUPPORTED)" button in the
"Malformed Transactions" section of the test dapp, then reject the
confirmation after it shows up. This should trigger an error in Sentry.
* Look for the error in Sentry and ensure that the frame that shows
`transactionController.updateSecurityAlertResponse(` is mapped to source
code correctly (it should resolve to
`app/scripts/lib/ppom/ppom-util.ts`). Also check that the `dist` is
correct in the "Tags" section of the Sentry issue page.

<details>
<summary> Here are screenshots of what that looked like for me:
</summary>

![Screenshot 2024-08-20 at 19 19

15](https://github.com/user-attachments/assets/36ca0422-71f0-456a-8f1f-5ac980aa5fea)

![Screenshot 2024-08-20 at 19 06

08](https://github.com/user-attachments/assets/25fd681f-c933-41d5-be0e-102fd16f54b2)

</details>

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .circleci/config.yml                   |  6 ++++
 app/scripts/lib/setupSentry.js         |  2 ++
 development/sentry-publish.js          | 38 ++++++++++----------------
 development/sentry-upload-artifacts.sh | 17 ++++++++++--
 shared/modules/mv3.utils.js            | 21 ++++++++++----
 5 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f38bd8c5ab46..8f16e0922448 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1657,9 +1657,15 @@ jobs:
       - run:
           name: Publish main release to Sentry
           command: yarn sentry:publish
+      - run:
+          name: Publish main MV2 release to Sentry
+          command: yarn sentry:publish --dist mv2
       - run:
           name: Publish Flask release to Sentry
           command: yarn sentry:publish --build-type flask
+      - run:
+          name: Publish Flask MV2 release to Sentry
+          command: yarn sentry:publish --build-type flask --dist mv2
       - run:
           name: Publish MMI release to Sentry
           command: yarn sentry:publish --build-type mmi
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 47f06a6c2edf..d496ff805810 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/browser';
 import { Dedupe, ExtraErrorData } from '@sentry/integrations';
 import browser from 'webextension-polyfill';
+import { isManifestV3 } from '../../../shared/modules/mv3.utils';
 import { FilterEvents } from './sentry-filter-events';
 import extractEthjsErrorMessage from './extractEthjsErrorMessage';
 
@@ -191,6 +192,7 @@ export default function setupSentry({ release, getState }) {
   Sentry.init({
     dsn: sentryTarget,
     debug: METAMASK_DEBUG,
+    dist: isManifestV3 ? 'mv3' : 'mv2',
     /**
      * autoSessionTracking defaults to true and operates by sending a session
      * packet to sentry. This session packet does not appear to be filtered out
diff --git a/development/sentry-publish.js b/development/sentry-publish.js
index 3645e04b6771..22ff6156a243 100755
--- a/development/sentry-publish.js
+++ b/development/sentry-publish.js
@@ -37,10 +37,15 @@ async function start() {
           default: 0,
           description: 'The MetaMask extension build version',
           type: 'number',
+        })
+        .option('dist', {
+          description:
+            'The MetaMask extension build distribution (typically for MV2 builds, omit for MV3)',
+          type: 'string',
         }),
   );
 
-  const { buildType, buildVersion, org, project } = argv;
+  const { buildType, buildVersion, dist, org, project } = argv;
 
   process.env.SENTRY_ORG = org;
   process.env.SENTRY_PROJECT = project;
@@ -75,19 +80,17 @@ async function start() {
     ]);
   }
 
-  // check if version has artifacts or not
-  const versionHasArtifacts =
-    versionAlreadyExists && (await checkIfVersionHasArtifacts(version));
-  if (versionHasArtifacts) {
-    console.log(
-      `Version "${version}" already has artifacts on Sentry, skipping sourcemap upload`,
-    );
-    return;
-  }
-
   const additionalUploadArgs = [];
+  if (dist) {
+    additionalUploadArgs.push('--dist', dist);
+  }
   if (buildType !== loadBuildTypesConfig().default) {
-    additionalUploadArgs.push('--dist-directory', `dist-${buildType}`);
+    additionalUploadArgs.push(
+      '--dist-directory',
+      dist ? `dist-${buildType}-${dist}` : `dist-${buildType}`,
+    );
+  } else if (dist) {
+    additionalUploadArgs.push('--dist-directory', `dist-${dist}`);
   }
   // upload sentry source and sourcemaps
   await runInShell('./development/sentry-upload-artifacts.sh', [
@@ -109,17 +112,6 @@ async function checkIfVersionExists(version) {
   );
 }
 
-async function checkIfVersionHasArtifacts(version) {
-  const [artifact] = await runCommand('sentry-cli', [
-    'releases',
-    'files',
-    version,
-    'list',
-  ]);
-  // When there's no artifacts, we get a response from the shell like this ['', '']
-  return artifact?.length > 0;
-}
-
 async function doesNotFail(asyncFn) {
   try {
     await asyncFn();
diff --git a/development/sentry-upload-artifacts.sh b/development/sentry-upload-artifacts.sh
index 7b712f12de31..d55e8172ba3e 100755
--- a/development/sentry-upload-artifacts.sh
+++ b/development/sentry-upload-artifacts.sh
@@ -23,6 +23,7 @@ Upload JavaScript bundles and sourcemaps to Sentry
 Options:
   -h, --help               Show help text
   -r, --release <release>  Sentry release to upload files to (defaults to 'VERSION' environment variable)
+  -d, --dist <dist>        Sentry distribution (typically used to identify MV2 builds)
   --dist-directory <path>  The 'dist' directory to use. Defaults to 'dist'.
 EOF
 }
@@ -30,13 +31,15 @@ EOF
 function upload_sourcemaps {
   local release="${1}"; shift
   local dist_directory="${1}"; shift
+  local dist="${1}"; shift
 
-  sentry-cli releases files "${release}" upload-sourcemaps "${dist_directory}"/chrome/ "${dist_directory}"/sourcemaps/ --rewrite --url-prefix '/metamask'
+  sentry-cli releases files "${release}" upload-sourcemaps --dist "${dist}" "${dist_directory}"/chrome/ "${dist_directory}"/sourcemaps/ --rewrite --url-prefix '/metamask'
 }
 
 function main {
   local release=VERSION
   local dist_directory='dist'
+  local dist="mv3"
 
   while :; do
     case "${1-default}" in
@@ -54,6 +57,16 @@ function main {
         release="${2}"
         shift
         ;;
+      -d|--dist)
+        if [[ -z $2 ]]
+        then
+          printf "'dist' option requires an argument.\\n" >&2
+          printf '%s\n' "${__SEE_HELP_MESSAGE__}" >&2
+          exit 1
+        fi
+        dist="${2}"
+        shift
+        ;;
       --dist-directory)
         if [[ -z $2 ]]
         then
@@ -83,7 +96,7 @@ function main {
   fi
 
   printf 'uploading source files and sourcemaps for Sentry release "%s"...\n' "${release}"
-  upload_sourcemaps "${release}" "${dist_directory}"
+  upload_sourcemaps "${release}" "${dist_directory}" "${dist}"
   printf 'all done!\n'
 }
 
diff --git a/shared/modules/mv3.utils.js b/shared/modules/mv3.utils.js
index 4307ebbd8920..e969c5b74228 100644
--- a/shared/modules/mv3.utils.js
+++ b/shared/modules/mv3.utils.js
@@ -1,18 +1,27 @@
-import browser from 'webextension-polyfill';
+const runtimeManifest =
+  global.chrome?.runtime.getManifest() || global.browser?.runtime.getManifest();
 
 /**
- * A boolean indicating whether the manifest of the current extension
- * is set to manifest version 3.
+ * A boolean indicating whether the manifest of the current extension is set to manifest version 3.
+ *
+ * We have found that when this is run early in a service worker process, the runtime manifest is
+ * unavailable. That's why we have a fallback using the ENABLE_MV3 constant. The fallback is also
+ * used in unit tests.
  */
-export const isManifestV3 =
-  browser.runtime.getManifest().manifest_version === 3;
+export const isManifestV3 = runtimeManifest
+  ? runtimeManifest.manifest_version === 3
+  : // Our build system sets this as a boolean, but in a Node.js context (e.g. unit tests) it will
+    // always be a string
+    process.env.ENABLE_MV3 === true ||
+    process.env.ENABLE_MV3 === 'true' ||
+    process.env.ENABLE_MV3 === undefined;
 
 /**
  * A boolean indicating whether the browser supports the offscreen document api.
  * This is only available in when the manifest is version 3, and only in chromium
  * versions 109 and higher. As of June 7, 2024, it is not available in firefox.
  */
-export const isOffscreenAvailable = Boolean(browser.offscreen);
+export const isOffscreenAvailable = Boolean(global.chrome?.offscreen);
 
 /**
  * A boolean indicating whether the current extension's manifest is version 3

From 23db62dbe4e12a974dad1d72e4e89c8aff1ca071 Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Wed, 21 Aug 2024 15:09:45 -0400
Subject: [PATCH 217/236] fix: track `swapAndSend` transaction type (#26535)
 (#26594)
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**

Cherry picks #26535

<!--
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/26594?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/scripts/lib/transaction/metrics.ts | 13 ++++++--
 ui/helpers/utils/metrics.js            | 41 +++++++++++++++++++++++++
 ui/helpers/utils/metrics.test.js       | 42 +++++++++++++++++++++++++-
 3 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/app/scripts/lib/transaction/metrics.ts b/app/scripts/lib/transaction/metrics.ts
index 15713a72b62e..96ca86f8e7d3 100644
--- a/app/scripts/lib/transaction/metrics.ts
+++ b/app/scripts/lib/transaction/metrics.ts
@@ -36,7 +36,10 @@ import {
   getSwapsTokensReceivedFromTxMeta,
   TRANSACTION_ENVELOPE_TYPE_NAMES,
 } from '../../../../shared/lib/transactions-controller-utils';
-import { getBlockaidMetricsProps } from '../../../../ui/helpers/utils/metrics';
+import {
+  getBlockaidMetricsProps,
+  getSwapAndSendMetricsProps,
+} from '../../../../ui/helpers/utils/metrics';
 import { getSmartTransactionMetricsProperties } from '../../../../shared/modules/metametrics';
 import {
   getSnapAndHardwareInfoForMetrics,
@@ -895,7 +898,9 @@ async function buildEventFragmentProperties({
   let transactionApprovalAmountVsProposedRatio;
   let transactionApprovalAmountVsBalanceRatio;
   let transactionType = TransactionType.simpleSend;
-  if (type === TransactionType.cancel) {
+  if (type === TransactionType.swapAndSend) {
+    transactionType = TransactionType.swapAndSend;
+  } else if (type === TransactionType.cancel) {
     transactionType = TransactionType.cancel;
   } else if (type === TransactionType.retry && originalType) {
     transactionType = originalType;
@@ -984,6 +989,9 @@ async function buildEventFragmentProperties({
       transactionMeta,
     );
 
+  const swapAndSendMetricsProperties =
+    getSwapAndSendMetricsProps(transactionMeta);
+
   /** The transaction status property is not considered sensitive and is now included in the non-anonymous event */
   let properties = {
     chain_id: chainId,
@@ -1009,6 +1017,7 @@ async function buildEventFragmentProperties({
     // ui_customizations must come after ...blockaidProperties
     ui_customizations: uiCustomizations.length > 0 ? uiCustomizations : null,
     ...smartTransactionMetricsProperties,
+    ...swapAndSendMetricsProperties,
     // TODO: Replace `any` with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as Record<string, any>;
diff --git a/ui/helpers/utils/metrics.js b/ui/helpers/utils/metrics.js
index a890d8f06f73..08c2b3f3ab29 100644
--- a/ui/helpers/utils/metrics.js
+++ b/ui/helpers/utils/metrics.js
@@ -1,8 +1,10 @@
+import { TransactionType } from '@metamask/transaction-controller';
 import {
   BlockaidReason,
   BlockaidResultType,
 } from '../../../shared/constants/security-provider';
 import { MetaMetricsEventUiCustomization } from '../../../shared/constants/metametrics';
+import { calcTokenAmount } from '../../../shared/lib/transactions-controller-utils';
 
 export function getMethodName(camelCase) {
   if (!camelCase || typeof camelCase !== 'string') {
@@ -86,3 +88,42 @@ export const getBlockaidMetricsProps = ({ securityAlertResponse }) => {
 
   return params;
 };
+
+export const getSwapAndSendMetricsProps = (transactionMeta) => {
+  if (transactionMeta.type !== TransactionType.swapAndSend) {
+    return {};
+  }
+
+  const {
+    chainId,
+    sourceTokenAmount,
+    sourceTokenDecimals,
+    destinationTokenAmount,
+    destinationTokenDecimals,
+    sourceTokenSymbol,
+    destinationTokenAddress,
+    destinationTokenSymbol,
+    sourceTokenAddress,
+  } = transactionMeta;
+
+  const params = {
+    chain_id: chainId,
+    token_amount_source:
+      sourceTokenAmount && sourceTokenDecimals
+        ? calcTokenAmount(sourceTokenAmount, sourceTokenDecimals).toString()
+        : undefined,
+    token_amount_dest_estimate:
+      destinationTokenAmount && destinationTokenDecimals
+        ? calcTokenAmount(
+            destinationTokenAmount,
+            destinationTokenDecimals,
+          ).toString()
+        : undefined,
+    token_symbol_source: sourceTokenSymbol,
+    token_symbol_destination: destinationTokenSymbol,
+    token_address_source: sourceTokenAddress,
+    token_address_destination: destinationTokenAddress,
+  };
+
+  return params;
+};
diff --git a/ui/helpers/utils/metrics.test.js b/ui/helpers/utils/metrics.test.js
index d1a2f1a5d72e..2ac718f6aa34 100644
--- a/ui/helpers/utils/metrics.test.js
+++ b/ui/helpers/utils/metrics.test.js
@@ -2,7 +2,11 @@ import {
   BlockaidReason,
   BlockaidResultType,
 } from '../../../shared/constants/security-provider';
-import { getBlockaidMetricsProps, getMethodName } from './metrics';
+import {
+  getBlockaidMetricsProps,
+  getMethodName,
+  getSwapAndSendMetricsProps,
+} from './metrics';
 
 describe('getMethodName', () => {
   it('gets correct method names', () => {
@@ -177,3 +181,39 @@ describe('getBlockaidMetricsProps', () => {
     });
   });
 });
+
+describe('getSwapAndSendMetricsProps', () => {
+  it('returns an empty object when transaction type is not swapAndSend', () => {
+    const transactionMeta = {
+      type: 'other',
+    };
+    const result = getSwapAndSendMetricsProps(transactionMeta);
+    expect(result).toStrictEqual({});
+  });
+
+  it('returns the expected metrics props when transaction type is swapAndSend', () => {
+    const transactionMeta = {
+      type: 'swapAndSend',
+      chainId: 1,
+      sourceTokenAmount: '1000000000000',
+      sourceTokenDecimals: 12,
+      destinationTokenAmount: '200',
+      destinationTokenDecimals: 2,
+      sourceTokenSymbol: 'ETH',
+      destinationTokenAddress: '0x123',
+      destinationTokenSymbol: 'ABC',
+      sourceTokenAddress: '0x456',
+    };
+    const expectedMetricsProps = {
+      chain_id: 1,
+      token_amount_source: '1',
+      token_amount_dest_estimate: '2',
+      token_symbol_source: 'ETH',
+      token_symbol_destination: 'ABC',
+      token_address_source: '0x456',
+      token_address_destination: '0x123',
+    };
+    const result = getSwapAndSendMetricsProps(transactionMeta);
+    expect(result).toStrictEqual(expectedMetricsProps);
+  });
+});

From b23205981b01f8dcbe349d80ce0c613f2b620b9b Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 21 Aug 2024 17:47:20 -0230
Subject: [PATCH 218/236] chore: Update changelog for v12.0.6 (#26595)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

See diff for details

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

## **Related issues**

N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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).
- [ ] 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.
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 699da911bba2..08b1b4ad4699 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.0.6]
+### Changed
+- Improve error diagnostics ([#26482](https://github.com/MetaMask/metamask-extension/pull/26482))
+
+### Fixed
+- Fix errors in error diagnistics on Firefox ([#26467](https://github.com/MetaMask/metamask-extension/pull/26467))
+- Prevent pending transactions from causing excessive disk space usage ([#26485](https://github.com/MetaMask/metamask-extension/pull/26485))
+  - This is a repeat of the fix included in v12.0.1; it wasn't working for all users, but it should now.
+- Prevent UI crash while signature confirmation is closing ([#26248](https://github.com/MetaMask/metamask-extension/pull/26248))
 
 ## [12.0.5]
 ### Fixed

From 95af466efa8b0b129e1f95ca767ec32594c6bcf5 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 21 Aug 2024 21:21:55 -0230
Subject: [PATCH 219/236] Remove unnecessary duplicate version of snaps-utils

---
 ...ask-snaps-utils-npm-7.6.0-5569b09766.patch | 30 ---------
 package.json                                  |  4 +-
 yarn.lock                                     | 62 -------------------
 3 files changed, 2 insertions(+), 94 deletions(-)
 delete mode 100644 .yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch

diff --git a/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch b/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch
deleted file mode 100644
index 82ddce260b99..000000000000
--- a/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/dist/chunk-37VHIRUJ.js b/dist/chunk-37VHIRUJ.js
-index a909a4ef20305665a07db5c25b4a9ff7eb0a447e..98dd75bf33a9716dc6cca96a38d184645f6ec033 100644
---- a/dist/chunk-37VHIRUJ.js
-+++ b/dist/chunk-37VHIRUJ.js
-@@ -53,8 +53,8 @@ function assertIsKeyringOrigins(value, ErrorWrapper) {
- }
- function createOriginRegExp(matcher) {
-   const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
--  const regex = escaped.replace(/\*/gu, ".*");
--  return RegExp(regex, "u");
-+  const regex = escaped.replace(/\\\*/gu, '.*');
-+  return RegExp(`${regex}$`, 'u');
- }
- function checkAllowedOrigin(matcher, origin) {
-   if (matcher === "*" || matcher === origin) {
-diff --git a/dist/chunk-K2OTEZZZ.mjs b/dist/chunk-K2OTEZZZ.mjs
-index 15be5da7563a5bdf464d7e9c28ed6f04863e378a..7f38bf328e71c1feb2b8850ba050ce9e55801668 100644
---- a/dist/chunk-K2OTEZZZ.mjs
-+++ b/dist/chunk-K2OTEZZZ.mjs
-@@ -53,8 +53,8 @@ function assertIsKeyringOrigins(value, ErrorWrapper) {
- }
- function createOriginRegExp(matcher) {
-   const escaped = matcher.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
--  const regex = escaped.replace(/\*/gu, ".*");
--  return RegExp(regex, "u");
-+  const regex = escaped.replace(/\\\*/gu, '.*');
-+  return RegExp(`${regex}$`, 'u');
- }
- function checkAllowedOrigin(matcher, origin) {
-   if (matcher === "*" || matcher === origin) {
diff --git a/package.json b/package.json
index ee91ede2bd3b..14367e5b6680 100644
--- a/package.json
+++ b/package.json
@@ -257,8 +257,8 @@
     "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
     "@metamask/gas-fee-controller@npm:^15.1.1": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch",
     "@metamask/snaps-utils@npm:^7.7.0": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
-    "@metamask/snaps-utils@npm:^7.4.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
-    "@metamask/snaps-utils@npm:^7.5.0": "patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch",
+    "@metamask/snaps-utils@npm:^7.4.0": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
+    "@metamask/snaps-utils@npm:^7.5.0": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
     "@metamask/keyring-controller@npm:^16.0.0": "patch:@metamask/keyring-controller@npm%3A16.1.0#~/.yarn/patches/@metamask-keyring-controller-npm-16.1.0-7043d2dc62.patch",
     "@metamask/keyring-controller@npm:^17.1.0": "patch:@metamask/keyring-controller@npm%3A16.1.0#~/.yarn/patches/@metamask-keyring-controller-npm-16.1.0-7043d2dc62.patch"
   },
diff --git a/yarn.lock b/yarn.lock
index a9f2b43bbac3..52a9c6a37734 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6408,37 +6408,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:7.6.0":
-  version: 7.6.0
-  resolution: "@metamask/snaps-utils@npm:7.6.0"
-  dependencies:
-    "@babel/core": "npm:^7.23.2"
-    "@babel/types": "npm:^7.23.0"
-    "@metamask/base-controller": "npm:^6.0.0"
-    "@metamask/key-tree": "npm:^9.1.1"
-    "@metamask/permission-controller": "npm:^10.0.0"
-    "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/slip44": "npm:^3.1.0"
-    "@metamask/snaps-registry": "npm:^3.1.0"
-    "@metamask/snaps-sdk": "npm:^5.0.0"
-    "@metamask/utils": "npm:^8.3.0"
-    "@noble/hashes": "npm:^1.3.1"
-    "@scure/base": "npm:^1.1.1"
-    chalk: "npm:^4.1.2"
-    cron-parser: "npm:^4.5.0"
-    fast-deep-equal: "npm:^3.1.3"
-    fast-json-stable-stringify: "npm:^2.1.0"
-    fast-xml-parser: "npm:^4.3.4"
-    marked: "npm:^12.0.1"
-    rfdc: "npm:^1.3.0"
-    semver: "npm:^7.5.4"
-    ses: "npm:^1.1.0"
-    superstruct: "npm:^1.0.3"
-    validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/e81e0185ab1678822b47e400c4422023449be1641bea7ce3d679386257545091ecc73c9a4626c0ed585d93d9fe3a1354dc8e4b8310c27c33871f7fb0bb029506
-  languageName: node
-  linkType: hard
-
 "@metamask/snaps-utils@npm:7.7.0":
   version: 7.7.0
   resolution: "@metamask/snaps-utils@npm:7.7.0"
@@ -6470,37 +6439,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch":
-  version: 7.6.0
-  resolution: "@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.6.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.6.0-5569b09766.patch::version=7.6.0&hash=5f2735"
-  dependencies:
-    "@babel/core": "npm:^7.23.2"
-    "@babel/types": "npm:^7.23.0"
-    "@metamask/base-controller": "npm:^6.0.0"
-    "@metamask/key-tree": "npm:^9.1.1"
-    "@metamask/permission-controller": "npm:^10.0.0"
-    "@metamask/rpc-errors": "npm:^6.2.1"
-    "@metamask/slip44": "npm:^3.1.0"
-    "@metamask/snaps-registry": "npm:^3.1.0"
-    "@metamask/snaps-sdk": "npm:^5.0.0"
-    "@metamask/utils": "npm:^8.3.0"
-    "@noble/hashes": "npm:^1.3.1"
-    "@scure/base": "npm:^1.1.1"
-    chalk: "npm:^4.1.2"
-    cron-parser: "npm:^4.5.0"
-    fast-deep-equal: "npm:^3.1.3"
-    fast-json-stable-stringify: "npm:^2.1.0"
-    fast-xml-parser: "npm:^4.3.4"
-    marked: "npm:^12.0.1"
-    rfdc: "npm:^1.3.0"
-    semver: "npm:^7.5.4"
-    ses: "npm:^1.1.0"
-    superstruct: "npm:^1.0.3"
-    validate-npm-package-name: "npm:^5.0.0"
-  checksum: 10/73cbed809f410375347fa4360475dbb8154a3fa0a6276af33e1094be85f5b804dddf22b2065853d5f91069d173681b8c7e06312f0f7f9831fe5bb22b298419dc
-  languageName: node
-  linkType: hard
-
 "@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch":
   version: 7.7.0
   resolution: "@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch::version=7.7.0&hash=5f2735"

From bfe7d3f0de48afdcd0ba7a56ea288a912648d1fa Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Thu, 22 Aug 2024 00:16:01 +0000
Subject: [PATCH 220/236] Update LavaMoat policies

---
 lavamoat/browserify/beta/policy.json  | 37 +--------------------------
 lavamoat/browserify/flask/policy.json | 37 +--------------------------
 lavamoat/browserify/main/policy.json  | 37 +--------------------------
 lavamoat/browserify/mmi/policy.json   | 37 +--------------------------
 4 files changed, 4 insertions(+), 144 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index dcfb74ed4fd4..d17b42a08fc8 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -797,10 +797,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
-        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -813,41 +813,6 @@
         "immer": true
       }
     },
-    "@metamask/accounts-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "crypto": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true
-      },
-      "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>cron-parser": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true,
-        "chalk": true,
-        "semver": true,
-        "superstruct": true
-      }
-    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index dcfb74ed4fd4..d17b42a08fc8 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -797,10 +797,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
-        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -813,41 +813,6 @@
         "immer": true
       }
     },
-    "@metamask/accounts-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "crypto": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true
-      },
-      "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>cron-parser": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true,
-        "chalk": true,
-        "semver": true,
-        "superstruct": true
-      }
-    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index dcfb74ed4fd4..d17b42a08fc8 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -797,10 +797,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
-        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -813,41 +813,6 @@
         "immer": true
       }
     },
-    "@metamask/accounts-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "crypto": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true
-      },
-      "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>cron-parser": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true,
-        "chalk": true,
-        "semver": true,
-        "superstruct": true
-      }
-    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index e4391384a16d..b1576a7d4f79 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -889,10 +889,10 @@
         "@ethereumjs/tx>@ethereumjs/util": true,
         "@ethereumjs/tx>ethereum-cryptography": true,
         "@metamask/accounts-controller>@metamask/base-controller": true,
-        "@metamask/accounts-controller>@metamask/snaps-utils": true,
         "@metamask/eth-snap-keyring": true,
         "@metamask/keyring-api": true,
         "@metamask/keyring-controller": true,
+        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "uuid": true
       }
@@ -905,41 +905,6 @@
         "immer": true
       }
     },
-    "@metamask/accounts-controller>@metamask/snaps-utils": {
-      "globals": {
-        "File": true,
-        "FileReader": true,
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "URL": true,
-        "console.error": true,
-        "console.log": true,
-        "console.warn": true,
-        "crypto": true,
-        "document.body.appendChild": true,
-        "document.createElement": true,
-        "fetch": true
-      },
-      "packages": {
-        "@metamask/permission-controller": true,
-        "@metamask/rpc-errors": true,
-        "@metamask/snaps-sdk": true,
-        "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils>@metamask/slip44": true,
-        "@metamask/snaps-utils>cron-parser": true,
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@metamask/snaps-utils>fast-xml-parser": true,
-        "@metamask/snaps-utils>marked": true,
-        "@metamask/snaps-utils>rfdc": true,
-        "@metamask/snaps-utils>validate-npm-package-name": true,
-        "@metamask/utils": true,
-        "@metamask/utils>@scure/base": true,
-        "@noble/hashes": true,
-        "chalk": true,
-        "semver": true,
-        "superstruct": true
-      }
-    },
     "@metamask/address-book-controller": {
       "packages": {
         "@metamask/address-book-controller>@metamask/controller-utils": true,

From a1d7e13cef62e33e8a205f711ba8d0d679c7dac7 Mon Sep 17 00:00:00 2001
From: Marina Boboc <120041701+benjisclowder@users.noreply.github.com>
Date: Thu, 22 Aug 2024 12:27:41 +0300
Subject: [PATCH 221/236] V12.1.0 changelog (#25745)

Adding V12.1.0 changelog.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25745?quickstart=1)
---
 CHANGELOG.md | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1e0cada434d..c0733e2ff49f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,79 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.1.0]
+### Added
+- Introduced a new UI for managing multiple RPC URLs, including adding and deleting options ([#25452](https://github.com/MetaMask/metamask-extension/pull/25452))
+- Launched a feature displaying the percentage increase or decrease for tokens within the UI ([#24223](https://github.com/MetaMask/metamask-extension/pull/24223))
+- Implemented a modal form for adding custom networks ([#25213](https://github.com/MetaMask/metamask-extension/pull/25213))
+- Introduced a new UI for selecting network RPCs during the advanced onboarding process ([#25276](https://github.com/MetaMask/metamask-extension/pull/25276))
+- Added a search feature to easily filter through the popular network list ([#25170](https://github.com/MetaMask/metamask-extension/pull/25170))
+- Introduced a Popular Networks list within the Add Network modal ([#25160](https://github.com/MetaMask/metamask-extension/pull/25160))
+- Launched a new asset details page ([#24522](https://github.com/MetaMask/metamask-extension/pull/24522))
+- Integrated contract interaction transaction alerts into the new alert system ([#25174](https://github.com/MetaMask/metamask-extension/pull/25174))
+- Enhanced the Sign-In With Ethereum (SIWE) experience by adding an alert for domain binding ([#25281](https://github.com/MetaMask/metamask-extension/pull/25281))
+- Implemented a loader on the confirmation page during Blockaid validation ([#25477](https://github.com/MetaMask/metamask-extension/pull/25477))
+- Introduced an advanced details component for transactions ([#24833](https://github.com/MetaMask/metamask-extension/pull/24833))
+- Updated the message section on SIWE signature pages ([#24997](https://github.com/MetaMask/metamask-extension/pull/24997))
+- Enhanced permit signatures with a simulation section ([#24862](https://github.com/MetaMask/metamask-extension/pull/24862))
+- Introduced dynamic support for identifying 'buyable' networks through the Ramps API ([#24041](https://github.com/MetaMask/metamask-extension/pull/24041))
+- Introduced a new notification counter over the Fox icon to display unread notifications ([#25093](https://github.com/MetaMask/metamask-extension/pull/25093))
+- Improved the display of large and small token values on the permit signature page ([#25720](https://github.com/MetaMask/metamask-extension/pull/25720))
+- Replaced "Approve spend limit" with "Spending cap" in the Permit signature redesign ([#25618](https://github.com/MetaMask/metamask-extension/pull/25618))
+- Display ellipsis to Permit simulation fiat values ([#26001](https://github.com/MetaMask/metamask-extension/pull/26001))
+- Display ellipsis for Permit values with over 15 characters ([#26458](https://github.com/MetaMask/metamask-extension/pull/26458))
+
+### Changed
+- Introduced the ability to edit custom networks directly from the modal ([#25272](https://github.com/MetaMask/metamask-extension/pull/25272))
+- Launched an initial UI for editing multiple RPC URLs in the network form ([#25219](https://github.com/MetaMask/metamask-extension/pull/25219))
+- Added paymaster address display for certain transactions in the contract interaction confirmation ([#25396](https://github.com/MetaMask/metamask-extension/pull/25396))
+- Updated the text for permit signatures ([#24975](https://github.com/MetaMask/metamask-extension/pull/24975))
+
+### Fixed
+- Updated all help center URLs from the old Zendesk format to the current support.metamask.io domain ([#24286](https://github.com/MetaMask/metamask-extension/pull/24286))
+- Improved NFT ownership updates in MetaMask by parsing logs from contract interaction transactions ([#25380](https://github.com/MetaMask/metamask-extension/pull/25380))
+- Corrected the display of the delete network icon to only appear on mouseover in the network modal ([#25547](https://github.com/MetaMask/metamask-extension/pull/25547))
+- Fixed a UI issue where a non-zero percentage change was displayed next to a $0.00 account balance ([#25550](https://github.com/MetaMask/metamask-extension/pull/25550))
+- Improved the display of large token amounts in the wallet ([#25464](https://github.com/MetaMask/metamask-extension/pull/25464))
+- Resolved an issue where the Linea mainnet ticker was incorrectly displayed as undefined ([#25436](https://github.com/MetaMask/metamask-extension/pull/25436))
+- Deprecated Mumbai and Linea Goerli test networks ([#24994](https://github.com/MetaMask/metamask-extension/pull/24994))
+- Fixed an issue where STX was incorrectly used for Swap+Send approvals ([#25510](https://github.com/MetaMask/metamask-extension/pull/25510))
+- Addressed and resolved all identified bugs in the Swap+Send feature ([#25100](https://github.com/MetaMask/metamask-extension/pull/25100))
+- Enhanced network indicator consistency on the confirmation page by aligning it with the network selection dropdown ([#25518](https://github.com/MetaMask/metamask-extension/pull/25518))
+- Implemented a setting to allow users to opt-out of displaying fiat values for testnet transactions ([#25167](https://github.com/MetaMask/metamask-extension/pull/25167))
+- Adjusted styling to properly handle long NFT IDs in transaction simulations ([#25252](https://github.com/MetaMask/metamask-extension/pull/25252))
+- Enhanced the deadline field formatting on the permit signature page ([#25321](https://github.com/MetaMask/metamask-extension/pull/25321))
+- Refined the design of the permit signature confirmation page ([#25383](https://github.com/MetaMask/metamask-extension/pull/25383))
+- Updated the text on redesigned Sign-In With Ethereum (SIWE) signature pages ([#25381](https://github.com/MetaMask/metamask-extension/pull/25381))
+- Adjusted signature pages to only display simulations when the user has enabled this preference ([#25186](https://github.com/MetaMask/metamask-extension/pull/25186))
+- Refined the alerts on typed sign data pages based on feedback ([#25163](https://github.com/MetaMask/metamask-extension/pull/25163))
+- Corrected the display of USD amounts in swap notifications ([#25444](https://github.com/MetaMask/metamask-extension/pull/25444))
+- Refined notifications UI to only show tabs when relevant ([#25350](https://github.com/MetaMask/metamask-extension/pull/25350))
+- Resolved an issue to ensure push notifications are properly received and not delivered as silent notifications ([#25340](https://github.com/MetaMask/metamask-extension/pull/25340))
+- Fixed a bug to ensure native currency symbols are correctly displayed in notifications ([#25364](https://github.com/MetaMask/metamask-extension/pull/25364))
+- Adjusted the notifications-tag-counter to have a minimum width ([#25322](https://github.com/MetaMask/metamask-extension/pull/25322))
+- Resolved an issue where incorrect type assertions led to a crash when splitting an undefined value in notification detail network fees ([#25315](https://chat.consensys.io/chat/jgI56K8PwrDp4d4EERs4l))
+- Excluded SNAP notifications from 'Mark all as read' server updates ([#25099](https://github.com/MetaMask/metamask-extension/pull/25099))
+- Resolved an issue by ensuring max gas values for swaps are rounded to integers ([#25488](https://github.com/MetaMask/metamask-extension/pull/25488))
+- Updated the outdated browser warning to display immediately for new installations ([#25366](https://github.com/MetaMask/metamask-extension/pull/25366))
+- Enhanced the Send flow by displaying a network badge next to the chosen asset ([#25470](https://github.com/MetaMask/metamask-extension/pull/25470))
+- Fixed various display issues in the asset picker modal and balance display ([#25601](https://github.com/MetaMask/metamask-extension/pull/25601))
+- Corrected the display of decimal places for token values on permit pages ([#25718](https://github.com/MetaMask/metamask-extension/pull/25718))
+- Added ellipsis for long permit values and fixed errors with very large numbers ([#25741](https://github.com/MetaMask/metamask-extension/pull/25741))
+- Fixed an issue where the connected account was missing on the connection page ([#25500](https://github.com/MetaMask/metamask-extension/pull/25500))
+- Removed the NFT autodetection modal when the feature is disabled in settings ([#25993](https://github.com/MetaMask/metamask-extension/pull/25993))
+- Fixed the Blockaid report URL on redesigned pages ([#25702](https://github.com/MetaMask/metamask-extension/pull/25702))
+- Fixed the "Show conversion in testnets" option for Bitcoin and Ethereum test assets ([#26224](https://github.com/MetaMask/metamask-extension/pull/26224))
+- Enabled the Save button on the Add Contact page when a valid address or ENS name is entered ([#26456](https://github.com/MetaMask/metamask-extension/pull/26456))
+- Fixed fallback conversion rates for token market data to ensure accurate market cap ([#26460](https://github.com/MetaMask/metamask-extension/pull/26460))
+- Resolved the issue of selecting the correct network when multiple networks have the same chain ID ([#25805](https://github.com/MetaMask/metamask-extension/pull/25805))
+- Updated alignment and padding for permit simulations ([#26186](https://github.com/MetaMask/metamask-extension/pull/26186))
+- Updated the pending transactions badge to display a number instead of three dots ([#26116](https://github.com/MetaMask/metamask-extension/pull/26116))
+- Adjusted spacing in the send asset picker for proper vertical alignment with other dropdowns ([#25576](https://github.com/MetaMask/metamask-extension/pull/25576))
+- Fixed decimal display for Permit values and added a reusable component for displaying token units ([#26105](https://github.com/MetaMask/metamask-extension/pull/26105))
+- Fixed precision loss for very large values in signature simulations ([#25968](https://github.com/MetaMask/metamask-extension/pull/25968))
+- Included decimals in fiat calculations for Permit simulations and added tooltips for shortened values ([#26523](https://github.com/MetaMask/metamask-extension/pull/26523))
+- Fixed the missing deadline timer on the swaps status screen ([#26544](https://github.com/MetaMask/metamask-extension/pull/26544))
+- Fixed an issue where account names were out of sync in the account list during the connect account flow ([#26542](https://github.com/MetaMask/metamask-extension/pull/26542))
 
 ## [12.0.0]
 ### Added

From ff16dadc42ac1e62bd207f911c4b2679c478c2a7 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 22 Aug 2024 10:14:42 -0230
Subject: [PATCH 222/236] Fix conflicts in changelog

---
 CHANGELOG.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d56ead84ce8..f6b8f0709d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,15 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.1.0]
-## [12.0.6]
-### Changed
-- Improve error diagnostics ([#26482](https://github.com/MetaMask/metamask-extension/pull/26482))
-
-### Fixed
-- Fix errors in error diagnistics on Firefox ([#26467](https://github.com/MetaMask/metamask-extension/pull/26467))
-- Prevent pending transactions from causing excessive disk space usage ([#26485](https://github.com/MetaMask/metamask-extension/pull/26485))
-  - This is a repeat of the fix included in v12.0.1; it wasn't working for all users, but it should now.
-- Prevent UI crash while signature confirmation is closing ([#26248](https://github.com/MetaMask/metamask-extension/pull/26248))
 ### Added
 - Introduced a new UI for managing multiple RPC URLs, including adding and deleting options ([#25452](https://github.com/MetaMask/metamask-extension/pull/25452))
 - Launched a feature displaying the percentage increase or decrease for tokens within the UI ([#24223](https://github.com/MetaMask/metamask-extension/pull/24223))
@@ -90,6 +81,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed the missing deadline timer on the swaps status screen ([#26544](https://github.com/MetaMask/metamask-extension/pull/26544))
 - Fixed an issue where account names were out of sync in the account list during the connect account flow ([#26542](https://github.com/MetaMask/metamask-extension/pull/26542))
 
+## [12.0.6]
+### Changed
+- Improve error diagnostics ([#26482](https://github.com/MetaMask/metamask-extension/pull/26482))
+
+### Fixed
+- Fix errors in error diagnistics on Firefox ([#26467](https://github.com/MetaMask/metamask-extension/pull/26467))
+- Prevent pending transactions from causing excessive disk space usage ([#26485](https://github.com/MetaMask/metamask-extension/pull/26485))
+  - This is a repeat of the fix included in v12.0.1; it wasn't working for all users, but it should now.
+- Prevent UI crash while signature confirmation is closing ([#26248](https://github.com/MetaMask/metamask-extension/pull/26248))
+
 ## [12.0.5]
 ### Fixed
 - Prevent network selection per dapp from breaking if the rpc url of the currently selected network is edited ([#26453](https://github.com/MetaMask/metamask-extension/pull/26453))
@@ -5003,8 +5004,7 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.1.0...HEAD
-[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...v12.1.0
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.0.6...HEAD
+[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v12.0.6...v12.1.0
 [12.0.6]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...v12.0.6
 [12.0.5]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...v12.0.5
 [12.0.4]: https://github.com/MetaMask/metamask-extension/compare/v12.0.3...v12.0.4

From 4d299d834ddcfb147d6775516db08436ce761017 Mon Sep 17 00:00:00 2001
From: Matteo Scurati <matteo.scurati@gmail.com>
Date: Thu, 22 Aug 2024 17:37:58 +0200
Subject: [PATCH 223/236] =?UTF-8?q?fix:=20correct=20duplicate=20notificati?=
 =?UTF-8?q?ons=20event=20tracking=20in=20global=20menu=20(#=E2=80=A6=20(#2?=
 =?UTF-8?q?6616)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…26525)

<!--
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 addresses an issue where duplicate event tracking calls were
made in the `handleNotificationsClick` function within the `GlobalMenu`
component. This redundancy could lead to inaccurate event logging and
unnecessary data collection. Also, the PR removes an unnecessary
property.

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26525?quickstart=1)

## **Related issues**

Fixes: N/A

## **Manual testing steps**

1. Open the global menu
2. Click on the notifications menu item
3. Verify that the event is tracked only 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**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.


<!--
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/26616?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 .../multichain/global-menu/global-menu.js       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ui/components/multichain/global-menu/global-menu.js b/ui/components/multichain/global-menu/global-menu.js
index c2021c75bd99..c3c1b01d31ab 100644
--- a/ui/components/multichain/global-menu/global-menu.js
+++ b/ui/components/multichain/global-menu/global-menu.js
@@ -143,15 +143,6 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
       !hasNotifySnaps && !isMetamaskNotificationsEnabled;
 
     if (shouldShowEnableModal) {
-      trackEvent({
-        category: MetaMetricsEventCategory.NotificationInteraction,
-        event: MetaMetricsEventName.NotificationMenuOpened,
-        properties: {
-          is_profile_syncing_enabled: isProfileSyncingEnabled,
-          is_notifications_enabled: isMetamaskNotificationsEnabled,
-          action_type: 'started',
-        },
-      });
       trackEvent({
         category: MetaMetricsEventCategory.NotificationInteraction,
         event: MetaMetricsEventName.NotificationMenuOpened,
@@ -167,6 +158,14 @@ export const GlobalMenu = ({ closeMenu, anchorElement, isOpen }) => {
     }
 
     // Otherwise we can navigate to the notifications page
+    trackEvent({
+      category: MetaMetricsEventCategory.NotificationInteraction,
+      event: MetaMetricsEventName.NotificationMenuOpened,
+      properties: {
+        is_profile_syncing_enabled: isProfileSyncingEnabled,
+        is_notifications_enabled: isMetamaskNotificationsEnabled,
+      },
+    });
     history.push(NOTIFICATIONS_ROUTE);
     closeMenu();
   };

From b0d1067ca729807a284e233f55860572697e863a Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 22 Aug 2024 16:23:54 -0230
Subject: [PATCH 224/236] chore: upgrade to Sentry 8 (#25999) [cherry-pick]
 (#26618)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR cherry-picks #25999 to v12.1.0. Original description:

## **Description**

Upgrade the Sentry packages from `7.53.0` to `8.19.0`.

Specifically:

- Refactor custom `FilterEvents` integration into object returned by
function.
- Remove usages of `hub`.
- Fix notification errors when changing metrics preference.

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

## **Related issues**

## **Manual testing steps**

Full Sentry regression.

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Matthew Walsh <matthew.walsh@consensys.net>
Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
---
 app/scripts/lib/sentry-filter-events.ts       |  87 +++--------
 app/scripts/lib/setupSentry.js                |  39 +++--
 development/build/scripts.js                  |   2 +
 lavamoat/browserify/beta/policy.json          | 118 ++++++++++-----
 lavamoat/browserify/flask/policy.json         | 118 ++++++++++-----
 lavamoat/browserify/main/policy.json          | 118 ++++++++++-----
 lavamoat/browserify/mmi/policy.json           | 118 ++++++++++-----
 package.json                                  |   7 +-
 .../useMetametrics.test.tsx                   |  14 +-
 .../metamask-notifications/useMetametrics.ts  |   5 +-
 yarn.lock                                     | 137 ++++++++++--------
 11 files changed, 476 insertions(+), 287 deletions(-)

diff --git a/app/scripts/lib/sentry-filter-events.ts b/app/scripts/lib/sentry-filter-events.ts
index 50d2f4c77245..9d406fa413f7 100644
--- a/app/scripts/lib/sentry-filter-events.ts
+++ b/app/scripts/lib/sentry-filter-events.ts
@@ -1,73 +1,28 @@
-import {
-  Event as SentryEvent,
-  EventProcessor,
-  Hub,
-  Integration,
-} from '@sentry/types';
+import { Event as SentryEvent, Integration } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
+const NAME = 'FilterEvents';
+
 /**
  * Filter events when MetaMetrics is disabled.
+ *
+ * @param options - Options bag.
+ * @param options.getMetaMetricsEnabled - Function that returns whether MetaMetrics is enabled.
  */
-export class FilterEvents implements Integration {
-  /**
-   * Property that holds the integration name.
-   */
-  public static id = 'FilterEvents';
-
-  /**
-   * Another property that holds the integration name.
-   *
-   * I don't know why this exists, but the other Sentry integrations have it.
-   */
-  public name: string = FilterEvents.id;
-
-  /**
-   * A function that returns whether MetaMetrics is enabled. This should also
-   * return `false` if state has not yet been initialzed.
-   *
-   * @returns `true` if MetaMask's state has been initialized, and MetaMetrics
-   * is enabled, `false` otherwise.
-   */
-  private getMetaMetricsEnabled: () => Promise<boolean>;
-
-  /**
-   * @param options - Constructor options.
-   * @param options.getMetaMetricsEnabled - A function that returns whether
-   * MetaMetrics is enabled. This should also return `false` if state has not
-   * yet been initialzed.
-   */
-  constructor({
-    getMetaMetricsEnabled,
-  }: {
-    getMetaMetricsEnabled: () => Promise<boolean>;
-  }) {
-    this.getMetaMetricsEnabled = getMetaMetricsEnabled;
-  }
-
-  /**
-   * Setup the integration.
-   *
-   * @param addGlobalEventProcessor - A function that allows adding a global
-   * event processor.
-   * @param getCurrentHub - A function that returns the current Sentry hub.
-   */
-  public setupOnce(
-    addGlobalEventProcessor: (callback: EventProcessor) => void,
-    getCurrentHub: () => Hub,
-  ): void {
-    addGlobalEventProcessor(async (currentEvent: SentryEvent) => {
-      // Sentry integrations use the Sentry hub to get "this" references, for
-      // reasons I don't fully understand.
-      // eslint-disable-next-line consistent-this
-      const self = getCurrentHub().getIntegration(FilterEvents);
-      if (self) {
-        if (!(await self.getMetaMetricsEnabled())) {
-          logger.warn(`Event dropped due to MetaMetrics setting.`);
-          return null;
-        }
+export function filterEvents({
+  getMetaMetricsEnabled,
+}: {
+  getMetaMetricsEnabled: () => Promise<boolean>;
+}): Integration {
+  return {
+    name: NAME,
+    processEvent: async (event: SentryEvent) => {
+      if (!(await getMetaMetricsEnabled())) {
+        logger.warn(`Event dropped due to MetaMetrics setting.`);
+        return null;
       }
-      return currentEvent;
-    });
-  }
+
+      return event;
+    },
+  };
 }
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index bb9f79a2df40..9f976c4d3bee 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -1,8 +1,7 @@
 import * as Sentry from '@sentry/browser';
-import { Dedupe, ExtraErrorData } from '@sentry/integrations';
 import browser from 'webextension-polyfill';
 import { isManifestV3 } from '../../../shared/modules/mv3.utils';
-import { FilterEvents } from './sentry-filter-events';
+import { filterEvents } from './sentry-filter-events';
 import extractEthjsErrorMessage from './extractEthjsErrorMessage';
 
 let installType = 'unknown';
@@ -190,6 +189,14 @@ export default function setupSentry({ release, getState }) {
       console.log('Error getting extension installType', error);
     });
 
+  /**
+   * Sentry throws on initialization as it wants to avoid polluting the global namespace and
+   * potentially clashing with a website also using Sentry, but this could only happen in the content script.
+   * This emulates NW.js which disables these validations.
+   * https://docs.sentry.io/platforms/javascript/best-practices/shared-environments/
+   */
+  globalThis.nw = {};
+
   Sentry.init({
     dsn: sentryTarget,
     debug: METAMASK_DEBUG,
@@ -233,10 +240,10 @@ export default function setupSentry({ release, getState }) {
        *
        * @see https://github.com/MetaMask/metamask-extension/pull/15677
        */
-      new FilterEvents({ getMetaMetricsEnabled }),
-      new Dedupe(),
-      new ExtraErrorData(),
-      new Sentry.BrowserProfilingIntegration(),
+      filterEvents({ getMetaMetricsEnabled }),
+      Sentry.dedupeIntegration(),
+      Sentry.extraErrorDataIntegration(),
+      Sentry.browserProfilingIntegration(),
     ],
     release,
     /**
@@ -265,11 +272,11 @@ export default function setupSentry({ release, getState }) {
    * a new sentry session.
    */
   const startSession = async () => {
-    const hub = Sentry.getCurrentHub?.();
-    const options = hub.getClient?.().getOptions?.() ?? {};
-    if (hub && (await getSentryEnabled()) === true) {
+    const client = Sentry.getClient();
+    const options = client?.getOptions?.() ?? {};
+    if (client && (await getSentryEnabled()) === true) {
       options.autoSessionTracking = true;
-      hub.startSession();
+      Sentry.startSession();
     }
   };
 
@@ -279,11 +286,11 @@ export default function setupSentry({ release, getState }) {
    * the current sentry session.
    */
   const endSession = async () => {
-    const hub = Sentry.getCurrentHub?.();
-    const options = hub.getClient?.().getOptions?.() ?? {};
-    if (hub && (await getSentryEnabled()) === false) {
+    const client = Sentry.getClient();
+    const options = client?.getOptions?.() ?? {};
+    if (client && (await getSentryEnabled()) === false) {
       options.autoSessionTracking = false;
-      hub.endSession();
+      Sentry.endSession();
     }
   };
 
@@ -293,8 +300,8 @@ export default function setupSentry({ release, getState }) {
    * the Sentry client.
    */
   const toggleSession = async () => {
-    const hub = Sentry.getCurrentHub?.();
-    const options = hub.getClient?.().getOptions?.() ?? {
+    const client = Sentry.getClient();
+    const options = client?.getOptions?.() ?? {
       autoSessionTracking: false,
     };
     const isSentryEnabled = await getSentryEnabled();
diff --git a/development/build/scripts.js b/development/build/scripts.js
index de01b9665174..297577a59031 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -78,6 +78,7 @@ const scuttlingConfigBase = {
     encodeURIComponent: '',
     console: '',
     crypto: '',
+    Map: '',
     // {clear/set}Timeout are "this sensitive"
     clearTimeout: 'window',
     setTimeout: 'window',
@@ -88,6 +89,7 @@ const scuttlingConfigBase = {
     appState: '',
     extra: '',
     stateHooks: '',
+    nw: '',
   },
 };
 
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 9e5ed1420d95..a892ddff8b2f 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2958,97 +2958,146 @@
     },
     "@sentry/browser": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "XMLHttpRequest": true,
+        "PerformanceObserver.supportedEntryTypes.includes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
+        "console.error": true,
         "indexedDB.open": true,
+        "performance.timeOrigin": true,
         "setTimeout": true
       },
       "packages": {
-        "@sentry/browser>@sentry-internal/tracing": true,
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/browser>@sentry/replay": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/tracing": {
+    "@sentry/browser>@sentry-internal/browser-utils": {
       "globals": {
-        "Headers": true,
+        "PerformanceEventTiming.prototype": true,
         "PerformanceObserver": true,
-        "Request": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "addEventListener": true,
-        "performance.getEntriesByType": true,
-        "removeEventListener": true
+        "clearTimeout": true,
+        "performance": true,
+        "removeEventListener": true,
+        "setTimeout": true
       },
       "packages": {
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/core": {
+    "@sentry/browser>@sentry-internal/feedback": {
       "globals": {
+        "FormData": true,
+        "HTMLFormElement": true,
         "__SENTRY_DEBUG__": true,
-        "__SENTRY_TRACING__": true,
-        "clearInterval": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "setInterval": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.createTextNode": true,
+        "isSecureContext": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/replay": {
+    "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
         "CSSConditionRule": true,
         "CSSGroupingRule": true,
         "CSSMediaRule": true,
+        "CSSRule": true,
         "CSSSupportsRule": true,
+        "Document": true,
         "DragEvent": true,
         "Element": true,
         "FormData": true,
-        "HTMLCanvasElement": true,
-        "HTMLElement.prototype": true,
+        "HTMLElement": true,
         "HTMLFormElement": true,
-        "HTMLImageElement": true,
-        "HTMLInputElement.prototype": true,
-        "HTMLOptionElement.prototype": true,
-        "HTMLSelectElement.prototype": true,
-        "HTMLTextAreaElement.prototype": true,
         "Headers": true,
-        "ImageData": true,
         "MouseEvent": true,
         "MutationObserver": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
         "Node.prototype.contains": true,
-        "PerformanceObserver": true,
+        "PointerEvent": true,
         "TextEncoder": true,
         "URL": true,
         "URLSearchParams": true,
         "Worker": true,
-        "Zone": true,
+        "__RRWEB_EXCLUDE_IFRAME__": true,
+        "__RRWEB_EXCLUDE_SHADOW_DOM__": true,
         "__SENTRY_DEBUG__": true,
+        "__SENTRY_EXCLUDE_REPLAY_WORKER__": true,
         "__rrMutationObserver": true,
+        "addEventListener": true,
         "clearTimeout": true,
+        "console.debug": true,
         "console.error": true,
         "console.warn": true,
+        "customElements.get": true,
         "document": true,
         "innerHeight": true,
         "innerWidth": true,
         "location.href": true,
-        "pageXOffset": true,
-        "pageYOffset": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "location.origin": true,
+        "parent": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true,
-        "browserify>process": true
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry/core": {
+      "globals": {
+        "Headers": true,
+        "Request": true,
+        "URL": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_TRACING__": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@sentry/utils": true
       }
     },
     "@sentry/utils": {
@@ -3056,20 +3105,23 @@
         "CustomEvent": true,
         "DOMError": true,
         "DOMException": true,
+        "EdgeRuntime": true,
         "Element": true,
         "ErrorEvent": true,
         "Event": true,
+        "HTMLElement": true,
         "Headers": true,
         "Request": true,
         "Response": true,
+        "TextDecoder": true,
         "TextEncoder": true,
         "URL": true,
-        "XMLHttpRequest.prototype": true,
         "__SENTRY_BROWSER_BUNDLE__": true,
         "__SENTRY_DEBUG__": true,
         "clearTimeout": true,
         "console.error": true,
         "document": true,
+        "setInterval": true,
         "setTimeout": true
       },
       "packages": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 9e5ed1420d95..a892ddff8b2f 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2958,97 +2958,146 @@
     },
     "@sentry/browser": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "XMLHttpRequest": true,
+        "PerformanceObserver.supportedEntryTypes.includes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
+        "console.error": true,
         "indexedDB.open": true,
+        "performance.timeOrigin": true,
         "setTimeout": true
       },
       "packages": {
-        "@sentry/browser>@sentry-internal/tracing": true,
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/browser>@sentry/replay": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/tracing": {
+    "@sentry/browser>@sentry-internal/browser-utils": {
       "globals": {
-        "Headers": true,
+        "PerformanceEventTiming.prototype": true,
         "PerformanceObserver": true,
-        "Request": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "addEventListener": true,
-        "performance.getEntriesByType": true,
-        "removeEventListener": true
+        "clearTimeout": true,
+        "performance": true,
+        "removeEventListener": true,
+        "setTimeout": true
       },
       "packages": {
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/core": {
+    "@sentry/browser>@sentry-internal/feedback": {
       "globals": {
+        "FormData": true,
+        "HTMLFormElement": true,
         "__SENTRY_DEBUG__": true,
-        "__SENTRY_TRACING__": true,
-        "clearInterval": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "setInterval": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.createTextNode": true,
+        "isSecureContext": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/replay": {
+    "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
         "CSSConditionRule": true,
         "CSSGroupingRule": true,
         "CSSMediaRule": true,
+        "CSSRule": true,
         "CSSSupportsRule": true,
+        "Document": true,
         "DragEvent": true,
         "Element": true,
         "FormData": true,
-        "HTMLCanvasElement": true,
-        "HTMLElement.prototype": true,
+        "HTMLElement": true,
         "HTMLFormElement": true,
-        "HTMLImageElement": true,
-        "HTMLInputElement.prototype": true,
-        "HTMLOptionElement.prototype": true,
-        "HTMLSelectElement.prototype": true,
-        "HTMLTextAreaElement.prototype": true,
         "Headers": true,
-        "ImageData": true,
         "MouseEvent": true,
         "MutationObserver": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
         "Node.prototype.contains": true,
-        "PerformanceObserver": true,
+        "PointerEvent": true,
         "TextEncoder": true,
         "URL": true,
         "URLSearchParams": true,
         "Worker": true,
-        "Zone": true,
+        "__RRWEB_EXCLUDE_IFRAME__": true,
+        "__RRWEB_EXCLUDE_SHADOW_DOM__": true,
         "__SENTRY_DEBUG__": true,
+        "__SENTRY_EXCLUDE_REPLAY_WORKER__": true,
         "__rrMutationObserver": true,
+        "addEventListener": true,
         "clearTimeout": true,
+        "console.debug": true,
         "console.error": true,
         "console.warn": true,
+        "customElements.get": true,
         "document": true,
         "innerHeight": true,
         "innerWidth": true,
         "location.href": true,
-        "pageXOffset": true,
-        "pageYOffset": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "location.origin": true,
+        "parent": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true,
-        "browserify>process": true
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry/core": {
+      "globals": {
+        "Headers": true,
+        "Request": true,
+        "URL": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_TRACING__": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@sentry/utils": true
       }
     },
     "@sentry/utils": {
@@ -3056,20 +3105,23 @@
         "CustomEvent": true,
         "DOMError": true,
         "DOMException": true,
+        "EdgeRuntime": true,
         "Element": true,
         "ErrorEvent": true,
         "Event": true,
+        "HTMLElement": true,
         "Headers": true,
         "Request": true,
         "Response": true,
+        "TextDecoder": true,
         "TextEncoder": true,
         "URL": true,
-        "XMLHttpRequest.prototype": true,
         "__SENTRY_BROWSER_BUNDLE__": true,
         "__SENTRY_DEBUG__": true,
         "clearTimeout": true,
         "console.error": true,
         "document": true,
+        "setInterval": true,
         "setTimeout": true
       },
       "packages": {
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 9e5ed1420d95..a892ddff8b2f 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2958,97 +2958,146 @@
     },
     "@sentry/browser": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "XMLHttpRequest": true,
+        "PerformanceObserver.supportedEntryTypes.includes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
+        "console.error": true,
         "indexedDB.open": true,
+        "performance.timeOrigin": true,
         "setTimeout": true
       },
       "packages": {
-        "@sentry/browser>@sentry-internal/tracing": true,
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/browser>@sentry/replay": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/tracing": {
+    "@sentry/browser>@sentry-internal/browser-utils": {
       "globals": {
-        "Headers": true,
+        "PerformanceEventTiming.prototype": true,
         "PerformanceObserver": true,
-        "Request": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "addEventListener": true,
-        "performance.getEntriesByType": true,
-        "removeEventListener": true
+        "clearTimeout": true,
+        "performance": true,
+        "removeEventListener": true,
+        "setTimeout": true
       },
       "packages": {
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/core": {
+    "@sentry/browser>@sentry-internal/feedback": {
       "globals": {
+        "FormData": true,
+        "HTMLFormElement": true,
         "__SENTRY_DEBUG__": true,
-        "__SENTRY_TRACING__": true,
-        "clearInterval": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "setInterval": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.createTextNode": true,
+        "isSecureContext": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/replay": {
+    "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
         "CSSConditionRule": true,
         "CSSGroupingRule": true,
         "CSSMediaRule": true,
+        "CSSRule": true,
         "CSSSupportsRule": true,
+        "Document": true,
         "DragEvent": true,
         "Element": true,
         "FormData": true,
-        "HTMLCanvasElement": true,
-        "HTMLElement.prototype": true,
+        "HTMLElement": true,
         "HTMLFormElement": true,
-        "HTMLImageElement": true,
-        "HTMLInputElement.prototype": true,
-        "HTMLOptionElement.prototype": true,
-        "HTMLSelectElement.prototype": true,
-        "HTMLTextAreaElement.prototype": true,
         "Headers": true,
-        "ImageData": true,
         "MouseEvent": true,
         "MutationObserver": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
         "Node.prototype.contains": true,
-        "PerformanceObserver": true,
+        "PointerEvent": true,
         "TextEncoder": true,
         "URL": true,
         "URLSearchParams": true,
         "Worker": true,
-        "Zone": true,
+        "__RRWEB_EXCLUDE_IFRAME__": true,
+        "__RRWEB_EXCLUDE_SHADOW_DOM__": true,
         "__SENTRY_DEBUG__": true,
+        "__SENTRY_EXCLUDE_REPLAY_WORKER__": true,
         "__rrMutationObserver": true,
+        "addEventListener": true,
         "clearTimeout": true,
+        "console.debug": true,
         "console.error": true,
         "console.warn": true,
+        "customElements.get": true,
         "document": true,
         "innerHeight": true,
         "innerWidth": true,
         "location.href": true,
-        "pageXOffset": true,
-        "pageYOffset": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "location.origin": true,
+        "parent": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true,
-        "browserify>process": true
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry/core": {
+      "globals": {
+        "Headers": true,
+        "Request": true,
+        "URL": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_TRACING__": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@sentry/utils": true
       }
     },
     "@sentry/utils": {
@@ -3056,20 +3105,23 @@
         "CustomEvent": true,
         "DOMError": true,
         "DOMException": true,
+        "EdgeRuntime": true,
         "Element": true,
         "ErrorEvent": true,
         "Event": true,
+        "HTMLElement": true,
         "Headers": true,
         "Request": true,
         "Response": true,
+        "TextDecoder": true,
         "TextEncoder": true,
         "URL": true,
-        "XMLHttpRequest.prototype": true,
         "__SENTRY_BROWSER_BUNDLE__": true,
         "__SENTRY_DEBUG__": true,
         "clearTimeout": true,
         "console.error": true,
         "document": true,
+        "setInterval": true,
         "setTimeout": true
       },
       "packages": {
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 1cb7f324ac67..c7975844f736 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -3050,97 +3050,146 @@
     },
     "@sentry/browser": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true,
-        "XMLHttpRequest": true,
+        "PerformanceObserver.supportedEntryTypes.includes": true,
+        "Request": true,
+        "URL": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "__SENTRY_RELEASE__": true,
+        "addEventListener": true,
+        "console.error": true,
         "indexedDB.open": true,
+        "performance.timeOrigin": true,
         "setTimeout": true
       },
       "packages": {
-        "@sentry/browser>@sentry-internal/tracing": true,
+        "@sentry/browser>@sentry-internal/browser-utils": true,
+        "@sentry/browser>@sentry-internal/feedback": true,
+        "@sentry/browser>@sentry-internal/replay": true,
+        "@sentry/browser>@sentry-internal/replay-canvas": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/browser>@sentry/replay": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry-internal/tracing": {
+    "@sentry/browser>@sentry-internal/browser-utils": {
       "globals": {
-        "Headers": true,
+        "PerformanceEventTiming.prototype": true,
         "PerformanceObserver": true,
-        "Request": true,
+        "XMLHttpRequest.prototype": true,
         "__SENTRY_DEBUG__": true,
         "addEventListener": true,
-        "performance.getEntriesByType": true,
-        "removeEventListener": true
+        "clearTimeout": true,
+        "performance": true,
+        "removeEventListener": true,
+        "setTimeout": true
       },
       "packages": {
         "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/core": {
+    "@sentry/browser>@sentry-internal/feedback": {
       "globals": {
+        "FormData": true,
+        "HTMLFormElement": true,
         "__SENTRY_DEBUG__": true,
-        "__SENTRY_TRACING__": true,
-        "clearInterval": true,
+        "cancelAnimationFrame": true,
         "clearTimeout": true,
-        "console.warn": true,
-        "setInterval": true,
+        "document.createElement": true,
+        "document.createElementNS": true,
+        "document.createTextNode": true,
+        "isSecureContext": true,
+        "requestAnimationFrame": true,
         "setTimeout": true
       },
       "packages": {
+        "@sentry/browser>@sentry/core": true,
         "@sentry/utils": true
       }
     },
-    "@sentry/browser>@sentry/replay": {
+    "@sentry/browser>@sentry-internal/replay": {
       "globals": {
         "Blob": true,
         "CSSConditionRule": true,
         "CSSGroupingRule": true,
         "CSSMediaRule": true,
+        "CSSRule": true,
         "CSSSupportsRule": true,
+        "Document": true,
         "DragEvent": true,
         "Element": true,
         "FormData": true,
-        "HTMLCanvasElement": true,
-        "HTMLElement.prototype": true,
+        "HTMLElement": true,
         "HTMLFormElement": true,
-        "HTMLImageElement": true,
-        "HTMLInputElement.prototype": true,
-        "HTMLOptionElement.prototype": true,
-        "HTMLSelectElement.prototype": true,
-        "HTMLTextAreaElement.prototype": true,
         "Headers": true,
-        "ImageData": true,
         "MouseEvent": true,
         "MutationObserver": true,
+        "Node.DOCUMENT_FRAGMENT_NODE": true,
         "Node.prototype.contains": true,
-        "PerformanceObserver": true,
+        "PointerEvent": true,
         "TextEncoder": true,
         "URL": true,
         "URLSearchParams": true,
         "Worker": true,
-        "Zone": true,
+        "__RRWEB_EXCLUDE_IFRAME__": true,
+        "__RRWEB_EXCLUDE_SHADOW_DOM__": true,
         "__SENTRY_DEBUG__": true,
+        "__SENTRY_EXCLUDE_REPLAY_WORKER__": true,
         "__rrMutationObserver": true,
+        "addEventListener": true,
         "clearTimeout": true,
+        "console.debug": true,
         "console.error": true,
         "console.warn": true,
+        "customElements.get": true,
         "document": true,
         "innerHeight": true,
         "innerWidth": true,
         "location.href": true,
-        "pageXOffset": true,
-        "pageYOffset": true,
-        "requestAnimationFrame": true,
-        "setTimeout": true
+        "location.origin": true,
+        "parent": true
       },
       "packages": {
+        "@sentry/browser>@sentry-internal/browser-utils": true,
         "@sentry/browser>@sentry/core": true,
-        "@sentry/utils": true,
-        "browserify>process": true
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry-internal/replay-canvas": {
+      "globals": {
+        "Blob": true,
+        "HTMLCanvasElement": true,
+        "HTMLImageElement": true,
+        "ImageData": true,
+        "URL.createObjectURL": true,
+        "WeakRef": true,
+        "Worker": true,
+        "cancelAnimationFrame": true,
+        "console.error": true,
+        "createImageBitmap": true,
+        "document": true
+      },
+      "packages": {
+        "@sentry/browser>@sentry/core": true,
+        "@sentry/utils": true
+      }
+    },
+    "@sentry/browser>@sentry/core": {
+      "globals": {
+        "Headers": true,
+        "Request": true,
+        "URL": true,
+        "__SENTRY_DEBUG__": true,
+        "__SENTRY_TRACING__": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@sentry/utils": true
       }
     },
     "@sentry/utils": {
@@ -3148,20 +3197,23 @@
         "CustomEvent": true,
         "DOMError": true,
         "DOMException": true,
+        "EdgeRuntime": true,
         "Element": true,
         "ErrorEvent": true,
         "Event": true,
+        "HTMLElement": true,
         "Headers": true,
         "Request": true,
         "Response": true,
+        "TextDecoder": true,
         "TextEncoder": true,
         "URL": true,
-        "XMLHttpRequest.prototype": true,
         "__SENTRY_BROWSER_BUNDLE__": true,
         "__SENTRY_DEBUG__": true,
         "clearTimeout": true,
         "console.error": true,
         "document": true,
+        "setInterval": true,
         "setTimeout": true
       },
       "packages": {
diff --git a/package.json b/package.json
index 14367e5b6680..cf3b33313e97 100644
--- a/package.json
+++ b/package.json
@@ -355,10 +355,9 @@
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "patch:@reduxjs/toolkit@npm%3A1.9.7#~/.yarn/patches/@reduxjs-toolkit-npm-1.9.7-b14925495c.patch",
     "@segment/loosely-validate-event": "^2.0.0",
-    "@sentry/browser": "^7.53.0",
-    "@sentry/integrations": "^7.53.0",
-    "@sentry/types": "^7.53.0",
-    "@sentry/utils": "^7.53.0",
+    "@sentry/browser": "^8.19.0",
+    "@sentry/types": "^8.19.0",
+    "@sentry/utils": "^8.19.0",
     "@trezor/connect-web": "patch:@trezor/connect-web@npm%3A9.2.2#~/.yarn/patches/@trezor-connect-web-npm-9.2.2-a4de8e45fc.patch",
     "@zxing/browser": "^0.1.4",
     "@zxing/library": "0.20.0",
diff --git a/ui/hooks/metamask-notifications/useMetametrics.test.tsx b/ui/hooks/metamask-notifications/useMetametrics.test.tsx
index a9778212a801..3d4afffd03e7 100644
--- a/ui/hooks/metamask-notifications/useMetametrics.test.tsx
+++ b/ui/hooks/metamask-notifications/useMetametrics.test.tsx
@@ -40,7 +40,15 @@ describe('useMetametrics', () => {
     jest.clearAllMocks();
   });
 
-  it('should enable MetaMetrics when user is not signed in', async () => {
+  it('should enable MetaMetrics when user is not signed in and profile syncing enabled', async () => {
+    store.getState = () => ({
+      metamask: {
+        participateInMetaMetrics: true,
+        isProfileSyncingEnabled: true,
+        isSignedIn: false,
+      },
+    });
+
     const { result, waitForNextUpdate } = renderHook(
       () => useEnableMetametrics(),
       {
@@ -62,11 +70,11 @@ describe('useMetametrics', () => {
     expect(result.current.loading).toBe(false);
   });
 
-  it('should disable MetaMetrics and sign out if profile syncing is disabled', async () => {
+  it('should disable MetaMetrics and sign out if profile syncing is enabled', async () => {
     store.getState = () => ({
       metamask: {
         participateInMetaMetrics: true,
-        isProfileSyncingEnabled: false,
+        isProfileSyncingEnabled: true,
         isSignedIn: true,
       },
     });
diff --git a/ui/hooks/metamask-notifications/useMetametrics.ts b/ui/hooks/metamask-notifications/useMetametrics.ts
index 7cf3f17b6a19..0f9f1c2f666f 100644
--- a/ui/hooks/metamask-notifications/useMetametrics.ts
+++ b/ui/hooks/metamask-notifications/useMetametrics.ts
@@ -23,6 +23,7 @@ export function useEnableMetametrics(): {
   error: string | null;
 } {
   const dispatch = useDispatch();
+  const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled);
   const isUserSignedIn = useSelector(selectIsSignedIn);
 
   const [loading, setLoading] = useState<boolean>(false);
@@ -34,7 +35,7 @@ export function useEnableMetametrics(): {
     setError(null);
 
     try {
-      if (!isUserSignedIn) {
+      if (isProfileSyncingEnabled && !isUserSignedIn) {
         await dispatch(performSignIn());
       }
 
@@ -81,7 +82,7 @@ export function useDisableMetametrics(): {
     setError(null);
 
     try {
-      if (!isProfileSyncingEnabled) {
+      if (isProfileSyncingEnabled) {
         await dispatch(performSignOut());
       }
       await dispatch(setParticipateInMetaMetrics(false));
diff --git a/yarn.lock b/yarn.lock
index 52a9c6a37734..adfdbd060291 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7922,29 +7922,64 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry-internal/tracing@npm:7.53.0":
-  version: 7.53.0
-  resolution: "@sentry-internal/tracing@npm:7.53.0"
+"@sentry-internal/browser-utils@npm:8.19.0":
+  version: 8.19.0
+  resolution: "@sentry-internal/browser-utils@npm:8.19.0"
   dependencies:
-    "@sentry/core": "npm:7.53.0"
-    "@sentry/types": "npm:7.53.0"
-    "@sentry/utils": "npm:7.53.0"
-    tslib: "npm:^1.9.3"
-  checksum: 10/0c449ee967ca568128842649f1eb16e6674c562cbf54436b74f02a2f5ef62ca9d402622a955cdfcfc9b2e158f5d98b21964f6be8164001a2c53b67c1bd00d290
+    "@sentry/core": "npm:8.19.0"
+    "@sentry/types": "npm:8.19.0"
+    "@sentry/utils": "npm:8.19.0"
+  checksum: 10/d6df6cb6edc6b2ddb7362daee39770a51b255d343b3dcb80dc98f77dc43a7cc66f29076e14d1a0ac162a51a4f620b876493a04c23a530f57170009364b6464ea
   languageName: node
   linkType: hard
 
-"@sentry/browser@npm:^7.53.0":
-  version: 7.53.0
-  resolution: "@sentry/browser@npm:7.53.0"
+"@sentry-internal/feedback@npm:8.19.0":
+  version: 8.19.0
+  resolution: "@sentry-internal/feedback@npm:8.19.0"
   dependencies:
-    "@sentry-internal/tracing": "npm:7.53.0"
-    "@sentry/core": "npm:7.53.0"
-    "@sentry/replay": "npm:7.53.0"
-    "@sentry/types": "npm:7.53.0"
-    "@sentry/utils": "npm:7.53.0"
-    tslib: "npm:^1.9.3"
-  checksum: 10/4902ddbaab5281e0f1de121bc6120e812cd86ae62139980c62316235f9f685c5f377ccbabdc7160062bb496dc4e7f2e6799fb1a762a89692a177a4457225c55f
+    "@sentry/core": "npm:8.19.0"
+    "@sentry/types": "npm:8.19.0"
+    "@sentry/utils": "npm:8.19.0"
+  checksum: 10/e10cf1f63d49a41072aaa1b7b007241a273bd4bfa6d2c628e50d621c8cde836e6743bdefbf9ba7e96684b6dd18ad49e17841f4420fc33757e7c119ec88b4ac15
+  languageName: node
+  linkType: hard
+
+"@sentry-internal/replay-canvas@npm:8.19.0":
+  version: 8.19.0
+  resolution: "@sentry-internal/replay-canvas@npm:8.19.0"
+  dependencies:
+    "@sentry-internal/replay": "npm:8.19.0"
+    "@sentry/core": "npm:8.19.0"
+    "@sentry/types": "npm:8.19.0"
+    "@sentry/utils": "npm:8.19.0"
+  checksum: 10/1f379c141884b448c56fcd663b8acc0ff1c12d50a2b9db37f9552eb2bc8c99a970114f80e58c8c4fcd61f933f9a15f58dc6cbe6f4297bb574d6772be8f41c5bf
+  languageName: node
+  linkType: hard
+
+"@sentry-internal/replay@npm:8.19.0":
+  version: 8.19.0
+  resolution: "@sentry-internal/replay@npm:8.19.0"
+  dependencies:
+    "@sentry-internal/browser-utils": "npm:8.19.0"
+    "@sentry/core": "npm:8.19.0"
+    "@sentry/types": "npm:8.19.0"
+    "@sentry/utils": "npm:8.19.0"
+  checksum: 10/dc9bef6997d1f40fb0402f52c9d14f72cf050ec140fda27e00057c59ddd1a6144e78e40aeb5e0223dd48651bf02f809db26cf6e866dd5c8ec5c6bbbf76c6f1aa
+  languageName: node
+  linkType: hard
+
+"@sentry/browser@npm:^8.19.0":
+  version: 8.19.0
+  resolution: "@sentry/browser@npm:8.19.0"
+  dependencies:
+    "@sentry-internal/browser-utils": "npm:8.19.0"
+    "@sentry-internal/feedback": "npm:8.19.0"
+    "@sentry-internal/replay": "npm:8.19.0"
+    "@sentry-internal/replay-canvas": "npm:8.19.0"
+    "@sentry/core": "npm:8.19.0"
+    "@sentry/types": "npm:8.19.0"
+    "@sentry/utils": "npm:8.19.0"
+  checksum: 10/2412e938454bd5cc505bbbe7092a17bf5fde4b222ecfedaf3d54fb963a6c875c78661921d8f6e998498c85a9a52e616db75fd706867f76d38bf3f95714775aa6
   languageName: node
   linkType: hard
 
@@ -7963,54 +7998,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/core@npm:7.53.0":
-  version: 7.53.0
-  resolution: "@sentry/core@npm:7.53.0"
-  dependencies:
-    "@sentry/types": "npm:7.53.0"
-    "@sentry/utils": "npm:7.53.0"
-    tslib: "npm:^1.9.3"
-  checksum: 10/3c69eca4c0f4215a041170c7632bf55fc70d01a888dce0de7f9876a6333aa1db93f5ef59147719e01f1a54f74e40f1201fad9570a17cf01349d1b1fc91e0ee0d
-  languageName: node
-  linkType: hard
-
-"@sentry/integrations@npm:^7.53.0":
-  version: 7.53.0
-  resolution: "@sentry/integrations@npm:7.53.0"
-  dependencies:
-    "@sentry/types": "npm:7.53.0"
-    "@sentry/utils": "npm:7.53.0"
-    localforage: "npm:^1.8.1"
-    tslib: "npm:^1.9.3"
-  checksum: 10/ea183a235f3fca9503d2dd11d1799525ccf38a20989bff083dcdf61947823be59ae5c36e080fab69f9537ed912feaaa4f554451add0abe223e566a6e9f56d70d
-  languageName: node
-  linkType: hard
-
-"@sentry/replay@npm:7.53.0":
-  version: 7.53.0
-  resolution: "@sentry/replay@npm:7.53.0"
+"@sentry/core@npm:8.19.0":
+  version: 8.19.0
+  resolution: "@sentry/core@npm:8.19.0"
   dependencies:
-    "@sentry/core": "npm:7.53.0"
-    "@sentry/types": "npm:7.53.0"
-    "@sentry/utils": "npm:7.53.0"
-  checksum: 10/8ba1e72ae42eb20ab779554ad39cdcd6e74cc4457250599e7b7d8db411dd2f706d11b9e25bda6116640273529b28e5328498730ae1d3f8c130e1e276933d715d
+    "@sentry/types": "npm:8.19.0"
+    "@sentry/utils": "npm:8.19.0"
+  checksum: 10/708ef5abd81a9ab5288a4b258411e78591a7fec4854fc582c34f087fce62f5cd74e1086fbbc27a9f55da77d113dde137fbf9649f5b7df3d1a22886850702adbd
   languageName: node
   linkType: hard
 
-"@sentry/types@npm:7.53.0, @sentry/types@npm:^7.53.0":
-  version: 7.53.0
-  resolution: "@sentry/types@npm:7.53.0"
-  checksum: 10/ea05e60594529bd7b59c6ba9cfecb5066a2a20af60194b67772769e4e02d54fd2da2e8124c90b3f0b4fbabd47499e7ccea833efaa819f7643b9d45c50aead5c3
+"@sentry/types@npm:8.19.0, @sentry/types@npm:^8.19.0":
+  version: 8.19.0
+  resolution: "@sentry/types@npm:8.19.0"
+  checksum: 10/8812f7394c6c031197abc04d80e5b5b3693742dc065b877c535a9ceb538aabd60ee27fc2b13824e2b8fc264819868109bbd4de3642fd1c7bf30d304fb0c21aa9
   languageName: node
   linkType: hard
 
-"@sentry/utils@npm:7.53.0, @sentry/utils@npm:^7.53.0":
-  version: 7.53.0
-  resolution: "@sentry/utils@npm:7.53.0"
+"@sentry/utils@npm:8.19.0, @sentry/utils@npm:^8.19.0":
+  version: 8.19.0
+  resolution: "@sentry/utils@npm:8.19.0"
   dependencies:
-    "@sentry/types": "npm:7.53.0"
-    tslib: "npm:^1.9.3"
-  checksum: 10/38732598c57db770f307e5869c4d68e95f53715970b3cf0d24e37ced5ef3d43af3560b2efd5a1362891a5340224ce34cf073695986b3a8b1958f4a09b614ee6e
+    "@sentry/types": "npm:8.19.0"
+  checksum: 10/abd507e5b37c7753534865f74a1a622fdbe2d71cfa61fd009703f4c9c90634fb6d26e3b2f8e09904631d4692e3735de451ed914c505c31700a6f5504a61e649e
   languageName: node
   linkType: hard
 
@@ -24304,7 +24314,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"localforage@npm:^1.8.1, localforage@npm:^1.9.0":
+"localforage@npm:^1.9.0":
   version: 1.10.0
   resolution: "localforage@npm:1.10.0"
   dependencies:
@@ -25342,11 +25352,10 @@ __metadata:
     "@popperjs/core": "npm:^2.4.0"
     "@reduxjs/toolkit": "patch:@reduxjs/toolkit@npm%3A1.9.7#~/.yarn/patches/@reduxjs-toolkit-npm-1.9.7-b14925495c.patch"
     "@segment/loosely-validate-event": "npm:^2.0.0"
-    "@sentry/browser": "npm:^7.53.0"
+    "@sentry/browser": "npm:^8.19.0"
     "@sentry/cli": "npm:^2.19.4"
-    "@sentry/integrations": "npm:^7.53.0"
-    "@sentry/types": "npm:^7.53.0"
-    "@sentry/utils": "npm:^7.53.0"
+    "@sentry/types": "npm:^8.19.0"
+    "@sentry/utils": "npm:^8.19.0"
     "@storybook/addon-a11y": "npm:^7.6.19"
     "@storybook/addon-actions": "npm:^7.6.19"
     "@storybook/addon-designs": "npm:^7.0.9"
@@ -34013,7 +34022,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3":
+"tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb

From 04c5fc63240f7f55f3e7c21400e5f4cef37d6681 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 22 Aug 2024 17:05:02 -0230
Subject: [PATCH 225/236] fix: sentry sessions (#26192) [cherry-pick] (#26620)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-pick of #26192 for v12.1.0. Original description:

## **Description**

Fix the automatic tracking of Sentry sessions, and refactor Sentry setup
to simplify logic and improve logging.

Specifically:

- Remove all dynamic `autoSessionTracking` enablement.
- Add a custom Sentry transport to prevent any requests reaching Sentry
if metrics are disabled.
- Only consider metrics enabled when preference is set and onboarding is
complete.
- Enable Sentry if `METAMASK_ENVIRONMENT` is not `production` and
`SENTRY_DSN_DEV` is specified.
- Remove the arguments to the `setupSentry` function.
- Since the file already references `process.env` and
`global.stateHooks` internally.
- Flatten all the functions within `setupSentry.js`.
  - Since they no longer require a dynamic `getState` callback.
- Log all Sentry messages via the `debug` package based on the `DEBUG`
environment variable.
  - Create separate loggers for UI and background to differentiate logs.
  - e.g. `DEBUG=metamask:sentry:*` in `.metamask.rc`
- Add additional log messages for easier debug.
- Including all sent events and completed sessions if `METAMASK_DEBUG`
is enabled.
- Add mock `SENTRY_DSN_DEV` to Flask and MMI test builds.
- Remove duplication in package scripts.

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

## **Related issues**

Fixes:
[#2555](https://github.com/MetaMask/MetaMask-planning/issues/2555)
#15691

## **Manual testing steps**

## **Screenshots/Recordings**

### **Before**

### **After**

<img width="713" alt="Updated Logs"
src="https://github.com/user-attachments/assets/8351a968-baea-4cbd-b7b6-0b8000cf1a84">

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Matthew Walsh <matthew.walsh@consensys.net>
---
 .metamaskrc.dist                            |   7 +-
 app/scripts/controllers/metametrics.js      |  17 +-
 app/scripts/controllers/metametrics.test.js |   7 +-
 app/scripts/lib/sentry-filter-events.ts     |  15 +-
 app/scripts/lib/setupSentry.js              | 410 ++++++++++----------
 app/scripts/sentry-install.js               |  23 +-
 development/build/scripts.js                |   1 +
 package.json                                |  21 +-
 test/e2e/tests/metrics/errors.spec.js       |   4 +-
 types/global.d.ts                           |  13 +-
 ui/store/actions.test.js                    |   7 -
 ui/store/actions.ts                         |   7 +-
 yarn.lock                                   |   9 +-
 13 files changed, 249 insertions(+), 292 deletions(-)

diff --git a/.metamaskrc.dist b/.metamaskrc.dist
index c7431cc0719b..62dfdeb64634 100644
--- a/.metamaskrc.dist
+++ b/.metamaskrc.dist
@@ -24,7 +24,12 @@ BLOCKAID_PUBLIC_KEY=
 ; Set this to true to enable the snap path for the Firefox WebDriver (Linux)
 ; FIREFOX_SNAP=
 
-ENABLE_CONFIRMATION_REDESIGN=
+; Enable the redesigned confirmations still in development, without needing to toggle the developer setting.
+; ENABLE_CONFIRMATION_REDESIGN=
 
 ; Enables the Settings Page - Developer Options
 ; ENABLE_SETTINGS_PAGE_DEV_OPTIONS=true
+
+; The endpoint used to submit errors and tracing data to Sentry.
+; The below is the `test-metamask` project.
+; SENTRY_DSN_DEV=https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496
diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index c7bd148e62d3..6c3f3392e929 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -454,16 +454,15 @@ export default class MetaMetricsController {
    *  if not set
    */
   async setParticipateInMetaMetrics(participateInMetaMetrics) {
-    let { metaMetricsId } = this.state;
-    if (participateInMetaMetrics && !metaMetricsId) {
-      // We also need to start sentry automatic session tracking at this point
-      await globalThis.sentry?.startSession();
-      metaMetricsId = this.generateMetaMetricsId();
-    } else if (participateInMetaMetrics === false) {
-      // We also need to stop sentry automatic session tracking at this point
-      await globalThis.sentry?.endSession();
-    }
+    const { metaMetricsId: existingMetaMetricsId } = this.state;
+
+    const metaMetricsId =
+      participateInMetaMetrics && !existingMetaMetricsId
+        ? this.generateMetaMetricsId()
+        : existingMetaMetricsId;
+
     this.store.updateState({ participateInMetaMetrics, metaMetricsId });
+
     if (participateInMetaMetrics) {
       this.trackEventsAfterMetricsOptIn();
       this.clearEventsAfterMetricsOptIn();
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index 43834f01a4b9..4206de67a7fd 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -143,10 +143,7 @@ function getMetaMetricsController({
 describe('MetaMetricsController', function () {
   const now = new Date();
   beforeEach(function () {
-    globalThis.sentry = {
-      startSession: jest.fn(),
-      endSession: jest.fn(),
-    };
+    globalThis.sentry = {};
     jest.useFakeTimers().setSystemTime(now.getTime());
     jest.spyOn(Utils, 'generateRandomId').mockReturnValue('DUMMY_RANDOM_ID');
   });
@@ -316,7 +313,6 @@ describe('MetaMetricsController', function () {
         metaMetricsController.state.participateInMetaMetrics,
       ).toStrictEqual(null);
       await metaMetricsController.setParticipateInMetaMetrics(true);
-      expect(globalThis.sentry.startSession).toHaveBeenCalledTimes(1);
       expect(
         metaMetricsController.state.participateInMetaMetrics,
       ).toStrictEqual(true);
@@ -339,7 +335,6 @@ describe('MetaMetricsController', function () {
     it('should not nullify the metaMetricsId when set to false', async function () {
       const metaMetricsController = getMetaMetricsController();
       await metaMetricsController.setParticipateInMetaMetrics(false);
-      expect(globalThis.sentry.endSession).toHaveBeenCalledTimes(1);
       expect(metaMetricsController.state.metaMetricsId).toStrictEqual(
         TEST_META_METRICS_ID,
       );
diff --git a/app/scripts/lib/sentry-filter-events.ts b/app/scripts/lib/sentry-filter-events.ts
index 9d406fa413f7..9c802d872c15 100644
--- a/app/scripts/lib/sentry-filter-events.ts
+++ b/app/scripts/lib/sentry-filter-events.ts
@@ -1,5 +1,4 @@
 import { Event as SentryEvent, Integration } from '@sentry/types';
-import { logger } from '@sentry/utils';
 
 const NAME = 'FilterEvents';
 
@@ -8,17 +7,27 @@ const NAME = 'FilterEvents';
  *
  * @param options - Options bag.
  * @param options.getMetaMetricsEnabled - Function that returns whether MetaMetrics is enabled.
+ * @param options.log - Function to log messages.
  */
 export function filterEvents({
   getMetaMetricsEnabled,
+  log,
 }: {
   getMetaMetricsEnabled: () => Promise<boolean>;
+  log: (message: string) => void;
 }): Integration {
   return {
     name: NAME,
     processEvent: async (event: SentryEvent) => {
-      if (!(await getMetaMetricsEnabled())) {
-        logger.warn(`Event dropped due to MetaMetrics setting.`);
+      // This integration is required in addition to the custom transport as it provides an
+      // asynchronous context which we may need in order to read the persisted state from the
+      // store, so it can later be added to the event via the `beforeSend` overload.
+      // It also provides a more native solution for discarding events, but any
+      // session requests will always be handled by the custom transport.
+      const metricsEnabled = await getMetaMetricsEnabled();
+
+      if (!metricsEnabled) {
+        log('Event dropped as metrics disabled');
         return null;
       }
 
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 9f976c4d3bee..84971754e5ff 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -1,20 +1,29 @@
 import * as Sentry from '@sentry/browser';
+import { createModuleLogger, createProjectLogger } from '@metamask/utils';
+import { logger } from '@sentry/utils';
 import browser from 'webextension-polyfill';
 import { isManifestV3 } from '../../../shared/modules/mv3.utils';
 import { filterEvents } from './sentry-filter-events';
 import extractEthjsErrorMessage from './extractEthjsErrorMessage';
 
+const projectLogger = createProjectLogger('sentry');
+
+const log = createModuleLogger(
+  projectLogger,
+  globalThis.document ? 'ui' : 'background',
+);
+
 let installType = 'unknown';
 
 /* eslint-disable prefer-destructuring */
 // Destructuring breaks the inlining of the environment variables
+const METAMASK_BUILD_TYPE = process.env.METAMASK_BUILD_TYPE;
 const METAMASK_DEBUG = process.env.METAMASK_DEBUG;
 const METAMASK_ENVIRONMENT = process.env.METAMASK_ENVIRONMENT;
-const SENTRY_DSN_DEV =
-  process.env.SENTRY_DSN_DEV ||
-  'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496';
-const METAMASK_BUILD_TYPE = process.env.METAMASK_BUILD_TYPE;
-const IN_TEST = process.env.IN_TEST;
+const RELEASE = process.env.METAMASK_VERSION;
+const SENTRY_DSN = process.env.SENTRY_DSN;
+const SENTRY_DSN_DEV = process.env.SENTRY_DSN_DEV;
+const SENTRY_DSN_MMI = process.env.SENTRY_MMI_DSN;
 /* eslint-enable prefer-destructuring */
 
 export const ERROR_URL_ALLOWLIST = {
@@ -25,6 +34,54 @@ export const ERROR_URL_ALLOWLIST = {
   SEGMENT: 'segment.io',
 };
 
+export default function setupSentry() {
+  if (!RELEASE) {
+    throw new Error('Missing release');
+  }
+
+  if (!getSentryTarget()) {
+    log('Skipped initialization');
+    return undefined;
+  }
+
+  log('Initializing');
+
+  integrateLogging();
+  setSentryClient();
+
+  return {
+    ...Sentry,
+  };
+}
+
+function getClientOptions() {
+  const environment = getSentryEnvironment();
+  const sentryTarget = getSentryTarget();
+
+  return {
+    beforeBreadcrumb: beforeBreadcrumb(),
+    beforeSend: (report) => rewriteReport(report),
+    debug: METAMASK_DEBUG,
+    dsn: sentryTarget,
+    dist: isManifestV3 ? 'mv3' : 'mv2',
+    environment,
+    integrations: [
+      Sentry.dedupeIntegration(),
+      Sentry.extraErrorDataIntegration(),
+      filterEvents({ getMetaMetricsEnabled, log }),
+    ],
+    release: RELEASE,
+    // Client reports are automatically sent when a page's visibility changes to
+    // "hidden", but cancelled (with an Error) that gets logged to the console.
+    // Our test infra sometimes reports these errors as unexpected failures,
+    // which results in test flakiness. We don't use these client reports, so
+    // we can safely turn them off by setting the `sendClientReports` option to
+    // `false`.
+    sendClientReports: false,
+    transport: makeTransport,
+  };
+}
+
 /**
  * Returns whether MetaMetrics is enabled, given the application state.
  *
@@ -68,15 +125,12 @@ function getMetaMetricsEnabledFromPersistedState(persistedState) {
  * Returns whether onboarding has completed, given the application state.
  *
  * @param {Record<string, unknown>} appState - Application state
- * @returns `true` if MetaMask's state has been initialized, and MetaMetrics
- * is enabled, `false` otherwise.
+ * @returns `true` if onboarding has completed, `false` otherwise.
  */
 function getOnboardingCompleteFromAppState(appState) {
   // during initialization after loading persisted state
   if (appState.persistedState) {
-    return Boolean(
-      appState.persistedState.data?.OnboardingController?.completedOnboarding,
-    );
+    return getOnboardingCompleteFromPersistedState(appState.persistedState);
     // After initialization
   } else if (appState.state) {
     // UI
@@ -90,92 +144,82 @@ function getOnboardingCompleteFromAppState(appState) {
   return false;
 }
 
-export default function setupSentry({ release, getState }) {
-  if (!release) {
-    throw new Error('Missing release');
-  } else if (METAMASK_DEBUG && !IN_TEST) {
-    /**
-     * Workaround until the following issue is resolved
-     * https://github.com/MetaMask/metamask-extension/issues/15691
-     * The IN_TEST condition allows the e2e tests to run with both
-     * yarn start:test and yarn build:test
-     */
-    return undefined;
+/**
+ * Returns whether onboarding has completed, given the persisted state.
+ *
+ * @param {Record<string, unknown>} persistedState - Persisted state
+ * @returns `true` if onboarding has completed, `false` otherwise.
+ */
+function getOnboardingCompleteFromPersistedState(persistedState) {
+  return Boolean(
+    persistedState.data?.OnboardingController?.completedOnboarding,
+  );
+}
+
+function getSentryEnvironment() {
+  if (METAMASK_BUILD_TYPE === 'main') {
+    return METAMASK_ENVIRONMENT;
   }
 
-  const environment =
-    METAMASK_BUILD_TYPE === 'main'
-      ? METAMASK_ENVIRONMENT
-      : `${METAMASK_ENVIRONMENT}-${METAMASK_BUILD_TYPE}`;
-
-  let sentryTarget;
-  if (METAMASK_ENVIRONMENT === 'production') {
-    if (!process.env.SENTRY_DSN) {
-      throw new Error(
-        `Missing SENTRY_DSN environment variable in production environment`,
-      );
-    }
+  return `${METAMASK_ENVIRONMENT}-${METAMASK_BUILD_TYPE}`;
+}
 
-    ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
-    sentryTarget = process.env.SENTRY_MMI_DSN;
-    ///: END:ONLY_INCLUDE_IF
+function getSentryTarget() {
+  if (METAMASK_ENVIRONMENT !== 'production') {
+    return SENTRY_DSN_DEV;
+  }
 
-    ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-    sentryTarget = process.env.SENTRY_DSN;
-    ///: END:ONLY_INCLUDE_IF
+  if (METAMASK_BUILD_TYPE === 'mmi') {
+    return SENTRY_DSN_MMI;
+  }
 
-    console.log(
-      `Setting up Sentry Remote Error Reporting for '${environment}': SENTRY_DSN`,
-    );
-  } else {
-    console.log(
-      `Setting up Sentry Remote Error Reporting for '${environment}': SENTRY_DSN_DEV`,
+  if (!SENTRY_DSN) {
+    throw new Error(
+      `Missing SENTRY_DSN environment variable in production environment`,
     );
-    sentryTarget = SENTRY_DSN_DEV;
   }
 
-  /**
-   * Returns whether MetaMetrics is enabled. If the application hasn't yet
-   * been initialized, the persisted state will be used (if any).
-   *
-   * @returns `true` if MetaMetrics is enabled, `false` otherwise.
-   */
-  async function getMetaMetricsEnabled() {
-    if (METAMASK_BUILD_TYPE === 'mmi') {
-      return true;
-    }
+  return SENTRY_DSN;
+}
 
-    const appState = getState();
-    if (appState.state || appState.persistedState) {
-      return getMetaMetricsEnabledFromAppState(appState);
-    }
-    // If we reach here, it means the error was thrown before initialization
-    // completed, and before we loaded the persisted state for the first time.
-    try {
-      const persistedState = await globalThis.stateHooks.getPersistedState();
-      return getMetaMetricsEnabledFromPersistedState(persistedState);
-    } catch (error) {
-      console.error(error);
-      return false;
-    }
+/**
+ * Returns whether MetaMetrics is enabled. If the application hasn't yet
+ * been initialized, the persisted state will be used (if any).
+ *
+ * @returns `true` if MetaMetrics is enabled, `false` otherwise.
+ */
+async function getMetaMetricsEnabled() {
+  if (METAMASK_BUILD_TYPE === 'mmi') {
+    return true;
   }
 
-  /**
-   * Returns whether Sentry should be enabled or not. If the build type is mmi
-   * it will always be enabled, if it's main it will first check for MetaMetrics
-   * value before returning true or false
-   *
-   * @returns `true` if Sentry should be enabled, depends on the build type and
-   * whether MetaMetrics is on or off for all build types except mmi
-   */
-  async function getSentryEnabled() {
-    // For MMI we want Sentry always logging, doesn't depend on MetaMetrics being on or off
-    if (METAMASK_BUILD_TYPE === 'mmi') {
-      return true;
-    }
-    return getMetaMetricsEnabled();
+  const appState = getState();
+
+  if (appState.state || appState.persistedState) {
+    return (
+      getMetaMetricsEnabledFromAppState(appState) &&
+      getOnboardingCompleteFromAppState(appState)
+    );
   }
 
+  // If we reach here, it means the error was thrown before initialization
+  // completed, and before we loaded the persisted state for the first time.
+  try {
+    const persistedState = await globalThis.stateHooks.getPersistedState();
+    return (
+      getMetaMetricsEnabledFromPersistedState(persistedState) &&
+      getOnboardingCompleteFromPersistedState(persistedState)
+    );
+  } catch (error) {
+    log('Error retrieving persisted state', error);
+    return false;
+  }
+}
+
+function setSentryClient() {
+  const clientOptions = getClientOptions();
+  const { dsn, environment, release } = clientOptions;
+
   // Normally this would be awaited, but getSelf should be available by the time the report is finalized.
   // If it's not, we still get the extensionId, but the installType will default to "unknown"
   browser.management
@@ -197,130 +241,17 @@ export default function setupSentry({ release, getState }) {
    */
   globalThis.nw = {};
 
-  Sentry.init({
-    dsn: sentryTarget,
-    debug: METAMASK_DEBUG,
-    dist: isManifestV3 ? 'mv3' : 'mv2',
-    /**
-     * autoSessionTracking defaults to true and operates by sending a session
-     * packet to sentry. This session packet does not appear to be filtered out
-     * via our beforeSend or FilterEvents integration. To avoid sending a
-     * request before we have the state tree and can validate the users
-     * preferences, we initiate this to false. Later, in startSession and
-     * endSession we modify this option and start the session or end the
-     * session manually.
-     *
-     * In sentry-install we call toggleSession after the page loads and state
-     * is available, this handles initiating the session for a user who has
-     * opted into MetaMetrics. This script is ran in both the background and UI
-     * so it should be effective at starting the session in both places.
-     *
-     * In the MetaMetricsController the session is manually started or stopped
-     * when the user opts in or out of MetaMetrics. This occurs in the
-     * setParticipateInMetaMetrics function which is exposed to the UI via the
-     * MetaMaskController.
-     *
-     * In actions.ts, after sending the updated participateInMetaMetrics flag
-     * to the background, we call toggleSession to ensure sentry is kept in
-     * sync with the user's preference.
-     *
-     * Types for the global Sentry object, and the new methods added as part of
-     * this effort were added to global.d.ts in the types folder.
-     */
-    autoSessionTracking: false,
+  log('Updating client', {
     environment,
-    integrations: [
-      /**
-       * Filtering of events must happen in this FilterEvents custom
-       * integration instead of in the beforeSend handler because the Dedupe
-       * integration is unaware of the beforeSend functionality. If an event is
-       * queued in the sentry context, additional events of the same name will
-       * be filtered out by Dedupe even if the original event was not sent due
-       * to the beforeSend method returning null.
-       *
-       * @see https://github.com/MetaMask/metamask-extension/pull/15677
-       */
-      filterEvents({ getMetaMetricsEnabled }),
-      Sentry.dedupeIntegration(),
-      Sentry.extraErrorDataIntegration(),
-      Sentry.browserProfilingIntegration(),
-    ],
+    dsn,
     release,
-    /**
-     * Setting a value for `tracesSampleRate` enables performance monitoring in Sentry.
-     * Once performance monitoring is enabled, transactions are sent to Sentry every time
-     * a user loads a page or navigates within the app.
-     * Since the amount of traffic the app gets is important, this means a lot of
-     * transactions are sent. By setting `tracesSampleRate` to a value lower than 1.0, we
-     * reduce the volume of transactions to a more reasonable amount.
-     */
-    tracesSampleRate: 0.01,
-    beforeSend: (report) => rewriteReport(report, getState),
-    beforeBreadcrumb: beforeBreadcrumb(getState),
-    // Client reports are automatically sent when a page's visibility changes to
-    // "hidden", but cancelled (with an Error) that gets logged to the console.
-    // Our test infra sometimes reports these errors as unexpected failures,
-    // which results in test flakiness. We don't use these client reports, so
-    // we can safely turn them off by setting the `sendClientReports` option to
-    // `false`.
-    sendClientReports: false,
   });
 
-  /**
-   * As long as a reference to the Sentry Hub can be found, and the user has
-   * opted into MetaMetrics, change the autoSessionTracking option and start
-   * a new sentry session.
-   */
-  const startSession = async () => {
-    const client = Sentry.getClient();
-    const options = client?.getOptions?.() ?? {};
-    if (client && (await getSentryEnabled()) === true) {
-      options.autoSessionTracking = true;
-      Sentry.startSession();
-    }
-  };
+  Sentry.init(clientOptions);
 
-  /**
-   * As long as a reference to the Sentry Hub can be found, and the user has
-   * opted out of MetaMetrics, change the autoSessionTracking option and end
-   * the current sentry session.
-   */
-  const endSession = async () => {
-    const client = Sentry.getClient();
-    const options = client?.getOptions?.() ?? {};
-    if (client && (await getSentryEnabled()) === false) {
-      options.autoSessionTracking = false;
-      Sentry.endSession();
-    }
-  };
-
-  /**
-   * Call the appropriate method (either startSession or endSession) depending
-   * on the state of metaMetrics optin and the state of autoSessionTracking on
-   * the Sentry client.
-   */
-  const toggleSession = async () => {
-    const client = Sentry.getClient();
-    const options = client?.getOptions?.() ?? {
-      autoSessionTracking: false,
-    };
-    const isSentryEnabled = await getSentryEnabled();
-    if (isSentryEnabled === true && options.autoSessionTracking === false) {
-      await startSession();
-    } else if (
-      isSentryEnabled === false &&
-      options.autoSessionTracking === true
-    ) {
-      await endSession();
-    }
-  };
+  addDebugListeners();
 
-  return {
-    ...Sentry,
-    startSession,
-    endSession,
-    toggleSession,
-  };
+  return true;
 }
 
 /**
@@ -342,10 +273,9 @@ function hideUrlIfNotInternal(url) {
 /**
  * Returns a method that handles the Sentry breadcrumb using a specific method to get the extension state
  *
- * @param {Function} getState - A method that returns the state of the extension
  * @returns {(breadcrumb: object) => object} A method that modifies a Sentry breadcrumb object
  */
-export function beforeBreadcrumb(getState) {
+export function beforeBreadcrumb() {
   return (breadcrumb) => {
     if (!getState) {
       return null;
@@ -391,11 +321,9 @@ export function removeUrlsFromBreadCrumb(breadcrumb) {
  * return value of the second parameter passed to the function.
  *
  * @param {object} report - A Sentry event object: https://develop.sentry.dev/sdk/event-payloads/
- * @param {Function} getState - A function that should return an object representing some amount
- * of app state that we wish to submit with our error reports
  * @returns {object} A modified Sentry event object.
  */
-export function rewriteReport(report, getState) {
+export function rewriteReport(report) {
   try {
     // simplify certain complex error messages (e.g. Ethjs)
     simplifyErrorMessages(report);
@@ -408,21 +336,21 @@ export function rewriteReport(report, getState) {
     sanitizeAddressesFromErrorMessages(report);
     // modify report urls
     rewriteReportUrls(report);
+
     // append app state
-    if (getState) {
-      const appState = getState();
-      if (!report.extra) {
-        report.extra = {};
-      }
-      report.extra.appState = appState;
+    const appState = getState();
+
+    if (!report.extra) {
+      report.extra = {};
     }
 
+    report.extra.appState = appState;
     if (browser.runtime && browser.runtime.id) {
       report.extra.extensionId = browser.runtime.id;
     }
     report.extra.installType = installType;
   } catch (err) {
-    console.warn(err);
+    log('Error rewriting report', err);
   }
   return report;
 }
@@ -534,3 +462,59 @@ function toMetamaskUrl(origUrl) {
   const metamaskUrl = `/metamask${filePath}`;
   return metamaskUrl;
 }
+
+function getState() {
+  return globalThis.stateHooks?.getSentryState?.() || {};
+}
+
+function integrateLogging() {
+  if (!METAMASK_DEBUG) {
+    return;
+  }
+
+  for (const loggerType of ['log', 'error']) {
+    logger[loggerType] = (...args) => {
+      const message = args[0].replace(`Sentry Logger [${loggerType}]: `, '');
+      log(message, ...args.slice(1));
+    };
+  }
+
+  log('Integrated logging');
+}
+
+function addDebugListeners() {
+  if (!METAMASK_DEBUG) {
+    return;
+  }
+
+  const client = Sentry.getClient();
+
+  client?.on('beforeEnvelope', (event) => {
+    const type = event?.[1]?.[0]?.[0]?.type;
+    const data = event?.[1]?.[0]?.[1] ?? {};
+
+    if (type !== 'session' || data.status !== 'exited') {
+      return;
+    }
+
+    log('Completed session', data);
+  });
+
+  client?.on('afterSendEvent', (event) => {
+    log('Event', event);
+  });
+
+  log('Added debug listeners');
+}
+
+function makeTransport(options) {
+  return Sentry.makeFetchTransport(options, async (...args) => {
+    const metricsEnabled = await getMetaMetricsEnabled();
+
+    if (!metricsEnabled) {
+      throw new Error('Network request skipped as metrics disabled');
+    }
+
+    return await fetch(...args);
+  });
+}
diff --git a/app/scripts/sentry-install.js b/app/scripts/sentry-install.js
index 99d8ddd39327..cbbc03ab10e2 100644
--- a/app/scripts/sentry-install.js
+++ b/app/scripts/sentry-install.js
@@ -4,25 +4,4 @@ import setupSentry from './lib/setupSentry';
 global.stateHooks = {};
 
 // setup sentry error reporting
-global.sentry = setupSentry({
-  release: process.env.METAMASK_VERSION,
-  getState: () => global.stateHooks?.getSentryState?.() || {},
-});
-
-/**
- * As soon as state is available via getSentryState we can start automatic
- * session tracking.
- */
-async function waitForStateHooks() {
-  if (global.stateHooks.getSentryState) {
-    // sentry is not defined in dev mode, so if sentry doesn't exist at this
-    // point it means that we are in dev mode and do not need to toggle the
-    // session. Using optional chaining is sufficient to prevent the error in
-    // development.
-    await global.sentry?.startSession();
-  } else {
-    setTimeout(waitForStateHooks, 100);
-  }
-}
-
-waitForStateHooks();
+global.sentry = setupSentry();
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 297577a59031..c87197bfaf1c 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -79,6 +79,7 @@ const scuttlingConfigBase = {
     console: '',
     crypto: '',
     Map: '',
+    isFinite: '',
     // {clear/set}Timeout are "this sensitive"
     clearTimeout: 'window',
     setTimeout: 'window',
diff --git a/package.json b/package.json
index cf3b33313e97..2b890b689cad 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "url": "https://github.com/MetaMask/metamask-extension.git"
   },
   "scripts": {
+    "env:e2e": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn",
     "start": "yarn build:dev dev --apply-lavamoat=false --snow=false",
     "start:skip-onboarding": "SKIP_ONBOARDING=true yarn start",
     "start:mv2": "ENABLE_MV3=false yarn build:dev dev --apply-lavamoat=false --snow=false",
@@ -19,20 +20,20 @@
     "dist:mmi:debug": "yarn dist --build-type mmi --apply-lavamoat=false --snow=false",
     "build": "yarn lavamoat:build",
     "build:dev": "node development/build/index.js",
-    "start:test": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev",
-    "start:test:flask": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --build-type flask --apply-lavamoat=false --snow=false",
-    "start:test:mv2:flask": "ENABLE_MV3=false SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --build-type flask --apply-lavamoat=false --snow=false",
-    "start:test:mv2": "ENABLE_MV3=false BLOCKAID_FILE_CDN=static.cx.metamask.io/api/v1/confirmations/ppom SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --apply-lavamoat=false --snow=false",
+    "start:test": "yarn env:e2e build:dev testDev",
+    "start:test:flask": "yarn start:test --build-type flask",
+    "start:test:mv2:flask": "ENABLE_MV3=false yarn start:test:flask --apply-lavamoat=false --snow=false",
+    "start:test:mv2": "ENABLE_MV3=false BLOCKAID_FILE_CDN=static.cx.metamask.io/api/v1/confirmations/ppom yarn start:test --apply-lavamoat=false --snow=false",
     "benchmark:chrome": "SELENIUM_BROWSER=chrome ts-node test/e2e/benchmark.js",
     "mv3:stats:chrome": "SELENIUM_BROWSER=chrome ts-node test/e2e/mv3-perf-stats/index.js",
     "user-actions-benchmark:chrome": "SELENIUM_BROWSER=chrome ts-node test/e2e/user-actions-benchmark.js",
     "benchmark:firefox": "SELENIUM_BROWSER=firefox ts-node test/e2e/benchmark.js",
-    "build:test": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build test",
-    "build:test:dev": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build:dev testDev --apply-lavamoat=false",
-    "build:test:flask": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build test --build-type flask",
-    "build:test:flask:mv2": "ENABLE_MV3=false SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build test --build-type flask",
-    "build:test:mmi": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build test --build-type mmi",
-    "build:test:mv2": "ENABLE_MV3=false BLOCKAID_FILE_CDN=static.cx.metamask.io/api/v1/confirmations/ppom SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' SENTRY_DSN_DEV=https://fake@sentry.io/0000000 yarn build test",
+    "build:test": "yarn env:e2e build test",
+    "build:test:dev": "yarn env:e2e build:dev testDev --apply-lavamoat=false",
+    "build:test:flask": "yarn build:test --build-type flask",
+    "build:test:flask:mv2": "ENABLE_MV3=false yarn build:test:flask",
+    "build:test:mmi": "yarn build:test --build-type mmi",
+    "build:test:mv2": "ENABLE_MV3=false BLOCKAID_FILE_CDN=static.cx.metamask.io/api/v1/confirmations/ppom yarn build:test",
     "test": "yarn lint && yarn test:unit && yarn test:unit:jest",
     "dapp": "node development/static-server.js node_modules/@metamask/test-dapp/dist --port 8080",
     "dapp-chain": "GANACHE_ARGS='-b 2' concurrently -k -n ganache,dapp -p '[{time}][{name}]' 'yarn ganache:start' 'sleep 5 && yarn dapp'",
diff --git a/test/e2e/tests/metrics/errors.spec.js b/test/e2e/tests/metrics/errors.spec.js
index 1ff7ca4faecc..54e7c2b0e6aa 100644
--- a/test/e2e/tests/metrics/errors.spec.js
+++ b/test/e2e/tests/metrics/errors.spec.js
@@ -221,7 +221,7 @@ describe('Sentry errors', function () {
     ],
   };
 
-  describe('before initialization, after opting out of metrics', function () {
+  describe('before initialization, after opting out of metrics @no-mmi', function () {
     it('should NOT send error events in the background', async function () {
       await withFixtures(
         {
@@ -534,7 +534,7 @@ describe('Sentry errors', function () {
     });
   });
 
-  describe('after initialization, after opting out of metrics', function () {
+  describe('after initialization, after opting out of metrics @no-mmi', function () {
     it('should NOT send error events in the background', async function () {
       await withFixtures(
         {
diff --git a/types/global.d.ts b/types/global.d.ts
index c061fba57001..451168775331 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -224,18 +224,7 @@ declare class Chrome {
   runtime: Runtime;
 }
 
-type SentryObject = Sentry & {
-  // Verifies that the user has opted into metrics and then updates the sentry
-  // instance to track sessions and begins the session.
-  startSession: () => void;
-
-  // Verifies that the user has opted out of metrics and then updates the
-  // sentry instance to NOT track sessions and ends the current session.
-  endSession: () => void;
-
-  // Calls either startSession or endSession based on optin status
-  toggleSession: () => void;
-};
+type SentryObject = Sentry;
 
 export declare global {
   var platform: Platform;
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index d2a0740389fb..57e52dc9a7b3 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -1619,12 +1619,6 @@ describe('Actions', () => {
   });
 
   describe('#setParticipateInMetaMetrics', () => {
-    beforeAll(() => {
-      window.sentry = {
-        toggleSession: jest.fn(),
-        endSession: jest.fn(),
-      };
-    });
     it('sets participateInMetaMetrics to true', async () => {
       const store = mockStore();
       const setParticipateInMetaMetricsStub = jest.fn((_, cb) => cb());
@@ -1640,7 +1634,6 @@ describe('Actions', () => {
         true,
         expect.anything(),
       );
-      expect(window.sentry.toggleSession).toHaveBeenCalled();
     });
   });
 
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index ba53d0a8eeb7..a64cd2e6bb9e 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -3224,17 +3224,12 @@ export function setParticipateInMetaMetrics(
             reject(err);
             return;
           }
-          /**
-           * We need to inform sentry that the user's optin preference may have
-           * changed. The logic to determine which way to toggle is in the
-           * toggleSession handler in setupSentry.js.
-           */
-          window.sentry?.toggleSession();
 
           dispatch({
             type: actionConstants.SET_PARTICIPATE_IN_METAMETRICS,
             value: participationPreference,
           });
+
           resolve([participationPreference, metaMetricsId as string]);
         },
       );
diff --git a/yarn.lock b/yarn.lock
index adfdbd060291..2ba27f09fc0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8008,13 +8008,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/types@npm:8.19.0, @sentry/types@npm:^8.19.0":
+"@sentry/types@npm:8.19.0":
   version: 8.19.0
   resolution: "@sentry/types@npm:8.19.0"
   checksum: 10/8812f7394c6c031197abc04d80e5b5b3693742dc065b877c535a9ceb538aabd60ee27fc2b13824e2b8fc264819868109bbd4de3642fd1c7bf30d304fb0c21aa9
   languageName: node
   linkType: hard
 
+"@sentry/types@npm:^8.19.0":
+  version: 8.20.0
+  resolution: "@sentry/types@npm:8.20.0"
+  checksum: 10/c7d7ed17975f0fc0b4bf5aece58084953c2a76e8f417923a476fe1fd42a2c9339c548d701edbc4b938c9252cf680d3eff4c6c2a986bc7ac62649aebf656c5b64
+  languageName: node
+  linkType: hard
+
 "@sentry/utils@npm:8.19.0, @sentry/utils@npm:^8.19.0":
   version: 8.19.0
   resolution: "@sentry/utils@npm:8.19.0"

From 69277467ff1372f275941b062504400024112424 Mon Sep 17 00:00:00 2001
From: Bilal <44588480+BZahory@users.noreply.github.com>
Date: Thu, 22 Aug 2024 16:08:22 -0400
Subject: [PATCH 226/236] fix (cherry-pick for v12.1.0): add user IDs for send
 page events (#26625)
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**

Cherry picks #26600

<!--
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/26625?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/scripts/controllers/metametrics.js        |  3 +-
 ui/components/app/nfts-items/nfts-items.js    | 25 +++++++++-------
 .../app/wallet-overview/coin-buttons.tsx      | 21 +++++++------
 .../asset-picker-modal/asset-picker-modal.tsx | 25 +++++++++-------
 .../asset-picker/asset-picker.tsx             | 19 +++++++-----
 .../pages/send/components/address-book.tsx    | 17 ++++++-----
 .../send/components/quote-card/index.tsx      | 19 +++++++-----
 .../pages/send/components/recipient-input.tsx | 17 ++++++-----
 .../pages/send/components/recipient.tsx       | 17 ++++++-----
 .../pages/send/components/your-accounts.tsx   | 17 ++++++-----
 ui/components/multichain/pages/send/send.js   | 30 +++++++++++--------
 ui/pages/asset/components/token-buttons.tsx   | 21 +++++++------
 12 files changed, 138 insertions(+), 93 deletions(-)

diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index 6c3f3392e929..8aafa0893d53 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -1016,7 +1016,8 @@ export default class MetaMetricsController {
     // to be updated to work with the new tracking plan. I think we should use
     // a config setting for this instead of trying to match the event name
     const isSendFlow = Boolean(payload.event.match(/^send|^confirm/iu));
-    if (isSendFlow) {
+    // do not filter if excludeMetaMetricsId is explicitly set to false
+    if (options?.excludeMetaMetricsId !== false && isSendFlow) {
       excludeMetaMetricsId = true;
     }
     // If we are tracking sensitive data we will always use the anonymousId
diff --git a/ui/components/app/nfts-items/nfts-items.js b/ui/components/app/nfts-items/nfts-items.js
index 7f2cfce7c7cb..5559fe15c86a 100644
--- a/ui/components/app/nfts-items/nfts-items.js
+++ b/ui/components/app/nfts-items/nfts-items.js
@@ -164,17 +164,22 @@ export default function NftsItems({
   };
 
   const onSendNft = async (nft) => {
-    trackEvent({
-      event: MetaMetricsEventName.sendAssetSelected,
-      category: MetaMetricsEventCategory.Send,
-      properties: {
-        ...sendAnalytics,
-        is_destination_asset_picker_modal: false,
-        new_asset_symbol: nft.name,
-        new_asset_address: nft.address,
-        is_nft: true,
+    trackEvent(
+      {
+        event: MetaMetricsEventName.sendAssetSelected,
+        category: MetaMetricsEventCategory.Send,
+        properties: {
+          is_destination_asset_picker_modal: false,
+          is_nft: true,
+        },
+        sensitiveProperties: {
+          ...sendAnalytics,
+          new_asset_symbol: nft.name,
+          new_asset_address: nft.address,
+        },
       },
-    });
+      { excludeMetaMetricsId: false },
+    );
     await dispatch(
       updateSendAsset({
         type: AssetType.NFT,
diff --git a/ui/components/app/wallet-overview/coin-buttons.tsx b/ui/components/app/wallet-overview/coin-buttons.tsx
index b1774897edc4..095d8fa71aa4 100644
--- a/ui/components/app/wallet-overview/coin-buttons.tsx
+++ b/ui/components/app/wallet-overview/coin-buttons.tsx
@@ -219,16 +219,19 @@ const CoinButtons = ({
   ///: END:ONLY_INCLUDE_IF
 
   const handleSendOnClick = useCallback(async () => {
-    trackEvent({
-      event: MetaMetricsEventName.NavSendButtonClicked,
-      category: MetaMetricsEventCategory.Navigation,
-      properties: {
-        token_symbol: 'ETH',
-        location: 'Home',
-        text: 'Send',
-        chain_id: chainId,
+    trackEvent(
+      {
+        event: MetaMetricsEventName.NavSendButtonClicked,
+        category: MetaMetricsEventCategory.Navigation,
+        properties: {
+          token_symbol: 'ETH',
+          location: 'Home',
+          text: 'Send',
+          chain_id: chainId,
+        },
       },
-    });
+      { excludeMetaMetricsId: false },
+    );
     await dispatch(startNewDraftTransaction({ type: AssetType.native }));
     history.push(SEND_ROUTE);
   }, [chainId]);
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
index fc37172f5e15..b0c2b6a4566d 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx
@@ -123,17 +123,22 @@ export function AssetPickerModal({
   const handleAssetChange = useCallback(
     (token: Token) => {
       onAssetChange(token);
-      trackEvent({
-        event: MetaMetricsEventName.sendAssetSelected,
-        category: MetaMetricsEventCategory.Send,
-        properties: {
-          ...sendAnalytics,
-          is_destination_asset_picker_modal: Boolean(isDest),
-          new_asset_symbol: token.symbol,
-          new_asset_address: token.address,
-          is_nft: false,
+      trackEvent(
+        {
+          event: MetaMetricsEventName.sendAssetSelected,
+          category: MetaMetricsEventCategory.Send,
+          properties: {
+            is_destination_asset_picker_modal: Boolean(isDest),
+            is_nft: false,
+          },
+          sensitiveProperties: {
+            ...sendAnalytics,
+            new_asset_symbol: token.symbol,
+            new_asset_address: token.address,
+          },
         },
-      });
+        { excludeMetaMetricsId: false },
+      );
       onClose();
     },
     [onAssetChange],
diff --git a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
index 276c89bd50ab..3ce7f37b591e 100644
--- a/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
+++ b/ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
@@ -162,14 +162,19 @@ export function AssetPicker({
         backgroundColor={BackgroundColor.transparent}
         onClick={() => {
           setShowAssetPickerModal(true);
-          trackEvent({
-            event: MetaMetricsEventName.sendTokenModalOpened,
-            category: MetaMetricsEventCategory.Send,
-            properties: {
-              ...sendAnalytics,
-              is_destination_asset_picker_modal: Boolean(sendingAsset),
+          trackEvent(
+            {
+              event: MetaMetricsEventName.sendTokenModalOpened,
+              category: MetaMetricsEventCategory.Send,
+              properties: {
+                is_destination_asset_picker_modal: Boolean(sendingAsset),
+              },
+              sensitiveProperties: {
+                ...sendAnalytics,
+              },
             },
-          });
+            { excludeMetaMetricsId: false },
+          );
         }}
         endIconName={IconName.ArrowDown}
         endIconProps={{
diff --git a/ui/components/multichain/pages/send/components/address-book.tsx b/ui/components/multichain/pages/send/components/address-book.tsx
index 84e29e0a1ed5..8100646486ca 100644
--- a/ui/components/multichain/pages/send/components/address-book.tsx
+++ b/ui/components/multichain/pages/send/components/address-book.tsx
@@ -99,14 +99,17 @@ export const SendPageAddressBook = () => {
         `sendFlow - User clicked recipient from ${type}. address: ${address}, nickname ${nickname}`,
       ),
     );
-    trackEvent({
-      event: MetaMetricsEventName.sendRecipientSelected,
-      category: MetaMetricsEventCategory.Send,
-      properties: {
-        location: 'address book',
-        inputType: type,
+    trackEvent(
+      {
+        event: MetaMetricsEventName.sendRecipientSelected,
+        category: MetaMetricsEventCategory.Send,
+        properties: {
+          location: 'address book',
+          inputType: type,
+        },
       },
-    });
+      { excludeMetaMetricsId: false },
+    );
     dispatch(updateRecipient({ address, nickname }));
     dispatch(updateRecipientUserInput(address));
   };
diff --git a/ui/components/multichain/pages/send/components/quote-card/index.tsx b/ui/components/multichain/pages/send/components/quote-card/index.tsx
index d3815fd3d64c..99b84e42a29b 100644
--- a/ui/components/multichain/pages/send/components/quote-card/index.tsx
+++ b/ui/components/multichain/pages/send/components/quote-card/index.tsx
@@ -85,14 +85,19 @@ export function QuoteCard({ scrollRef }: QuoteCardProps) {
     }
 
     if (bestQuote) {
-      trackEvent({
-        event: MetaMetricsEventName.sendSwapQuoteFetched,
-        category: MetaMetricsEventCategory.Send,
-        properties: {
-          ...sendAnalytics,
-          is_first_fetch: isQuoteJustLoaded,
+      trackEvent(
+        {
+          event: MetaMetricsEventName.sendSwapQuoteFetched,
+          category: MetaMetricsEventCategory.Send,
+          properties: {
+            is_first_fetch: isQuoteJustLoaded,
+          },
+          sensitiveProperties: {
+            ...sendAnalytics,
+          },
         },
-      });
+        { excludeMetaMetricsId: false },
+      );
       setTimeLeft(REFRESH_INTERVAL);
     } else {
       setTimeLeft(undefined);
diff --git a/ui/components/multichain/pages/send/components/recipient-input.tsx b/ui/components/multichain/pages/send/components/recipient-input.tsx
index debcdbbdca36..4d7d8cee633b 100644
--- a/ui/components/multichain/pages/send/components/recipient-input.tsx
+++ b/ui/components/multichain/pages/send/components/recipient-input.tsx
@@ -46,14 +46,17 @@ export const SendPageRecipientInput = () => {
             addHistoryEntry(`sendFlow - Valid address typed ${address}`),
           );
           await dispatch(updateRecipientUserInput(address));
-          trackEvent({
-            event: MetaMetricsEventName.sendRecipientSelected,
-            category: MetaMetricsEventCategory.Send,
-            properties: {
-              location: 'send page recipient input',
-              inputType: 'user input',
+          trackEvent(
+            {
+              event: MetaMetricsEventName.sendRecipientSelected,
+              category: MetaMetricsEventCategory.Send,
+              properties: {
+                location: 'send page recipient input',
+                inputType: 'user input',
+              },
             },
-          });
+            { excludeMetaMetricsId: false },
+          );
           dispatch(updateRecipient({ address, nickname: '' }));
         }}
         internalSearch={isUsingMyAccountsForRecipientSearch}
diff --git a/ui/components/multichain/pages/send/components/recipient.tsx b/ui/components/multichain/pages/send/components/recipient.tsx
index 841077cfafcd..f2049493133a 100644
--- a/ui/components/multichain/pages/send/components/recipient.tsx
+++ b/ui/components/multichain/pages/send/components/recipient.tsx
@@ -67,14 +67,17 @@ export const SendPageRecipient = () => {
         `sendFlow - User clicked recipient from ${type}. address: ${address}, nickname ${nickname}`,
       ),
     );
-    trackEvent({
-      event: MetaMetricsEventName.sendRecipientSelected,
-      category: MetaMetricsEventCategory.Send,
-      properties: {
-        location: 'send page recipient screen',
-        inputType: type,
+    trackEvent(
+      {
+        event: MetaMetricsEventName.sendRecipientSelected,
+        category: MetaMetricsEventCategory.Send,
+        properties: {
+          location: 'send page recipient screen',
+          inputType: type,
+        },
       },
-    });
+      { excludeMetaMetricsId: false },
+    );
     dispatch(updateRecipient({ address, nickname }));
     dispatch(updateRecipientUserInput(address));
   };
diff --git a/ui/components/multichain/pages/send/components/your-accounts.tsx b/ui/components/multichain/pages/send/components/your-accounts.tsx
index a881e8922634..d05926e7ae87 100644
--- a/ui/components/multichain/pages/send/components/your-accounts.tsx
+++ b/ui/components/multichain/pages/send/components/your-accounts.tsx
@@ -42,14 +42,17 @@ export const SendPageYourAccounts = () => {
                 `sendFlow - User clicked recipient from my accounts. address: ${account.address}, nickname ${account.name}`,
               ),
             );
-            trackEvent({
-              event: MetaMetricsEventName.sendRecipientSelected,
-              category: MetaMetricsEventCategory.Send,
-              properties: {
-                location: 'my accounts',
-                inputType: 'click',
+            trackEvent(
+              {
+                event: MetaMetricsEventName.sendRecipientSelected,
+                category: MetaMetricsEventCategory.Send,
+                properties: {
+                  location: 'my accounts',
+                  inputType: 'click',
+                },
               },
-            });
+              { excludeMetaMetricsId: false },
+            );
             dispatch(
               updateRecipient({
                 address: account.address,
diff --git a/ui/components/multichain/pages/send/send.js b/ui/components/multichain/pages/send/send.js
index b1b11b2d434a..3195dceab5d3 100644
--- a/ui/components/multichain/pages/send/send.js
+++ b/ui/components/multichain/pages/send/send.js
@@ -201,13 +201,16 @@ export const SendPage = () => {
     }
     dispatch(resetSendState());
 
-    trackEvent({
-      event: MetaMetricsEventName.sendFlowExited,
-      category: MetaMetricsEventCategory.Send,
-      properties: {
-        ...sendAnalytics,
+    trackEvent(
+      {
+        event: MetaMetricsEventName.sendFlowExited,
+        category: MetaMetricsEventCategory.Send,
+        sensitiveProperties: {
+          ...sendAnalytics,
+        },
       },
-    });
+      { excludeMetaMetricsId: false },
+    );
 
     const nextRoute =
       sendStage === SEND_STAGES.EDIT ? DEFAULT_ROUTE : mostRecentOverviewPage;
@@ -216,13 +219,16 @@ export const SendPage = () => {
 
   useEffect(() => {
     if (swapQuotesError) {
-      trackEvent({
-        event: MetaMetricsEventName.sendSwapQuoteError,
-        category: MetaMetricsEventCategory.Send,
-        properties: {
-          ...sendAnalytics,
+      trackEvent(
+        {
+          event: MetaMetricsEventName.sendSwapQuoteError,
+          category: MetaMetricsEventCategory.Send,
+          sensitiveProperties: {
+            ...sendAnalytics,
+          },
         },
-      });
+        { excludeMetaMetricsId: false },
+      );
     }
     // sendAnalytics should not result in the event refiring
     // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/ui/pages/asset/components/token-buttons.tsx b/ui/pages/asset/components/token-buttons.tsx
index 6cd78fab7693..cfa4abee87f0 100644
--- a/ui/pages/asset/components/token-buttons.tsx
+++ b/ui/pages/asset/components/token-buttons.tsx
@@ -181,16 +181,19 @@ const TokenButtons = ({
       <IconButton
         className="token-overview__button"
         onClick={async () => {
-          trackEvent({
-            event: MetaMetricsEventName.NavSendButtonClicked,
-            category: MetaMetricsEventCategory.Navigation,
-            properties: {
-              token_symbol: token.symbol,
-              location: MetaMetricsSwapsEventSource.TokenView,
-              text: 'Send',
-              chain_id: chainId,
+          trackEvent(
+            {
+              event: MetaMetricsEventName.NavSendButtonClicked,
+              category: MetaMetricsEventCategory.Navigation,
+              properties: {
+                token_symbol: token.symbol,
+                location: MetaMetricsSwapsEventSource.TokenView,
+                text: 'Send',
+                chain_id: chainId,
+              },
             },
-          });
+            { excludeMetaMetricsId: false },
+          );
           try {
             await dispatch(
               startNewDraftTransaction({

From 42555d383bbfe9214941f84dd11733bca92e668c Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 22 Aug 2024 18:18:08 -0230
Subject: [PATCH 227/236] refactor: add performance tracing infrastructure
 (#26044) [cherry-pick] (#26624)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry-pick of (#26044) for v12.1.0. original description:

## **Description**

Add initial tracing and performance metrics infrastructure.

Specifically:

- Add the `trace` method, to be used anywhere in the client to generate
a Sentry trace to monitor and analyse performance metrics.
- Add buttons to the developer settings as an easy mechanism to generate
Sentry errors (in the UI or background) and traces.
- Add the `Sentry.browserTracingIntegration` to automatically generate
traces for each page navigation, including nested spans for any HTTP
requests.
- Update the Sentry debugging documentation in the `README`.

Note that the previously used `browserProfilingIntegration` does not
generate transactions or traces itself, but rather attempts to add
profiling data to any generated transactions. This does not appear to be
compatible given it requires the Self-Profiling API object which is only
available in Chrome and in our case, the UI. In addition, it requires
the `js-profiling` document policy which also appears to currently not
be supported in browser extensions.

Sentry also provides React specific automated instrumentation via
`@sentry/react` and the
`Sentry.reactRouterV5BrowserTracingInstrumentation` integration, but
this should be pursued in a separate ticket if needed given the required
further refactor.

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

## **Related issues**

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

## **Manual testing steps**

1. Enable metrics in the settings.
2. Login to Sentry account.
3. Go to `Traces` or `Performance` section.
4. Note new transactions or traces named `popup.html` with nested spans
including HTTP requests.

## **Screenshots/Recordings**

### **Before**

### **After**

<img width="250" alt="Sentry Developer Options"
src="https://github.com/user-attachments/assets/620cbfb8-ab4d-4ed0-b5f6-ba04ef975ddc">

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: Matthew Walsh <matthew.walsh@consensys.net>
---
 app/_locales/en/messages.json                 |  18 ++
 app/scripts/lib/setupSentry.js                |  43 ++--
 development/README.md                         |  37 +---
 shared/lib/trace.test.ts                      | 112 +++++++++++
 shared/lib/trace.ts                           |  54 +++++
 types/global.d.ts                             |  27 ++-
 ui/index.js                                   |   8 +-
 .../developer-options-tab.test.tsx.snap       | 141 +++++++++++++
 .../developer-options-tab.tsx                 |   2 +
 .../developer-options-tab/sentry-test.tsx     | 187 ++++++++++++++++++
 ui/store/actions.ts                           |   2 +-
 11 files changed, 589 insertions(+), 42 deletions(-)
 create mode 100644 shared/lib/trace.test.ts
 create mode 100644 shared/lib/trace.ts
 create mode 100644 ui/pages/settings/developer-options-tab/sentry-test.tsx

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 6ebd5fab0f05..549762cc1672 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1515,6 +1515,24 @@
   "developerOptionsResetStatesOnboarding": {
     "message": "Resets various states related to onboarding and redirects to the \"Secure Your Wallet\" onboarding page."
   },
+  "developerOptionsSentryButtonGenerateBackgroundError": {
+    "message": "Generate Background Error"
+  },
+  "developerOptionsSentryButtonGenerateTrace": {
+    "message": "Generate Trace"
+  },
+  "developerOptionsSentryButtonGenerateUIError": {
+    "message": "Generate UI Error"
+  },
+  "developerOptionsSentryDescriptionGenerateBackgroundError": {
+    "message": "Generate an unhandled $1 in the service worker."
+  },
+  "developerOptionsSentryDescriptionGenerateTrace": {
+    "message": " Generate a $1 Sentry trace."
+  },
+  "developerOptionsSentryDescriptionGenerateUIError": {
+    "message": "Generate an unhandled $1 in this window."
+  },
   "developerOptionsServiceWorkerKeepAlive": {
     "message": "Results in a timestamp being continuously saved to session.storage"
   },
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 84971754e5ff..47d96c259727 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -6,14 +6,16 @@ import { isManifestV3 } from '../../../shared/modules/mv3.utils';
 import { filterEvents } from './sentry-filter-events';
 import extractEthjsErrorMessage from './extractEthjsErrorMessage';
 
+let installType = 'unknown';
+
 const projectLogger = createProjectLogger('sentry');
 
-const log = createModuleLogger(
+export const log = createModuleLogger(
   projectLogger,
   globalThis.document ? 'ui' : 'background',
 );
 
-let installType = 'unknown';
+const internalLog = createModuleLogger(log, 'internal');
 
 /* eslint-disable prefer-destructuring */
 // Destructuring breaks the inlining of the environment variables
@@ -51,6 +53,7 @@ export default function setupSentry() {
 
   return {
     ...Sentry,
+    getMetaMetricsEnabled,
   };
 }
 
@@ -68,6 +71,7 @@ function getClientOptions() {
     integrations: [
       Sentry.dedupeIntegration(),
       Sentry.extraErrorDataIntegration(),
+      Sentry.browserTracingIntegration(),
       filterEvents({ getMetaMetricsEnabled, log }),
     ],
     release: RELEASE,
@@ -78,6 +82,7 @@ function getClientOptions() {
     // we can safely turn them off by setting the `sendClientReports` option to
     // `false`.
     sendClientReports: false,
+    tracesSampleRate: 0.01,
     transport: makeTransport,
   };
 }
@@ -247,6 +252,7 @@ function setSentryClient() {
     release,
   });
 
+  Sentry.registerSpanErrorInstrumentation();
   Sentry.init(clientOptions);
 
   addDebugListeners();
@@ -475,7 +481,7 @@ function integrateLogging() {
   for (const loggerType of ['log', 'error']) {
     logger[loggerType] = (...args) => {
       const message = args[0].replace(`Sentry Logger [${loggerType}]: `, '');
-      log(message, ...args.slice(1));
+      internalLog(message, ...args.slice(1));
     };
   }
 
@@ -490,18 +496,14 @@ function addDebugListeners() {
   const client = Sentry.getClient();
 
   client?.on('beforeEnvelope', (event) => {
-    const type = event?.[1]?.[0]?.[0]?.type;
-    const data = event?.[1]?.[0]?.[1] ?? {};
-
-    if (type !== 'session' || data.status !== 'exited') {
-      return;
+    if (isCompletedSessionEnvelope(event)) {
+      log('Completed session', event);
     }
-
-    log('Completed session', data);
   });
 
   client?.on('afterSendEvent', (event) => {
-    log('Event', event);
+    const type = getEventType(event);
+    log(type, event);
   });
 
   log('Added debug listeners');
@@ -518,3 +520,22 @@ function makeTransport(options) {
     return await fetch(...args);
   });
 }
+
+function isCompletedSessionEnvelope(envelope) {
+  const type = envelope?.[1]?.[0]?.[0]?.type;
+  const data = envelope?.[1]?.[0]?.[1] ?? {};
+
+  return type === 'session' && data.status === 'exited';
+}
+
+function getEventType(event) {
+  if (event.type === 'transaction') {
+    return 'Trace';
+  }
+
+  if (event.level === 'error') {
+    return 'Error';
+  }
+
+  return 'Event';
+}
diff --git a/development/README.md b/development/README.md
index 21422e72b3de..b9247f66aa6f 100644
--- a/development/README.md
+++ b/development/README.md
@@ -55,39 +55,22 @@ You can inspect the requests in the `Network` tab of your browser's Developer To
 by filtering for `POST` requests to `/v1/batch`. The full url will be `http://localhost:9090/v1/batch`
 or `https://api.segment.io/v1/batch` respectively.
 
-## Sentry
+## Debugging Sentry
 
-### Debugging in Sentry
+1. Set `SENTRY_DSN_DEV`, or `SENTRY_DSN` if using a production build, in `.metamaskrc` to a suitable Sentry URL.
+  - The example value specified in `.metamaskrc.dist` uses the `test-metamask` project in the MetaMask account.
+  - Alternatively, create a free Sentry account with a new organization and project.
+  - The DSN is specified in: `Settings > Projects > [Project Name] > Client Keys (DSN)`.
 
-To debug in a production Sentry environment:
+2. To display Sentry logs, include `DEBUG=metamask:sentry:*` in `.metamaskrc`.
 
-- If you have not already got a Sentry account, you can create a free account on [Sentry](https://sentry.io/)
-- Create a New Sentry Organization
-    - If you already have an existing Sentry account and workspace, open the sidebar drop down menu, then click `Switch organization` followed by `Create a new organization`
-- Create a New Project
-- Copy the `Public Key` and `Project ID` from the Client Keys section under your projects Settings
-    - Select `Settings` in the sidebar menu, then select `Projects` in the secondary menu. Click your project then select `Client Keys (DSN)` from the secondary menu. Click the `Configure` button on the `Client Keys` page and copy your `Project Id` and `Public Key`
--   Add/replace the `SENTRY_DSN` and `SENTRY_DSN_DEV` variables in `.metamaskrc`
-    ```
-    SENTRY_DSN_DEV=https://{SENTRY_PUBLIC_KEY}@sentry.io/{SENTRY_PROJECT_ID}
-    SENTRY_DSN=https://{SENTRY_PUBLIC_KEY}@sentry.io/{SENTRY_PROJECT_ID}
-    ```
--   Build the project to the `./dist/` folder with `yarn dist`
+3. To display more verbose logs if not in a developer build, include `METAMASK_DEBUG=true` in `.metamaskrc`.
 
-Errors reported whilst using the extension will be displayed in Sentry's `Issues` page.
+4. Ensure metrics are enabled during onboarding or via `Settings > Security & privacy > Participate in MetaMetrics`.
 
-To debug in test build we need to comment out the below:- <br>
-- `setupSentry` function comment the return statement in the `app/scripts/lib
-/setupSentry.js`  https://github.com/MetaMask/metamask-extension/blob/e3c76ca699e94bacfc43793d28291fa5ddf06752/app/scripts/lib/setupSentry.js#L496
-- `setupStateHooks` function set the if condition to true in the `ui
-/index.js` https://github.com/MetaMask/metamask-extension/blob/e3c76ca699e94bacfc43793d28291fa5ddf06752/ui/index.js#L242
+5. To test Sentry via the developer options in the UI, include `ENABLE_SETTINGS_PAGE_DEV_OPTIONS=true` in `.metamaskrc`.
 
-How to trigger Sentry error:-
-1. Open the background console.
-2. Load the extension app and open the developer console.
-3. Toggle the `Participate in MetaMetrics` menu option to the `ON` position.
-4. Enter `window.stateHooks.throwTestBackgroundError()` into the developer console.
-5. There should now be requests sent to sentry in the background network tab.
+6. Alternatively, call `window.stateHooks.throwTestError()` or `window.stateHooks.throwTestBackgroundError()` via the UI console.
 
 ## Source Maps
 
diff --git a/shared/lib/trace.test.ts b/shared/lib/trace.test.ts
new file mode 100644
index 000000000000..a1845cb2fbd7
--- /dev/null
+++ b/shared/lib/trace.test.ts
@@ -0,0 +1,112 @@
+import { Span, startSpan, withIsolationScope } from '@sentry/browser';
+import { trace } from './trace';
+
+jest.mock('@sentry/browser', () => ({
+  withIsolationScope: jest.fn(),
+  startSpan: jest.fn(),
+}));
+
+const NAME_MOCK = 'testTransaction';
+const PARENT_CONTEXT_MOCK = {} as Span;
+
+const TAGS_MOCK = {
+  tag1: 'value1',
+  tag2: true,
+  tag3: 123,
+};
+
+const DATA_MOCK = {
+  data1: 'value1',
+  data2: true,
+  data3: 123,
+};
+
+function mockGetMetaMetricsEnabled(enabled: boolean) {
+  global.sentry = {
+    getMetaMetricsEnabled: () => Promise.resolve(enabled),
+  };
+}
+
+describe('Trace', () => {
+  const startSpanMock = jest.mocked(startSpan);
+  const withIsolationScopeMock = jest.mocked(withIsolationScope);
+  const setTagsMock = jest.fn();
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+
+    startSpanMock.mockImplementation((_, fn) => fn({} as Span));
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    withIsolationScopeMock.mockImplementation((fn: any) =>
+      fn({ setTags: setTagsMock }),
+    );
+  });
+
+  describe('trace', () => {
+    // @ts-expect-error This function is missing from the Mocha type definitions
+    it.each([
+      ['enabled', true],
+      ['disabled', false],
+    ])(
+      'executes callback if Sentry is %s',
+      async (_: string, sentryEnabled: boolean) => {
+        let callbackExecuted = false;
+
+        mockGetMetaMetricsEnabled(sentryEnabled);
+
+        await trace({ name: NAME_MOCK }, async () => {
+          callbackExecuted = true;
+        });
+
+        expect(callbackExecuted).toBe(true);
+      },
+    );
+
+    // @ts-expect-error This function is missing from the Mocha type definitions
+    it.each([
+      ['enabled', true],
+      ['disabled', false],
+    ])(
+      'returns value from callback if Sentry is %s',
+      async (_: string, sentryEnabled: boolean) => {
+        mockGetMetaMetricsEnabled(sentryEnabled);
+
+        const result = await trace({ name: NAME_MOCK }, async () => {
+          return true;
+        });
+
+        expect(result).toBe(true);
+      },
+    );
+
+    it('invokes Sentry if enabled', async () => {
+      mockGetMetaMetricsEnabled(true);
+
+      await trace(
+        {
+          name: NAME_MOCK,
+          tags: TAGS_MOCK,
+          data: DATA_MOCK,
+          parentContext: PARENT_CONTEXT_MOCK,
+        },
+        async () => Promise.resolve(),
+      );
+
+      expect(withIsolationScopeMock).toHaveBeenCalledTimes(1);
+
+      expect(startSpanMock).toHaveBeenCalledTimes(1);
+      expect(startSpanMock).toHaveBeenCalledWith(
+        {
+          name: NAME_MOCK,
+          parentSpan: PARENT_CONTEXT_MOCK,
+          attributes: DATA_MOCK,
+        },
+        expect.any(Function),
+      );
+
+      expect(setTagsMock).toHaveBeenCalledTimes(1);
+      expect(setTagsMock).toHaveBeenCalledWith(TAGS_MOCK);
+    });
+  });
+});
diff --git a/shared/lib/trace.ts b/shared/lib/trace.ts
new file mode 100644
index 000000000000..c585edb981ba
--- /dev/null
+++ b/shared/lib/trace.ts
@@ -0,0 +1,54 @@
+import * as Sentry from '@sentry/browser';
+import { Primitive } from '@sentry/types';
+import { createModuleLogger } from '@metamask/utils';
+import { log as sentryLogger } from '../../app/scripts/lib/setupSentry';
+
+const log = createModuleLogger(sentryLogger, 'trace');
+
+export type TraceRequest = {
+  data?: Record<string, number | string | boolean>;
+  name: string;
+  parentContext?: unknown;
+  tags?: Record<string, number | string | boolean>;
+};
+
+export async function trace<T>(
+  request: TraceRequest,
+  fn: (context?: unknown) => Promise<T>,
+): Promise<T> {
+  const { data: attributes, name, parentContext, tags } = request;
+  const parentSpan = (parentContext ?? null) as Sentry.Span | null;
+
+  const isSentryEnabled =
+    (await globalThis.sentry.getMetaMetricsEnabled()) as boolean;
+
+  const callback = async (span: Sentry.Span | null) => {
+    log('Starting trace', name, request);
+
+    const start = Date.now();
+    let error;
+
+    try {
+      return await fn(span);
+    } catch (currentError) {
+      error = currentError;
+      throw currentError;
+    } finally {
+      const end = Date.now();
+      const duration = end - start;
+
+      log('Finished trace', name, duration, { error, request });
+    }
+  };
+
+  if (!isSentryEnabled) {
+    log('Skipping Sentry trace as metrics disabled', name, request);
+    return callback(null);
+  }
+
+  return await Sentry.withIsolationScope(async (scope) => {
+    scope.setTags(tags as Record<string, Primitive>);
+
+    return await Sentry.startSpan({ name, parentSpan, attributes }, callback);
+  });
+}
diff --git a/types/global.d.ts b/types/global.d.ts
index 451168775331..e580813bdcfa 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -1,6 +1,10 @@
+// Many of the state hooks return untyped raw state.
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 // In order for variables to be considered on the global scope they must be
 // declared using var and not const or let, which is why this rule is disabled
 /* eslint-disable no-var */
+
 import * as Sentry from '@sentry/browser';
 import {
   Success,
@@ -224,7 +228,26 @@ declare class Chrome {
   runtime: Runtime;
 }
 
-type SentryObject = Sentry;
+type SentryObject = Sentry & {
+  getMetaMetricsEnabled: () => Promise<boolean>;
+};
+
+type StateHooks = {
+  getCleanAppState?: () => Promise<any>;
+  getLogs?: () => any[];
+  getMostRecentPersistedState?: () => any;
+  getPersistedState: () => Promise<any>;
+  getSentryAppState?: () => any;
+  getSentryState: () => {
+    browser: string;
+    version: string;
+    state?: any;
+    persistedState?: any;
+  };
+  metamaskGetState?: () => Promise<any>;
+  throwTestBackgroundError?: (msg?: string) => Promise<void>;
+  throwTestError?: (msg?: string) => void;
+};
 
 export declare global {
   var platform: Platform;
@@ -233,6 +256,8 @@ export declare global {
 
   var chrome: Chrome;
 
+  var stateHooks: StateHooks;
+
   namespace jest {
     // The interface is being used for declaration merging, which is an acceptable exception to this rule.
     // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
diff --git a/ui/index.js b/ui/index.js
index a99537cfd09e..2e31a8655f28 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -219,7 +219,11 @@ async function startApp(metamaskState, backgroundConnection, opts) {
  * @param {object} store - The Redux store.
  */
 function setupStateHooks(store) {
-  if (process.env.METAMASK_DEBUG || process.env.IN_TEST) {
+  if (
+    process.env.METAMASK_DEBUG ||
+    process.env.IN_TEST ||
+    process.env.ENABLE_SETTINGS_PAGE_DEV_OPTIONS
+  ) {
     /**
      * The following stateHook is a method intended to throw an error, used in
      * our E2E test to ensure that errors are attempted to be sent to sentry.
@@ -241,7 +245,7 @@ function setupStateHooks(store) {
     window.stateHooks.throwTestBackgroundError = async function (
       msg = 'Test Error',
     ) {
-      store.dispatch(actions.throwTestBackgroundError(msg));
+      await actions.throwTestBackgroundError(msg);
     };
   }
 
diff --git a/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
index ff16d1cf726d..ea3c2624fd9a 100644
--- a/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
+++ b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap
@@ -238,6 +238,147 @@ exports[`Develop options tab should match snapshot 1`] = `
         </div>
       </div>
     </div>
+    <p
+      class="mm-box mm-text settings-page__security-tab-sub-header__bold mm-text--body-md mm-box--color-text-default"
+    >
+      Sentry
+    </p>
+    <div
+      class="settings-page__content-padded"
+    >
+      <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"
+      >
+        <div
+          class="settings-page__content-item"
+        >
+          <div
+            class="settings-page__content-description"
+          >
+            <span>
+               
+              Generate an unhandled 
+              <b>
+                TestError
+              </b>
+               in this window.
+               
+            </span>
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium 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--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+          >
+            Generate UI Error
+          </button>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <div
+            class="mm-box mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--align-items-center"
+            style="height: 40px; width: 40px;"
+          >
+            <span
+              class="mm-box settings-page-developer-options__icon-check mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-success-default"
+              hidden=""
+              style="mask-image: url('./images/icons/check.svg');"
+            />
+          </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"
+      >
+        <div
+          class="settings-page__content-item"
+        >
+          <div
+            class="settings-page__content-description"
+          >
+            <span>
+               
+              Generate an unhandled 
+              <b>
+                TestError
+              </b>
+               in the service worker.
+               
+            </span>
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium 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--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+          >
+            Generate Background Error
+          </button>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <div
+            class="mm-box mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--align-items-center"
+            style="height: 40px; width: 40px;"
+          >
+            <span
+              class="mm-box settings-page-developer-options__icon-check mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-success-default"
+              hidden=""
+              style="mask-image: url('./images/icons/check.svg');"
+            />
+          </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"
+      >
+        <div
+          class="settings-page__content-item"
+        >
+          <div
+            class="settings-page__content-description"
+          >
+            <span>
+               
+               Generate a 
+              <b>
+                Developer Test
+              </b>
+               Sentry trace.
+               
+            </span>
+          </div>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <button
+            class="mm-box mm-text mm-button-base mm-button-base--size-md mm-button-primary mm-text--body-md-medium 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--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-pill"
+          >
+            Generate Trace
+          </button>
+        </div>
+        <div
+          class="settings-page__content-item-col"
+        >
+          <div
+            class="mm-box mm-box--padding-right-2 mm-box--padding-left-2 mm-box--display-flex mm-box--align-items-center"
+            style="height: 40px; width: 40px;"
+          >
+            <span
+              class="mm-box settings-page-developer-options__icon-check mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-success-default"
+              hidden=""
+              style="mask-image: url('./images/icons/check.svg');"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </div>
 `;
diff --git a/ui/pages/settings/developer-options-tab/developer-options-tab.tsx b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
index 4b475986fbbf..f40094804245 100644
--- a/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
+++ b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx
@@ -34,6 +34,7 @@ import {
 } from '../../../store/actions';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
+import { SentryTest } from './sentry-test';
 
 const DeveloperOptionsTab = () => {
   const t = useI18nContext();
@@ -275,6 +276,7 @@ const DeveloperOptionsTab = () => {
         {renderServiceWorkerKeepAliveToggle()}
         {renderNetworkMenuRedesign()}
       </div>
+      <SentryTest />
     </div>
   );
 };
diff --git a/ui/pages/settings/developer-options-tab/sentry-test.tsx b/ui/pages/settings/developer-options-tab/sentry-test.tsx
new file mode 100644
index 000000000000..ab9a7702fcb5
--- /dev/null
+++ b/ui/pages/settings/developer-options-tab/sentry-test.tsx
@@ -0,0 +1,187 @@
+import React, { useState, useCallback, ReactElement } from 'react';
+import { ButtonVariant } from '@metamask/snaps-sdk';
+import {
+  Box,
+  Button,
+  Icon,
+  IconName,
+  IconSize,
+  Text,
+} from '../../../components/component-library';
+import {
+  AlignItems,
+  Display,
+  FlexDirection,
+  IconColor,
+  JustifyContent,
+} from '../../../helpers/constants/design-system';
+import { trace } from '../../../../shared/lib/trace';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export function SentryTest() {
+  return (
+    <>
+      <Text className="settings-page__security-tab-sub-header__bold">
+        Sentry
+      </Text>
+      <div className="settings-page__content-padded">
+        <GenerateUIError />
+        <GenerateBackgroundError />
+        <GenerateTrace />
+      </div>
+    </>
+  );
+}
+
+function GenerateUIError() {
+  const t = useI18nContext();
+
+  const handleClick = useCallback(async () => {
+    await window.stateHooks.throwTestError?.('Developer Options');
+  }, []);
+
+  return (
+    <TestButton
+      name={t('developerOptionsSentryButtonGenerateUIError')}
+      description={t('developerOptionsSentryDescriptionGenerateUIError', [
+        <b>TestError</b>,
+      ])}
+      onClick={handleClick}
+      expectError
+    />
+  );
+}
+
+function GenerateBackgroundError() {
+  const t = useI18nContext();
+
+  const handleClick = useCallback(async () => {
+    await window.stateHooks.throwTestBackgroundError?.('Developer Options');
+  }, []);
+
+  return (
+    <TestButton
+      name={t('developerOptionsSentryButtonGenerateBackgroundError')}
+      description={t(
+        'developerOptionsSentryDescriptionGenerateBackgroundError',
+        [<b>TestError</b>],
+      )}
+      onClick={handleClick}
+      expectError
+    />
+  );
+}
+
+function GenerateTrace() {
+  const t = useI18nContext();
+
+  const handleClick = useCallback(async () => {
+    await trace(
+      {
+        name: 'Developer Test',
+        data: { 'test.data.number': 123 },
+        tags: { 'test.tag.number': 123 },
+      },
+      async (context) => {
+        await trace(
+          {
+            name: 'Nested Test 1',
+            data: { 'test.data.boolean': true },
+            tags: { 'test.tag.boolean': true },
+            parentContext: context,
+          },
+          () => sleep(1000),
+        );
+
+        await trace(
+          {
+            name: 'Nested Test 2',
+            data: { 'test.data.string': 'test' },
+            tags: { 'test.tag.string': 'test' },
+            parentContext: context,
+          },
+          () => sleep(500),
+        );
+      },
+    );
+  }, []);
+
+  return (
+    <TestButton
+      name={t('developerOptionsSentryButtonGenerateTrace')}
+      description={t('developerOptionsSentryDescriptionGenerateTrace', [
+        <b>Developer Test</b>,
+      ])}
+      onClick={handleClick}
+    />
+  );
+}
+
+function TestButton({
+  name,
+  description,
+  onClick,
+  expectError,
+}: {
+  name: string;
+  description: ReactElement;
+  onClick: () => Promise<void>;
+  expectError?: boolean;
+}) {
+  const [isComplete, setIsComplete] = useState(false);
+
+  const handleClick = useCallback(async () => {
+    let hasError = false;
+
+    try {
+      await onClick();
+    } catch (error) {
+      hasError = true;
+      throw error;
+    } finally {
+      if (expectError || !hasError) {
+        setIsComplete(true);
+      }
+    }
+  }, [onClick]);
+
+  return (
+    <Box
+      className="settings-page__content-row"
+      display={Display.Flex}
+      flexDirection={FlexDirection.Row}
+      justifyContent={JustifyContent.spaceBetween}
+      gap={4}
+    >
+      <div className="settings-page__content-item">
+        <div className="settings-page__content-description">{description}</div>
+      </div>
+      <div className="settings-page__content-item-col">
+        <Button variant={ButtonVariant.Primary} onClick={handleClick}>
+          {name}
+        </Button>
+      </div>
+      <div className="settings-page__content-item-col">
+        <Box
+          display={Display.Flex}
+          alignItems={AlignItems.center}
+          paddingLeft={2}
+          paddingRight={2}
+          style={{ height: '40px', width: '40px' }}
+        >
+          <Icon
+            className="settings-page-developer-options__icon-check"
+            name={IconName.Check}
+            color={IconColor.successDefault}
+            size={IconSize.Lg}
+            hidden={!isComplete}
+          />
+        </Box>
+      </div>
+    </Box>
+  );
+}
+
+function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
diff --git a/ui/store/actions.ts b/ui/store/actions.ts
index a64cd2e6bb9e..4779c6e4b5b1 100644
--- a/ui/store/actions.ts
+++ b/ui/store/actions.ts
@@ -5122,7 +5122,7 @@ export function setName(
  * Throw an error in the background for testing purposes.
  *
  * @param message - The error message.
- * @deprecated This is only mean to facilitiate E2E testing. We should not use
+ * @deprecated This is only meant to facilitiate E2E testing. We should not use
  * this for handling errors.
  */
 export async function throwTestBackgroundError(message: string): Promise<void> {

From 5bdc48ebc71d37a1fef2427782b8e7bd3799cd7e Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Thu, 22 Aug 2024 20:31:45 -0230
Subject: [PATCH 228/236] Fix merge conflict resolution error in
 request-queuing/ui.spec.js, for v12.1.0 (#26476)

This brings the tests up to date with develop, which is what they should
have been. One test that was cherry-picked into v12.0.0 and then later
updated on develop was not merge properly when master was merged into
v12.1.0

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
---
 test/e2e/tests/request-queuing/ui.spec.js | 147 ++++++++++++----------
 1 file changed, 78 insertions(+), 69 deletions(-)

diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js
index 6cfc9c8dfefe..cea9e045ceed 100644
--- a/test/e2e/tests/request-queuing/ui.spec.js
+++ b/test/e2e/tests/request-queuing/ui.spec.js
@@ -165,8 +165,7 @@ async function validateBalanceAndActivity(
   }
 }
 
-// eslint-disable-next-line mocha/no-skipped-tests
-describe.skip('Request-queue UI changes', function () {
+describe('Request-queue UI changes', function () {
   it('should show network specific to domain @no-mmi', async function () {
     const port = 8546;
     const chainId = 1338; // 0x53a
@@ -233,76 +232,9 @@ describe.skip('Request-queue UI changes', function () {
     );
   });
 
-  it('should gracefully handle deleted network @no-mmi', async function () {
-    const port = 8546;
-    const chainId = 1338; // 0x53a
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: new FixtureBuilder()
-          .withNetworkControllerDoubleGanache()
-          .withPreferencesControllerUseRequestQueueEnabled()
-          .withSelectedNetworkControllerPerDomain()
-          .build(),
-        ganacheOptions: {
-          ...defaultGanacheOptions,
-          concurrent: [
-            {
-              port,
-              chainId,
-              ganacheOptions2: defaultGanacheOptions,
-            },
-          ],
-        },
-        dappOptions: { numberOfDapps: 2 },
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await unlockWallet(driver);
-
-        // Navigate to extension home screen
-        await driver.navigate(PAGES.HOME);
-
-        // Open the first dapp
-        await openDappAndSwitchChain(driver, DAPP_URL);
-
-        // Open the second dapp and switch chains
-        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1', 4);
-
-        // Go to wallet fullscreen, ensure that the global network changed to Ethereum Mainnet
-        await driver.switchToWindowWithTitle(
-          WINDOW_TITLES.ExtensionInFullScreenView,
-        );
-        await driver.findElement({
-          css: '[data-testid="network-display"]',
-          text: 'Localhost 8546',
-        });
-
-        // Go to the first dapp, ensure it uses localhost
-        await selectDappClickSend(driver, DAPP_URL);
-        await switchToNotificationPopoverValidateDetails(driver, {
-          chainId: '0x539',
-          networkText: 'Localhost 8545',
-          originText: DAPP_URL,
-        });
-        await rejectTransaction(driver);
-
-        // Go to the second dapp, ensure it uses Ethereum Mainnet
-        await selectDappClickSend(driver, DAPP_ONE_URL);
-        await switchToNotificationPopoverValidateDetails(driver, {
-          chainId: '0x53a',
-          networkText: 'Localhost 8546',
-          originText: DAPP_ONE_URL,
-        });
-        await rejectTransaction(driver);
-      },
-    );
-  });
-
   it('handles three confirmations on three confirmations concurrently @no-mmi', async function () {
     const port = 8546;
     const chainId = 1338; // 0x53a
-
     await withFixtures(
       {
         dapp: true,
@@ -425,6 +357,83 @@ describe.skip('Request-queue UI changes', function () {
     );
   });
 
+  it('should gracefully handle deleted network @no-mmi', async function () {
+    const port = 8546;
+    const chainId = 1338;
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withNetworkControllerDoubleGanache()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+          concurrent: [
+            {
+              port,
+              chainId,
+              ganacheOptions2: defaultGanacheOptions,
+            },
+          ],
+        },
+        dappOptions: { numberOfDapps: 2 },
+        title: this.test.fullTitle(),
+      },
+      async ({ driver }) => {
+        await unlockWallet(driver);
+
+        // Navigate to extension home screen
+        await driver.navigate(PAGES.HOME);
+
+        // Open the first dapp
+        await openDappAndSwitchChain(driver, DAPP_URL);
+
+        // Open the second dapp and switch chains
+        await openDappAndSwitchChain(driver, DAPP_ONE_URL, '0x1', 4);
+
+        // Go to wallet fullscreen, ensure that the global network changed to Ethereum Mainnet
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+        await driver.findElement({
+          css: '[data-testid="network-display"]',
+          text: 'Ethereum Mainnet',
+        });
+
+        // Go to Settings, delete the first dapp's network
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement('[data-testid="global-menu-settings"]');
+        await driver.clickElement({
+          css: '.tab-bar__tab__content__title',
+          text: 'Networks',
+        });
+        await driver.clickElement({
+          css: '.networks-tab__networks-list-name',
+          text: 'Localhost 8545',
+        });
+        await driver.clickElement({ css: '.btn-danger', text: 'Delete' });
+        await driver.clickElement({
+          css: '.modal-container__footer-button',
+          text: 'Delete',
+        });
+
+        // Go back to first dapp, try an action, ensure deleted network doesn't block UI
+        // The current globally selected network, Ethereum Mainnet, should be used
+        await selectDappClickSend(driver, DAPP_URL);
+        await driver.delay(veryLargeDelayMs);
+        await switchToNotificationPopoverValidateDetails(driver, {
+          chainId: '0x1',
+          networkText: 'Ethereum Mainnet',
+          originText: DAPP_URL,
+        });
+      },
+    );
+  });
+
   it('should signal from UI to dapp the network change @no-mmi', async function () {
     await withFixtures(
       {

From e5f4f32fde017d69b87724237c1246f8d4e8e7af Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 23 Aug 2024 10:20:45 -0230
Subject: [PATCH 229/236] Version v12.1.0-beta.0 (#26631)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

This PR will trigger the creation of a beta build once merged.

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

## **Related issues**

N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2b890b689cad..815d597a8b20 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "12.1.0",
+  "version": "12.1.0-beta.0",
   "private": true,
   "repository": {
     "type": "git",

From 335c9e47cfa014396c8b492a1665fb51b121c304 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 26 Aug 2024 16:23:46 -0230
Subject: [PATCH 230/236] chore: Remove non-applicable change entries (#26663)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## **Description**

These change entries are for features that aren't yet enabled. They are
behind build flags.

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

## **Related issues**

N/A

## **Manual testing steps**

n/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.
---
 CHANGELOG.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6b8f0709d37..41f3091f878e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,18 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [12.1.0]
 ### Added
-- Introduced a new UI for managing multiple RPC URLs, including adding and deleting options ([#25452](https://github.com/MetaMask/metamask-extension/pull/25452))
 - Launched a feature displaying the percentage increase or decrease for tokens within the UI ([#24223](https://github.com/MetaMask/metamask-extension/pull/24223))
-- Implemented a modal form for adding custom networks ([#25213](https://github.com/MetaMask/metamask-extension/pull/25213))
-- Introduced a new UI for selecting network RPCs during the advanced onboarding process ([#25276](https://github.com/MetaMask/metamask-extension/pull/25276))
 - Added a search feature to easily filter through the popular network list ([#25170](https://github.com/MetaMask/metamask-extension/pull/25170))
-- Introduced a Popular Networks list within the Add Network modal ([#25160](https://github.com/MetaMask/metamask-extension/pull/25160))
 - Launched a new asset details page ([#24522](https://github.com/MetaMask/metamask-extension/pull/24522))
-- Integrated contract interaction transaction alerts into the new alert system ([#25174](https://github.com/MetaMask/metamask-extension/pull/25174))
-- Enhanced the Sign-In With Ethereum (SIWE) experience by adding an alert for domain binding ([#25281](https://github.com/MetaMask/metamask-extension/pull/25281))
 - Implemented a loader on the confirmation page during Blockaid validation ([#25477](https://github.com/MetaMask/metamask-extension/pull/25477))
 - Introduced an advanced details component for transactions ([#24833](https://github.com/MetaMask/metamask-extension/pull/24833))
-- Updated the message section on SIWE signature pages ([#24997](https://github.com/MetaMask/metamask-extension/pull/24997))
 - Enhanced permit signatures with a simulation section ([#24862](https://github.com/MetaMask/metamask-extension/pull/24862))
 - Introduced dynamic support for identifying 'buyable' networks through the Ramps API ([#24041](https://github.com/MetaMask/metamask-extension/pull/24041))
 - Introduced a new notification counter over the Fox icon to display unread notifications ([#25093](https://github.com/MetaMask/metamask-extension/pull/25093))

From 212bdd4650d8df9cc63e4ab8af3d09bd0cf999f9 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 27 Aug 2024 18:43:57 -0230
Subject: [PATCH 231/236] DResolve audit advisory

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 970bf8e8c797..48ebf778edbc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18665,13 +18665,13 @@ __metadata:
   linkType: hard
 
 "fast-xml-parser@npm:^4.3.4":
-  version: 4.3.4
-  resolution: "fast-xml-parser@npm:4.3.4"
+  version: 4.4.1
+  resolution: "fast-xml-parser@npm:4.4.1"
   dependencies:
     strnum: "npm:^1.0.5"
   bin:
     fxparser: src/cli/cli.js
-  checksum: 10/ef859101980cdd02b111fce09e25949a80e373654a6c424091355930f0d364abec144d8bb722d250a0c070416566518e621e198204a6b976db68f20c16d9300b
+  checksum: 10/0c05ab8703630d8c857fafadbd78d0020d3a8e54310c3842179cd4a0d9d97e96d209ce885e91241f4aa9dd8dfc2fd924a682741a423d65153cad34da2032ec44
   languageName: node
   linkType: hard
 

From 24132cbb45d53587801c63710f75959f78c9c6b3 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Tue, 27 Aug 2024 18:45:53 -0230
Subject: [PATCH 232/236] Resolve changelog conflicts

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cbab5bfa8c5..213138e17664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.2.0]
+
 ## [12.1.0]
 ### Added
 - Launched a feature displaying the percentage increase or decrease for tokens within the UI ([#24223](https://github.com/MetaMask/metamask-extension/pull/24223))
@@ -4998,8 +4999,7 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.2.0...HEAD
-[12.2.0]: https://github.com/MetaMask/metamask-extension/compare/v11.16.7...v12.2.0
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.1.0...HEAD
+[12.2.0]: https://github.com/MetaMask/metamask-extension/compare/v12.1.0...v12.2.0
 [12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v12.0.6...v12.1.0
 [12.0.6]: https://github.com/MetaMask/metamask-extension/compare/v12.0.5...v12.0.6
 [12.0.5]: https://github.com/MetaMask/metamask-extension/compare/v12.0.4...v12.0.5

From ab3c9b697f71590e7cf24b6c772315de664b67db Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Tue, 27 Aug 2024 21:27:12 +0000
Subject: [PATCH 233/236] Update LavaMoat policies

---
 lavamoat/browserify/beta/policy.json  | 110 +++++++++++++++++++++++++-
 lavamoat/browserify/flask/policy.json | 110 +++++++++++++++++++++++++-
 lavamoat/browserify/main/policy.json  | 110 +++++++++++++++++++++++++-
 lavamoat/browserify/mmi/policy.json   | 110 +++++++++++++++++++++++++-
 4 files changed, 432 insertions(+), 8 deletions(-)

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index e3df5c0a43ed..5b6e9ca3577f 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2438,6 +2438,7 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/snaps-utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2446,7 +2447,6 @@
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
@@ -2484,6 +2484,41 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2535,22 +2570,93 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/snaps-utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
         "@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/snaps-utils": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index e3df5c0a43ed..5b6e9ca3577f 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2438,6 +2438,7 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/snaps-utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2446,7 +2447,6 @@
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
@@ -2484,6 +2484,41 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2535,22 +2570,93 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/snaps-utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
         "@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/snaps-utils": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index e3df5c0a43ed..5b6e9ca3577f 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2438,6 +2438,7 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/snaps-utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2446,7 +2447,6 @@
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
@@ -2484,6 +2484,41 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2535,22 +2570,93 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/snaps-utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
         "@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/snaps-utils": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 6f4790121fd1..dba486305cef 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -2530,6 +2530,7 @@
         "@metamask/snaps-controllers>@metamask/base-controller": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
         "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": true,
+        "@metamask/snaps-controllers>@metamask/snaps-utils": true,
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
@@ -2538,7 +2539,6 @@
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
         "@metamask/snaps-sdk": true,
-        "@metamask/snaps-utils": true,
         "@metamask/snaps-utils>@metamask/snaps-registry": true,
         "@metamask/utils": true,
         "browserify>browserify-zlib": true,
@@ -2576,6 +2576,41 @@
         "readable-stream": true
       }
     },
+    "@metamask/snaps-controllers>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-controllers>concat-stream": {
       "packages": {
         "browserify>buffer": true,
@@ -2627,22 +2662,93 @@
       },
       "packages": {
         "@metamask/post-message-stream": true,
+        "@metamask/snaps-execution-environments>@metamask/snaps-utils": true,
         "@metamask/snaps-utils": true,
         "@metamask/utils": true
       }
     },
+    "@metamask/snaps-execution-environments>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-rpc-methods": {
       "packages": {
         "@metamask/permission-controller": true,
         "@metamask/rpc-errors": true,
+        "@metamask/snaps-rpc-methods>@metamask/snaps-utils": true,
         "@metamask/snaps-sdk": true,
         "@metamask/snaps-sdk>@metamask/key-tree": true,
-        "@metamask/snaps-utils": true,
         "@metamask/utils": true,
         "@noble/hashes": true,
         "superstruct": true
       }
     },
+    "@metamask/snaps-rpc-methods>@metamask/snaps-utils": {
+      "globals": {
+        "File": true,
+        "FileReader": true,
+        "TextDecoder": true,
+        "TextEncoder": true,
+        "URL": true,
+        "console.error": true,
+        "console.log": true,
+        "console.warn": true,
+        "crypto": true,
+        "document.body.appendChild": true,
+        "document.createElement": true,
+        "fetch": true
+      },
+      "packages": {
+        "@metamask/permission-controller": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/snaps-sdk": true,
+        "@metamask/snaps-sdk>@metamask/key-tree": true,
+        "@metamask/snaps-utils>@metamask/slip44": true,
+        "@metamask/snaps-utils>cron-parser": true,
+        "@metamask/snaps-utils>fast-json-stable-stringify": true,
+        "@metamask/snaps-utils>fast-xml-parser": true,
+        "@metamask/snaps-utils>marked": true,
+        "@metamask/snaps-utils>rfdc": true,
+        "@metamask/snaps-utils>validate-npm-package-name": true,
+        "@metamask/utils": true,
+        "@metamask/utils>@scure/base": true,
+        "@noble/hashes": true,
+        "chalk": true,
+        "semver": true,
+        "superstruct": true
+      }
+    },
     "@metamask/snaps-sdk": {
       "globals": {
         "fetch": true

From 39c4f51ebd2a0b2007ed159a72ad6e6e5972d4a4 Mon Sep 17 00:00:00 2001
From: Davide Brocchetto <davide.brocchetto@consensys.net>
Date: Wed, 17 Jul 2024 23:08:41 +0200
Subject: [PATCH 234/236] test: Removed step from e2e tests (#25910)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The following Enhanced Transaction Protection modal has been removed
from onboarding steps so I also had to remove the step from the e2e test
automation script

<img width="358" alt="Screenshot 2024-07-17 at 10 14 06 PM"
src="https://github.com/user-attachments/assets/8a78d27c-3397-4039-aee6-ae0a7ae7023c">


## **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/25910?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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/playwright/shared/pageObjects/signup-page.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/playwright/shared/pageObjects/signup-page.ts b/test/e2e/playwright/shared/pageObjects/signup-page.ts
index 7edd859bb660..e4165fc1ab89 100644
--- a/test/e2e/playwright/shared/pageObjects/signup-page.ts
+++ b/test/e2e/playwright/shared/pageObjects/signup-page.ts
@@ -80,6 +80,5 @@ export class SignUpPage {
     await this.gotItBtn.click();
     await this.nextBtn.click();
     await this.doneBtn.click();
-    await this.enableButton.click();
   }
 }

From 3127d3918a2d04033c25930b7275dcf2871d9498 Mon Sep 17 00:00:00 2001
From: chloeYue <105063779+chloeYue@users.noreply.github.com>
Date: Wed, 28 Aug 2024 20:58:38 +0800
Subject: [PATCH 235/236] =?UTF-8?q?fix=20cherry-pick=20test:=20UX:=20Multi?=
 =?UTF-8?q?chain:=20Add=20E2E=20for=20signaling=20network=20change=20from?=
 =?UTF-8?q?=20Netwo=E2=80=A6=20(#26704)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Redo the cherry-pick for PR #25765 :

Adds an end to end tests for:
* Autoswitching networks upon UI load
* Autoswitching networks upon last confirmation rejection/confirmation
* Signaling network change from extension to dapp

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25765?quickstart=1)

Fixes:

1. N/A, this is a E2E addition

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

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

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

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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.

- [ ] 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.


<!--
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/26704?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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension 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: David Walsh <davidwalsh83@gmail.com>
---
 test/e2e/tests/request-queuing/ui.spec.js | 2 +-
 test/e2e/webdriver/chrome.js              | 2 +-
 test/e2e/webdriver/firefox.js             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/e2e/tests/request-queuing/ui.spec.js b/test/e2e/tests/request-queuing/ui.spec.js
index 523e2d7b9375..ae84d7125d02 100644
--- a/test/e2e/tests/request-queuing/ui.spec.js
+++ b/test/e2e/tests/request-queuing/ui.spec.js
@@ -125,7 +125,7 @@ async function confirmTransaction(driver) {
 }
 
 async function switchToNetworkByName(driver, networkName) {
-  await driver.clickElement('[data-testid="network-display"]');
+  await driver.clickElement('.mm-picker-network');
   await driver.clickElement(`[data-testid="${networkName}"]`);
 }
 
diff --git a/test/e2e/webdriver/chrome.js b/test/e2e/webdriver/chrome.js
index b3ab5e0cd12f..4a8d41afe9ec 100644
--- a/test/e2e/webdriver/chrome.js
+++ b/test/e2e/webdriver/chrome.js
@@ -24,9 +24,9 @@ function getProxyServer(proxyPort) {
 class ChromeDriver {
   static async build({
     openDevToolsForTabs,
+    constrainWindowSize,
     port,
     proxyPort,
-    constrainWindowSize,
   }) {
     const args = [
       `--proxy-server=${getProxyServer(proxyPort)}`, // Set proxy in the way that doesn't interfere with Selenium Manager
diff --git a/test/e2e/webdriver/firefox.js b/test/e2e/webdriver/firefox.js
index 74ffa63a61b8..b10c55c598d3 100644
--- a/test/e2e/webdriver/firefox.js
+++ b/test/e2e/webdriver/firefox.js
@@ -45,11 +45,11 @@ class FirefoxDriver {
    * @param {object} options - the options for the build
    * @param options.responsive
    * @param options.port
-   * @param options.proxyPort
    * @param options.constrainWindowSize
+   * @param options.proxyPort
    * @returns {Promise<{driver: !ThenableWebDriver, extensionUrl: string, extensionId: string}>}
    */
-  static async build({ responsive, port, proxyPort, constrainWindowSize }) {
+  static async build({ responsive, port, constrainWindowSize, proxyPort }) {
     const templateProfile = fs.mkdtempSync(TEMP_PROFILE_PATH_PREFIX);
     const options = new firefox.Options().setProfile(templateProfile);
 

From 945b77ca29902996449d013747b54194a1752f9e Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 28 Aug 2024 16:00:37 -0230
Subject: [PATCH 236/236] Fix Sentry state merge conflict error

---
 app/scripts/constants/sentry-state.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts
index 68f6207a4f02..cacb8b34489e 100644
--- a/app/scripts/constants/sentry-state.ts
+++ b/app/scripts/constants/sentry-state.ts
@@ -319,6 +319,7 @@ export const SENTRY_BACKGROUND_STATE = {
       swapsQuotePrefetchingRefreshTime: true,
       swapsQuoteRefreshTime: true,
       swapsStxBatchStatusRefreshTime: true,
+      swapsStxStatusDeadline: true,
       swapsStxGetTransactionsRefreshTime: true,
       swapsStxMaxFeeMultiplier: true,
       swapsUserFeeLevel: true,